Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 22951)
+++ ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 22952)
@@ -1,193 +1,192 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <styles>
 	<!--
 	==========================================
 	- DEFAULT STYLE: The style with the name 'default' is special, it will
 	- be called by every object before any other style is loaded.
 	==========================================
 	-->
 	<style name="default"
 		absolute="false"
 		enabled="true"
 		ghost="false"
 		hidden="false"
 		size="0 0 100% 100%"
 		z="0"
 		font="sans-14"
 		buffer_zone="5"
 		multiline="false"
 	/>
 	<style name="ModernWindow"
 		sprite="ModernWindow"
 	/>
 	<style name="ModernDialog"
 		sprite="ModernDialog"
 	/>
 	<style name="ModernList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBoxGoldNoTop"
 		sprite_selectarea="ModernDarkBoxWhite"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSortedList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBoxGoldNoTop"
 		sprite_selectarea="ModernDarkBoxWhite"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		sprite_asc="ModernArrowUp"
 		sprite_desc="ModernArrowDown"
 		sprite_not_sorted="ModernNotSorted"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernDropDown"
 		dropdown_buffer="1"
 		font="sans-bold-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		button_width="16"
 		sprite="ModernDarkBoxGold"
 		sprite_disabled="ModernDarkBoxGoldDisabled"
 		sprite2="ModernDropDownArrow"
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 		buffer_zone="8"
 		dropdown_size="225"
 		minimum_visible_items="3"
 		sprite_list="BlackBorderOnGray"
 		sprite_selectarea="ModernDarkBoxWhite"
 		textcolor_selected="white"
 		textcolor_disabled="140 140 140 255"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sound_opened="audio/interface/ui/ui_button_click.ogg"
 		sound_closed="audio/interface/ui/ui_button_click.ogg"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernRightLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="right"
 		text_valign="center"
 	/>
 	<style name="ModernLeftLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="left"
 		text_valign="center"
 	/>
 	<style name="ModernTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="top"
 	/>
 	<style name="ModernLeftTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 	/>
 	<style name="ModernText"
 		font="sans-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 	/>
 	<style name="ModernTextPanel"
 		buffer_zone="8"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		sprite="ModernDarkBoxGold"
 	/>
 	<style name="ModernInput"
 		sprite="ModernDarkBoxWhite"
 		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
 	/>
 	<style name="ModernTickBox"
 		sprite="ModernTickOff"
 		sprite2="ModernTickOn"
 		sprite_disabled="ModernTickDisabledOff"
 		sprite2_disabled="ModernTickDisabledOn"
-		square_side="22"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
 		sprite_bar="ModernSliderLine"
 		button_width="20"
 		tooltip_style="sliderTooltip"
 	/>
 	<style name="ModernButtonRed"
 		sprite="ModernButtonRed"
 		sprite_disabled="ModernButtonRedDisabled"
 		sprite_over="ModernButtonRedOver"
 		sprite_pressed="ModernButtonRed"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="210 210 210 160"
 		text_align="center"
 		text_valign="center"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernProgressBarBackground"
 		sprite="ModernProgressBarBackground"
 	/>
 	<style name="ModernProgressBar"
 		sprite_bar="ModernProgressBar"
 		size="3 0 100%-3 100%"
 	/>
 	<style name="ModernProgressBarText"
 		font="sans-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernTabButtonHorizontal"
 		sprite="ModernTabHorizontalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernTabButtonVertical"
 		sprite="ModernTabVerticalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernChart"
 		axis_color="209 174 132 255"
 		axis_width="2"
 		buffer_zone="4"
 		font="sans-stroke-14"
 		format_x="DECIMAL2"
 		format_y="DECIMAL2"
 		text_align="left"
 	/>
 </styles>
Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 22951)
+++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 22952)
@@ -1,208 +1,207 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/modmod/"/>
 
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
 		<!-- Page Title -->
 		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
 			<translatableAttribute id="caption">Modifications</translatableAttribute>
 		</object>
 
 		<!-- Filter Panel -->
 		<object size="0 40 312 64">
 			<object name="modGenericFilter"
 				type="input"
 				style="ModernInput"
 				size="16 0 176 100%"
 			>
 				<action on="Press">applyFilters();</action>
 				<action on="TextEdit">applyFilters();</action>
 			</object>
 
 			<!-- Checkboxes -->
 			<object name="negateFilter"
 				type="checkbox"
 				checked="false"
 				style="ModernTickBox"
 				size="186 0 206 100%"
