diff --git a/mk/linux/configuration.xml b/mk/linux/configuration.xml
index 95d3a9784..160e5e7d2 100644
--- a/mk/linux/configuration.xml
+++ b/mk/linux/configuration.xml
@@ -38,20 +38,20 @@
 				<name value="Windowed"/>
 				<variable-name value="Windowed"/>
 				<description value="Execute in a window"/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
 				<name value="First time"/>
 				<variable-name value="FirstTime"/>
 				<description value=""/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="FloatRange">
@@ -66,10 +66,10 @@
 				<name value="Fog of war enabled"/>
 				<variable-name value="FogOfWar"/>
 				<description value=""/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 		</field-group>
@@ -89,10 +89,10 @@
 				<name value="Check OpenGL version on startup"/>
 				<variable-name value="CheckGlCaps"/>
 				<description value=""/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
@@ -122,10 +122,10 @@
 				<description value="If enabled, 3D textures are used for water 
 
 animation, disable on old cards"/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
@@ -191,10 +191,10 @@ shadows and shadow mapping, bigger sizes result in less pixelized shadows but ar
 				<name value="Fog of war smoothing"/>
 				<variable-name value="FogOfWarSmoothing"/>
 				<description value=""/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="IntRange">
@@ -209,10 +209,10 @@ shadows and shadow mapping, bigger sizes result in less pixelized shadows but ar
 				<name value="Show Unit Particles"/>
 				<variable-name value="UnitParticles"/>
 				<description value="Displays particles on game units"/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 		</field-group>
@@ -285,20 +285,20 @@ shadows and shadow mapping, bigger sizes result in less pixelized shadows but ar
 				<description value="If enabled, arrows are displayed under units 
 
 when they are issued a command"/>
-				<default value="1"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
 				<name value="Disable ingame UI"/>
 				<variable-name value="PhotoMode"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="true"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="IntRange">
@@ -336,32 +336,43 @@ when they are issued a command"/>
 				<name value="Client data consistency checks"/>
 				<variable-name value="NetworkConsistencyChecks"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
 				<name value="Client and Server data file synch check"/>
 				<variable-name value="AllowGameDataSynchCheck"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
 				<name value="Client and Server data file transfer support"/>
 				<variable-name value="AllowDownloadDataSynch"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
+			<field type="Enum">
+				<name value="Enable Network Debugging Output"/>
+				<variable-name value="DebugNetwork"/>
+				<description value=""/>
+				<default value="false"/>
+				<enums>
+					<enum value="true"/>
+					<enum value="false"/>
+				</enums>
+			</field>
+
 		</field-group>
 
 		<field-group name="Advanced">
@@ -369,10 +380,10 @@ when they are issued a command"/>
 				<name value="Debug mode"/>
 				<variable-name value="DebugMode"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="IntRange">
@@ -387,22 +398,29 @@ when they are issued a command"/>
 				<name value="AI log console redirection"/>
 				<variable-name value="AiRedir"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
 			<field type="Enum">
 				<name value="Allow players to rotate Units when building new Units"/>
 				<variable-name value="AllowRotateUnits"/>
 				<description value=""/>
-				<default value="0"/>
+				<default value="false"/>
 				<enums>
-					<enum value="1"/>
-					<enum value="0"/>
+					<enum value="true"/>
+					<enum value="false"/>
 				</enums>
 			</field>
+
+			<field type="String">
+				<name value="User created Data Folder"/>
+				<variable-name value="UserData_Root"/>
+				<description value=""/>
+				<default value=""/>
+			</field>
 		</field-group>
 	</field-groups>
 </configuration>
diff --git a/mk/linux/glest.ini b/mk/linux/glest.ini
index 1b6307fcf..1e9aec5dd 100644
--- a/mk/linux/glest.ini
+++ b/mk/linux/glest.ini
@@ -1,14 +1,19 @@
-; === Properties File === 
+; === propertyMap File === 
 
+=======
 AiLog=0
-AiRedir=0
-AutoTest=0
-CheckGlCaps=1
+AiRedir=false
+AllowDownloadDataSynch=false
+AllowGameDataSynchCheck=false
+AllowRotateUnits=true
+AutoTest=false
+CheckGlCaps=true
 ColorBits=32
 ConsoleMaxLines=10
 ConsoleTimeout=10
 DayTime=1000
-DebugMode=0
+DebugMode=false
+DebugNetwork=false
 DepthBits=16
 FactoryGraphics=OpenGL
 FactorySound=OpenAL
@@ -16,21 +21,21 @@ FastSpeedLoops=2
 Filter=Bilinear
 FilterMaxAnisotropy=1
 FirstTime=0
-FocusArrows=1
-FogOfWar=1
-FogOfWarSmoothing=1
+FocusArrows=true
+FogOfWar=true
+FogOfWarSmoothing=true
 FogOfWarSmoothingFrameSkip=3
 FontConsole=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 Lang=english
 MaxLights=1
-NetworkConsistencyChecks=1
-PhotoMode=0
+NetworkConsistencyChecks=true
+PhotoMode=false
 RefreshFrequency=75
 ScreenHeight=768
 ScreenWidth=1024
-ServerIp=192.168.1.102
+ServerIp=192.168.0.107
 ServerPort=6666
 ShadowAlpha=0.2
 ShadowFrameSkip=2
@@ -43,5 +48,6 @@ SoundVolumeFx=80
 SoundVolumeMusic=90
 StencilBits=0
 Textures3D=1
-UnitParticles=1
-Windowed=0
+UnitParticles=true
+UserData_Root=mydata/
+Windowed=false