-				font="serif-bold-13"
 			>
 				<action on="Press">applyFilters();</action>
 			</object>
 			<object type="text" size="208 0 100% 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Negate</translatableAttribute>
 			</object>
 		</object>
 
 		<object
 			name="globalModDescription"
 			type="text"
 			size="312 32 100%-16 69"
 			textcolor="180 180 180"
 			text_align="left"
 			text_valign="center"
 		>
 			<translatableAttribute id="caption">Description</translatableAttribute>
 		</object>
 
 		<!-- Available Mods Wrapper -->
 		<object size="16 66 100%-15 62%">
 
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Available Mods</translatableAttribute>
 			</object>
 
 			<object name="modsDisabledList"
 				type="olist"
 				style="ModernSortedList"
 				sortable="true"
 				selected_column="name"
 				selected_column_order="1"
 				size="0 25 100%-2 100%"
 				font="sans-stroke-13"
 				auto_scroll="true"
 			>
 				<action on="SelectionChange">selectedMod(this.name);</action>
 				<action on="SelectionColumnChange">applyFilters();</action>
 				<action on="MouseLeftDoubleClickItem">enableMod();</action>
 
 				<!-- List headers -->
 				<!-- Keep the column names in sync with the property names of mods -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="version" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="folder" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="label" color="255 255 255" width="26%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="dependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="url" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 		</object>
 
 		<!-- Enabled Mods Wrapper -->
 		<object size="16 62% 100%-15 100%-84">
 
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
 			</object>
 
 			<object name="modsEnabledList"
 				style="ModernList"
 				type="olist"
 				size="0 25 100%-32-2-2 100%"
 				font="sans-stroke-13"
 				tooltip_style="pgToolTip"
 				auto_scroll="true"
 			>
 				<action on="SelectionChange">selectedMod(this.name);</action>
 				<action on="MouseLeftDoubleClickItem">disableMod();</action>
 
 				<!-- List headers -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="version" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="folder" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="label" color="255 255 255" width="26%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="dependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="url" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 
 			<object
 				name="enabledModUp"
 				type="button"
 				style="ModernButtonRed"
 				size="100%-32-2 23+4 100%-2 23+32+4"
 				enabled="false"
 				sprite="ModernArrowUpRed"
 				sprite_pressed="ModernArrowUpRed"
 				sprite_over="ModernArrowUpRedBright"
 				sprite_disabled="ModernArrowUpGrey"
 			>
 				<translatableAttribute id="tooltip">Change the order in which mods are launched. This should match the mods dependencies.</translatableAttribute>
 				<action on="Press">moveCurrItem("modsEnabledList", true);</action>
 			</object>
 			<object
 				name="enabledModDown"
 				type="button"
 				style="ModernButtonRed"
 				size="100%-32-2 100%-32-4 100%-2 100%-4"
 				enabled="false"
 				sprite="ModernArrowDownRed"
 				sprite_pressed="ModernArrowDownRed"
 				sprite_over="ModernArrowDownRedBright"
 				sprite_disabled="ModernArrowDownGrey"
 			>
 				<translatableAttribute id="tooltip">Change the order in which mods are launched. This should match the mods dependencies.</translatableAttribute>
 				<action on="Press">moveCurrItem("modsEnabledList", false);</action>
 			</object>
 		</object>
 
 		<!-- MOD-SPECIFIC BUTTONS -->
 		<object name="toggleModButton" type="button" style="ModernButtonRed" size="16 100%-80 236 100%-52" enabled="false">
 			<translatableAttribute id="caption">Enable/Disable</translatableAttribute>
 		</object>
 		<object name="visitWebButton" type="button" style="ModernButtonRed" size="240 100%-80 460 100%-52" enabled="false">
 			<translatableAttribute id="caption">Visit Website</translatableAttribute>
 			<action on="Press">visitModWebsite();</action>
 		</object>
 
 		<!-- Message -->
 		<object name="message" type="text" size="466 100%-78 100%-15 100%-52" text_align="left" textcolor="white"/>
 
 		<!-- BUTTONS -->
 		<object name="quitButton" type="button" style="ModernButtonRed" size="100%-994 100%-44 100%-804 100%-16">
 			<translatableAttribute id="caption">Quit</translatableAttribute>
 			<action on="Press">Engine.Exit();</action>
 		</object>
 
 		<object name="cancelButton" type="button" style="ModernButtonRed" size="100%-994 100%-44 100%-804 100%-16" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="100%-800 100%-44 100%-610 100%-16">
 			<translatableAttribute id="caption">Help</translatableAttribute>
 			<action on="Press">Engine.PushGuiPage("page_modhelp.xml");</action>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="100%-606 100%-44 100%-412 100%-16">
 			<translatableAttribute id="caption">Download Mods</translatableAttribute>
 			<action on="Press">downloadModsButton();</action>
 		</object>
 
 		<object name="saveConfigurationButton" type="button" style="ModernButtonRed" size="100%-408 100%-44 100%-214 100%-16">
 			<translatableAttribute id="caption">Save Configuration</translatableAttribute>
 			<action on="Press">saveMods();</action>
 		</object>
 
 		<object name="startModsButton" type="button" style="ModernButtonRed" size="100%-210 100%-44 100%-16 100%-16">
 			<translatableAttribute id="caption">Start Mods</translatableAttribute>
 			<action on="Press">startMods();</action>
 		</object>
 	</object>
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml	(revision 22951)
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml	(revision 22952)
@@ -1,372 +1,367 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <object>
 
 	<action on="Tick">
 		onTick();
 	</action>
 
 	<object hotkey="lobby" name="lobbyDialogToggle"/>
 
 	<!-- Left panel: Player list. -->
 	<object name="leftPanel">
 		<object name="playersBox"
 			style="ModernSortedList"
 			selected_column="name"
 			selected_column_order="1"
 			type="olist"
 			sortable="true"
 			size="0 0 100% 100%"
 			font="sans-bold-stroke-13"
 		>
 			<column id="buddy" width="12"/>
 			<column id="status" width="26%">
 				<translatableAttribute id="heading">Status</translatableAttribute>
 			</column>
 			<column id="name" width="48%-12">
 				<translatableAttribute id="heading">Name</translatableAttribute>
 			</column>
 			<column id="rating" width="26%">
 				<translatableAttribute id="heading">Rating</translatableAttribute>
 			</column>
 			<action on="SelectionChange">
 				onPlayerListSelection();
 			</action>
 			<action on="SelectionColumnChange">
 				updatePlayerList();
 			</action>
 			<action on="mouseleftclickitem">
 				// In case of clicking on the same player again
 				selectGameFromPlayername();
 			</action>
 			<action on="mouseleftdoubleclickitem">toggleBuddy();</action>
 		</object>
 	</object>
 
 	<object name="profilePanel" size="20 100%-310 20% 100%-104">
 		<object name="profileBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
 			<object name="profileArea" size="0 0 100% 100%" hidden="true">
 				<object name="usernameText" size="0 0 100% 45" type="text" style="ModernLabelText" font="sans-bold-16" />
 				<object name="roleText" size="0 45 100% 70" type="text" style="ModernLabelText" font="sans-bold-stroke-12" />
 				<object size="0 70 40%+40 90" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Current Rank:</translatableAttribute>
 				</object>
 				<object name="rankText" size="40%+45 70 100% 90" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 90 40%+40 110" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Highest Rating:</translatableAttribute>
 				</object>
 				<object name="highestRatingText" size="40%+45 90 100% 110" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 110 40%+40 130" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Total Games:</translatableAttribute>
 				</object>
 				<object name="totalGamesText" size="40%+45 110 100% 130" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 130 40%+40 150" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Wins:</translatableAttribute>
 				</object>
 				<object name="winsText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 150 40%+40 170" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Losses:</translatableAttribute>
 				</object>
 				<object name="lossesText" size="40%+45 150 100% 170" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 170 40%+40 190" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Win Rate:</translatableAttribute>
 				</object>
 				<object name="ratioText" size="40%+45 170 100% 190" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 			</object>
 		</object>
 	</object>
 
 	<object name="leftButtonPanel" size="20 100%-105 20% 100%-20">
 		<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 100%-79 100% 100%-54">
 			<action on="Press">
 				toggleBuddy();
 			</action>
 		</object>
 		<object name="leaderboardButton" type="button" style="ModernButtonRed" size="0 100%-52 100% 100%-27">
 			<translatableAttribute id="caption">Leaderboard</translatableAttribute>
 			<action on="Press">
 				setLeaderboardVisibility(true);
 			</action>
 		</object>
 		<object name="userprofileButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
 			<translatableAttribute id="caption">User Profile Lookup</translatableAttribute>
 			<action on="Press">
 				setUserProfileVisibility(true);
 			</action>
 		</object>
 	</object>
 
 	<!-- Right panel: Game details. -->
 	<object name="rightPanel">
 		<object name="gameInfoEmpty" type="image" sprite="ModernDarkBoxGold" hidden="false">
 			<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
 			<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
 				<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
 			</object>
 		</object>
 		<object name="gameInfo" type="image" sprite="ModernDarkBoxGold" hidden="true">
 
 			<!-- Map Name -->
 			<object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
 
 			<!-- Map Preview -->
 			<object name="sgMapPreview" size="5 25 100%-5 190" type="image" sprite=""/>
 
 			<object size="5 194 100%-5 195" type="image" sprite="ModernWhiteLine" z="25"/>
 
 			<!-- Map Type -->
 			<object size="5 195 50% 240" type="image" sprite="ModernItemBackShadeLeft">
 				<object size="0 0 100%-10 100%" type="text" style="ModernRightLabelText">
 					<translatableAttribute id="caption">Map Type:</translatableAttribute>
 				</object>
 			</object>
 			<object size="50% 195 100%-5 240" type="image" sprite="ModernItemBackShadeRight">
 				<object name="sgMapType" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
 			</object>
 
 			<object size="5 239 100%-5 240" type="image" sprite="ModernWhiteLine" z="25"/>
 
 			<!-- Map Size -->
 			<object size="5 240 50% 285" type="image" sprite="ModernItemBackShadeLeft">
 				<object size="0 0 100%-10 100%" type="text" style="ModernRightLabelText">
 					<translatableAttribute id="caption">Map Size:</translatableAttribute>
 				</object>
 			</object>
 			<object size="50% 240 100%-5 285" type="image" sprite="ModernItemBackShadeRight">
 				<object name="sgMapSize" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
 			</object>
 
 			<object size="5 284 100%-5 285" type="image" sprite="ModernWhiteLine" z="25"/>
 
 			<!-- Map Description -->
 			<object type="image" sprite="ModernDarkBoxWhite" size="3% 290 97% 65%">
 				<object name="sgMapDescription" size="0 0 100% 100%" type="text" style="ModernText" font="sans-12"/>
 			</object>
 
 			<object type="image" sprite="ModernDarkBoxWhite" size="3% 65%+5 97% 99%">
 				<!-- Number of Players -->
 				<object name="sgNbPlayers" size="3% 3% 97% 3%+15" type="text" style="ModernLabelText"/>
 				<!-- Game Start Time -->
 				<object name="sgGameStartTime" size="3%+24 6% 97% 3%+35" type="text" style="ModernLabelText"/>
 
 				<!-- Player Names -->
 				<object name="sgPlayersNames" size="0 0 100% 100%" type="text" style="MapPlayerList"/>
 			</object>
 		</object>
 		<object name="joinGameButton" type="button" style="ModernButtonRed" size="0 100%-79 100% 100%-54" hidden="true">
 			<translatableAttribute id="caption" comment="Join the game currently selected in the list.">Join Game</translatableAttribute>
 			<action on="Press">
 				joinButton();
 			</action>
 		</object>
 		<object name="hostButton" type="button" style="ModernButtonRed" size="0 100%-52 100% 100%-27">
 			<translatableAttribute id="caption">Host Game</translatableAttribute>
 			<action on="Press">
 				hostGame();
 			</action>
 		</object>
 
 		<object name="leaveButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
 			<action on="Press">leaveLobby();</action>
 		</object>
 	</object>
 
 	<!-- Middle panel: Filters, game list, chat box. -->
 	<object name="middlePanel">
 		<object name="gamesBox"
 			style="ModernSortedList"
 			selected_column="name"
 			selected_column_order="1"
 			type="olist"
 			sortable="true"
 			size="0 25 100% 48%"
 			font="sans-stroke-13"
 		>
 			<action on="SelectionChange">updateGameSelection();</action>
 			<action on="SelectionColumnChange">applyFilters();</action>
 			<action on="mouseleftdoubleclickitem">joinButton();</action>
 			<column id="buddy" width="12"/>
 			<column id="name" color="0 60 0" width="33%-12">
 				<translatableAttribute id="heading">Name</translatableAttribute>
 			</column>
 			<column id="mapName" color="128 128 128" width="25%">
 				<translatableAttribute id="heading">Map Name</translatableAttribute>
 			</column>
 			<column id="mapSize" color="128 128 128" width="16%">
 				<translatableAttribute id="heading" context="map">Size</translatableAttribute>
 			</column>
 			<column id="mapType" color="0 128 128" width="16%">
 				<translatableAttribute id="heading" context="map">Type</translatableAttribute>
 			</column>
 			<column id="nPlayers" color="0 128 128" width="10%">
 				<translatableAttribute id="heading">Players</translatableAttribute>
 			</column>
 			<column id="gameRating" color="0 128 128" width="16%">
 				<translatableAttribute id="heading">Rating</translatableAttribute>
 			</column>
 		</object>
 
 		<object name="filterPanel" size="0 0 100% 24">
 
 			<object name="mapSizeFilter"
 				type="dropdown"
 				style="ModernDropDown"
 				size="58%-5 0 74%-10 100%"
 				font="sans-bold-13">
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 
 			<object name="mapTypeFilter"
 				type="dropdown"
 				style="ModernDropDown"
 				size="74%-5 0 90%-10 100%"
 				font="sans-bold-13">
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 
 			<object name="playersNumberFilter"
 				type="dropdown"
 				style="ModernDropDown"
 				size="90%-5 0 100%-10 100%"
 				font="sans-bold-13">
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 
 			<object name="gameRatingFilter"
 				type="dropdown"
 				style="ModernDropDown"
 				size="84%-5 0 100%-10 100%"
 				font="sans-bold-13">
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 
 			<object type="text" size="22 0 52%-10 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Show only open games</translatableAttribute>
 			</object>
-			<object name="filterOpenGames"
-				type="checkbox"
-				checked="false"
-				style="ModernTickBox"
-				size="0 0 20 20"
-				font="sans-bold-13">
+			<object name="filterOpenGames" type="checkbox" checked="false" style="ModernTickBox" size="0 0 20 20">
 				<action on="Press">
 					applyFilters();
 				</action>
 			</object>
 		</object>
 
 		<object name="chatPanel" size="0 49% 100% 100%" type="image" sprite="ModernDarkBoxGold">
 			<object name="chatText" size="0 0 100% 100%-28" type="text" style="ChatPanel" font="sans-13"/>
 			<object name="chatInput" size="0 100%-26 100%-72 100%-4" type="input" style="ModernInput" font="sans-13">
 				<action on="Press">submitChatInput();</action>
 				<action on="Tab">
 					autoCompleteText(this, Engine.GetPlayerList().map(player => player.name));
 				</action>
 			</object>
 			<object size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 				<translatableAttribute id="caption">Send</translatableAttribute>
 				<action on="Press">submitChatInput();</action>
 			</object>
 		</object>
 	</object>
 
 	<!-- Translucent black background -->
 	<object hidden="true" name="fade" type="image" z="100" sprite="ModernFade"/>
 
 	<!-- Leaderboard -->
 	<object hidden="true" name="leaderboard" type="image" style="ModernDialog" size="50%-224 50%-160 50%+224 50%+160" z="101">
 		<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Leaderboard</translatableAttribute>
 		</object>
 		<object name="leaderboardBox"
 			style="ModernList"
 			type="olist"
 			size="19 19 100%-19 100%-62">
 			<column id="rank" color="255 255 255" width="15%">
 				<translatableAttribute id="heading">Rank</translatableAttribute>
 			</column>
 			<column id="name" color="255 255 255" width="55%">
 				<translatableAttribute id="heading">Name</translatableAttribute>
 			</column>
 			<column id="rating" color="255 255 255" width="30%">
 				<translatableAttribute id="heading">Rating</translatableAttribute>
 			</column>
 			<action on="SelectionChange">
 				lookupSelectedUserProfile(this.name);
 			</action>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%-133 100%-45 50%-5 100%-17" hotkey="cancel">
 			<translatableAttribute id="caption">Back</translatableAttribute>
 			<action on="Press">
 				setLeaderboardVisibility(false);
 			</action>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%+5 100%-45 50%+133 100%-17">
 			<translatableAttribute id="caption">Update</translatableAttribute>
 			<action on="Press">Engine.SendGetBoardList();</action>
 		</object>
 	</object>
 	<!-- End of leaderboard -->
 
 	<!-- User profile lookup -->
 	<object hidden="true" name="profileFetch" type="image" style="ModernDialog" size="50%-224 50%-160 50%+224 50%+160" z="102">
 		<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">User Profile Lookup</translatableAttribute>
 		</object>
 		<object type="text" size="15 25 40% 50" text_align="right" textcolor="white">
 				<translatableAttribute id="caption">Enter username:</translatableAttribute>
 		</object>
 		<object name="fetchInput" size="40%+10 25 100%-25 50" type="input" style="ModernInput" font="sans-13">
 			<action on="Press">lookupUserProfile();</action>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%-64 60 50%+64 85">
 			<translatableAttribute id="caption">View Profile</translatableAttribute>
 			<action on="Press">lookupUserProfile();</action>
 		</object>
 		<object name="profileWindowPanel" size="25 95 100%-25 100%-60">
 		<object name="profileWindowBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
 			<object name="profileWindowArea" size="0 0 100% 100%" hidden="true">
 				<object name="profileUsernameText" size="0 0 100% 25" type="text" style="ModernLabelText" font="sans-bold-16" />
 				<object size="0 30 40%+40 50" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Current Rank:</translatableAttribute>
 				</object>
 				<object name="profileRankText" size="40%+45 30 100% 50" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 50 40%+40 70" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Highest Rating:</translatableAttribute>
 				</object>
 				<object name="profileHighestRatingText" size="40%+45 50 100% 70" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 70 40%+40 90" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Total Games:</translatableAttribute>
 				</object>
 				<object name="profileTotalGamesText" size="40%+45 70 100% 90" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 90 40%+40 110" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Wins:</translatableAttribute>
 				</object>
 				<object name="profileWinsText" size="40%+45 90 100% 110" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 110 40%+40 130" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Losses:</translatableAttribute>
 				</object>
 				<object name="profileLossesText" size="40%+45 110 100% 130" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 				<object size="0 130 40%+40 150" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
 					<translatableAttribute id="caption">Win Rate:</translatableAttribute>
 				</object>
 				<object name="profileRatioText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 			</object>
 			<object name="profileErrorText" size="25% 25% 75% 75%" type="text" style="ModernLabelText" font="sans-bold-stroke-13" hidden="false">
 				<translatableAttribute id="caption">Please enter a player name.</translatableAttribute>
 			</object>
 		</object>
 		</object>
 		<object type="button" style="ModernButtonRed" size="50%-64 100%-50 50%+64 100%-25" hotkey="cancel">
 			<translatableAttribute id="caption">Back</translatableAttribute>
 			<action on="Press">
 				setUserProfileVisibility(false);
 			</action>
 		</object>
 	</object>
 	<!-- End of user profile lookup -->
 
 	<!-- Keep this hotkey at the end of the gui, because the other cancel hotkeys must be processed first! -->
 	<object hotkey="cancel" name="cancelDialog"/>
 
 </object>
Index: ps/trunk/source/gui/CCheckBox.cpp
===================================================================
--- ps/trunk/source/gui/CCheckBox.cpp	(revision 22951)
+++ ps/trunk/source/gui/CCheckBox.cpp	(revision 22952)
@@ -1,119 +1,87 @@
 /* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "CCheckBox.h"
 
-#include "gui/CGUIColor.h"
-#include "graphics/FontMetrics.h"
-#include "ps/CStrIntern.h"
-
-/**
- * TODO: Since there is no call to DrawText, the checkbox won't render any text.
- * Thus the font, caption, textcolor and other settings have no effect.
- */
 CCheckBox::CCheckBox(CGUI& pGUI)
-	: IGUIObject(pGUI), IGUITextOwner(pGUI), IGUIButtonBehavior(pGUI)
+	: IGUIObject(pGUI), IGUIButtonBehavior(pGUI)
 {
-	AddSetting<float>("buffer_zone");
-	AddSetting<CGUIString>("caption");
 	AddSetting<i32>("cell_id");
 	AddSetting<bool>("checked");
-	AddSetting<CStrW>("font");
 	AddSetting<CStrW>("sound_disabled");
 	AddSetting<CStrW>("sound_enter");
 	AddSetting<CStrW>("sound_leave");
 	AddSetting<CStrW>("sound_pressed");
 	AddSetting<CStrW>("sound_released");
 	AddSetting<CGUISpriteInstance>("sprite");
 	AddSetting<CGUISpriteInstance>("sprite_over");
 	AddSetting<CGUISpriteInstance>("sprite_pressed");
 	AddSetting<CGUISpriteInstance>("sprite_disabled");
 	AddSetting<CGUISpriteInstance>("sprite2");
 	AddSetting<CGUISpriteInstance>("sprite2_over");
 	AddSetting<CGUISpriteInstance>("sprite2_pressed");
 	AddSetting<CGUISpriteInstance>("sprite2_disabled");
-	AddSetting<float>("square_side");
-	AddSetting<CGUIColor>("textcolor");
-	AddSetting<CGUIColor>("textcolor_over");
-	AddSetting<CGUIColor>("textcolor_pressed");
-	AddSetting<CGUIColor>("textcolor_disabled");
 	AddSetting<CStrW>("tooltip");
 	AddSetting<CStr>("tooltip_style");
-
-	AddText();
 }
 
 CCheckBox::~CCheckBox()
 {
 }
 
-void CCheckBox::SetupText()
-{
-	ENSURE(m_GeneratedTexts.size() == 1);
-
-	m_GeneratedTexts[0] = CGUIText(
-		m_pGUI,
-		GetSetting<CGUIString>("caption"),
-		GetSetting<CStrW>("font"),
-		m_CachedActualSize.GetWidth() - GetSetting<float>("square_side"),
-		GetSetting<float>("buffer_zone"),
-		this);
-}
-
 void CCheckBox::HandleMessage(SGUIMessage& Message)
 {
 	// Important
 	IGUIButtonBehavior::HandleMessage(Message);
-	IGUITextOwner::HandleMessage(Message);
 
 	switch (Message.type)
 	{
 	case GUIM_PRESSED:
 	{
 		// Switch to opposite.
 		SetSetting<bool>("checked", !GetSetting<bool>("checked"), true);
 		break;
 	}
 
 	default:
 		break;
 	}
 }
 
 void CCheckBox::Draw()
 {
 	if (GetSetting<bool>("checked"))
 		DrawButton(
 			m_CachedActualSize,
 			GetBufferedZ(),
 			GetSetting<CGUISpriteInstance>("sprite2"),
 			GetSetting<CGUISpriteInstance>("sprite2_over"),
 			GetSetting<CGUISpriteInstance>("sprite2_pressed"),
 			GetSetting<CGUISpriteInstance>("sprite2_disabled"),
 			GetSetting<i32>("cell_id"));
 	else
 		DrawButton(
 			m_CachedActualSize,
 			GetBufferedZ(),
 			GetSetting<CGUISpriteInstance>("sprite"),
 			GetSetting<CGUISpriteInstance>("sprite_over"),
 			GetSetting<CGUISpriteInstance>("sprite_pressed"),
 			GetSetting<CGUISpriteInstance>("sprite_disabled"),
 			GetSetting<i32>("cell_id"));
 }
Index: ps/trunk/source/gui/CCheckBox.h
===================================================================
--- ps/trunk/source/gui/CCheckBox.h	(revision 22951)
+++ ps/trunk/source/gui/CCheckBox.h	(revision 22952)
@@ -1,56 +1,47 @@
 /* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef INCLUDED_CCHECKBOX
 #define INCLUDED_CCHECKBOX
 
 #include "gui/IGUIButtonBehavior.h"
-#include "gui/IGUIObject.h"
-#include "gui/IGUITextOwner.h"
 
-class CCheckBox : public IGUIButtonBehavior, public IGUITextOwner
+class CCheckBox : public IGUIButtonBehavior
 {
 	GUI_OBJECT(CCheckBox)
 
 public:
 	CCheckBox(CGUI& pGUI);
 	virtual ~CCheckBox();
 
 	/**
 	 * @see IGUIObject#ResetStates()
 	 */
 	virtual void ResetStates() { IGUIButtonBehavior::ResetStates(); }
 
 	/**
 	 * @see IGUIObject#HandleMessage()
 	 */
 	virtual void HandleMessage(SGUIMessage& Message);
 
 	/**
 	 * Draws the control
 	 */
 	virtual void Draw();
-
-protected:
-	/**
-	 * Sets up text, should be called every time changes has been
-	 * made that can change the visual.
-	 */
-	void SetupText();
 };
 
 #endif // INCLUDED_CCHECKBOX
Index: ps/trunk/source/gui/CRadioButton.cpp
===================================================================
--- ps/trunk/source/gui/CRadioButton.cpp	(revision 22951)
+++ ps/trunk/source/gui/CRadioButton.cpp	(revision 22952)
@@ -1,50 +1,49 @@
 /* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "CRadioButton.h"
 
 CRadioButton::CRadioButton(CGUI& pGUI)
 	: CCheckBox(pGUI), IGUIObject(pGUI)
 {
 }
 
 void CRadioButton::HandleMessage(SGUIMessage& Message)
 {
 	// Important
 	IGUIButtonBehavior::HandleMessage(Message);
-	IGUITextOwner::HandleMessage(Message);
 
 	switch (Message.type)
 	{
 	case GUIM_PRESSED:
 		for (IGUIObject* const& obj : GetParent()->GetChildren())
 		{
 			// Notice, if you use other objects within the parent object that has got
 			//  the setting "checked", it too will change. Hence NO OTHER OBJECTS THAN
 			//  RADIO BUTTONS SHOULD BE WITHIN IT!
 			obj->SetSetting<bool>("checked", false, true);
 		}
 
 		SetSetting<bool>("checked", true, true);
 		break;
 
 	default:
 		break;
 	}
 }