diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg
index 09ba8ef56d..5cf4d4a46f 100755
--- a/binaries/data/config/system.cfg
+++ b/binaries/data/config/system.cfg
@@ -35,6 +35,9 @@ lodbias = -1.0
 ; Language selection: (currently "english" or "pseudogreek")
 language=english
 
+; Enable/disable windowed mode.
+windowed=false
+
 ; You can specify these as well, but the default (keeping the current resolution) is
 ; probably best for most people.
 ; xres = 1024
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab.png
index 5164a226e9..355354f09d 100644
--- a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab.png
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46884c3d84d1f3e0e76e4a0a025e806a6eac77dc56ce3ee647dcf86158292ed3
-size 511
+oid sha256:74b18352fbdb59a9caae1deb39fa270c25369d62643e2b9154e5aaf7ece758eb
+size 482
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png
index 6556d7ad28..ce1d148312 100644
--- a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbfeb326382581e263b4b942e90767d6345b3dbf7a81d46e6effb8d32f86d4fe
-size 543
+oid sha256:bab59b3d691803e481a61d3c39eaedd9742de1a27e3d607d6def9c6cc9f75006
+size 507
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_icon_15x15.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_icon_15x15.png
index d5997ce54d..2bc30513fd 100644
--- a/binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_icon_15x15.png
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_icon_15x15.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a937a168c3587a6dfb48309209f401d301b6b309d6964f30609bc8ff84f880db
-size 2792
+oid sha256:fe044b54e7a42e05541b89f4fc10932b64368390b6c3812b15577c2c0d140619
+size 2674
diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index bfafdbfba1..e62fef3e0f 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -43,460 +43,549 @@
 
 			<!-- MAP CREATOR SECTION MENU -->
 			<object type="empty" name="atlas_left_pane_section_map" size="0 0 100% 100%" z="1" hidden="true">
-				<!-- MAP SIZE SETTINGS -->
-				<object type="text" name="atlas_left_pane_section_map_size_label" style="atlas_label_text" hidden="false">Size
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_size_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_tile_width_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_tile_width_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box",200);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_map_tile_x" style="atlas_label_text" hidden="false">X
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_tile_x", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_X], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_tile_height_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_tile_height_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box",200);
-					]]></action>
-				</object>
-				<object type="empty" name="atlas_left_pane_section_map_size_radio" size="0 0 100% 100%" z="1" hidden="false">
-					<object type="button" name="atlas_left_pane_section_map_size_button_small" style="atlas_button" hidden="false">Small
+				<object type="empty" name="atlas_left_pane_section_map_type_size" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_left_pane_section_map_size_label" style="atlas_label_text" hidden="false">Size
 						<action on="Load"><![CDATA[
-							setSizeArray("atlas_left_pane_section_map_size_button_small", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_SMALL], left_screen, top_screen, left_screen, top_screen);
-						]]></action>
-						<action on="Press"><![CDATA[
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 100);
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 100);
+							setSizeArray("atlas_left_pane_section_map_size_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_LABEL], left_screen, top_screen, left_screen, top_screen);
 						]]></action>
 					</object>
-					<object type="button" name="atlas_left_pane_section_map_size_button_medium" style="atlas_button" font="tahoma9" hidden="false">Medium
+					<object type="input" name="atlas_left_pane_section_map_tile_width_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
 						<action on="Load"><![CDATA[
-							setSizeArray("atlas_left_pane_section_map_size_button_medium", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_MEDIUM], left_screen, top_screen, left_screen, top_screen);
-						]]></action>
-						<action on="Press"><![CDATA[
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 200);
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 200);
+							setSizeArray("atlas_left_pane_section_map_tile_width_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box",200);
 						]]></action>
 					</object>
-					<object type="button" name="atlas_left_pane_section_map_size_button_large" style="atlas_button" hidden="false">Large
+					<object type="text" name="atlas_left_pane_section_map_tile_x" style="atlas_label_text" hidden="false">X
 						<action on="Load"><![CDATA[
-							setSizeArray("atlas_left_pane_section_map_size_button_large", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_LARGE], left_screen, top_screen, left_screen, top_screen);
-						]]></action>
-						<action on="Press"><![CDATA[
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 300);
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 300);
+							setSizeArray("atlas_left_pane_section_map_tile_x", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_X], left_screen, top_screen, left_screen, top_screen);
 						]]></action>
 					</object>
-					<object type="button" name="atlas_left_pane_section_map_size_button_huge" style="atlas_button" hidden="false">Huge
+					<object type="input" name="atlas_left_pane_section_map_tile_height_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
 						<action on="Load"><![CDATA[
-							setSizeArray("atlas_left_pane_section_map_size_button_huge", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_HUGE], left_screen, top_screen, left_screen, top_screen);
+							setSizeArray("atlas_left_pane_section_map_tile_height_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box",200);
 						]]></action>
-						<action on="Press"><![CDATA[
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 400);
-							GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 400);
+					</object>
+					<object type="empty" name="atlas_left_pane_section_map_size_radio" size="0 0 100% 100%" z="1" hidden="false">
+						<object type="button" name="atlas_left_pane_section_map_size_button_small" style="atlas_button" hidden="false">Small
+							<action on="Load"><![CDATA[
+								setSizeArray("atlas_left_pane_section_map_size_button_small", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_SMALL], left_screen, top_screen, left_screen, top_screen);
+							]]></action>
+							<action on="Press"><![CDATA[
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 100);
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 100);
+							]]></action>
+						</object>
+						<object type="button" name="atlas_left_pane_section_map_size_button_medium" style="atlas_button" font="tahoma9" hidden="false">Medium
+							<action on="Load"><![CDATA[
+								setSizeArray("atlas_left_pane_section_map_size_button_medium", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_MEDIUM], left_screen, top_screen, left_screen, top_screen);
+							]]></action>
+							<action on="Press"><![CDATA[
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 200);
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 200);
+							]]></action>
+						</object>
+						<object type="button" name="atlas_left_pane_section_map_size_button_large" style="atlas_button" hidden="false">Large
+							<action on="Load"><![CDATA[
+								setSizeArray("atlas_left_pane_section_map_size_button_large", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_LARGE], left_screen, top_screen, left_screen, top_screen);
+							]]></action>
+							<action on="Press"><![CDATA[
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 300);
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 300);
+							]]></action>
+						</object>
+						<object type="button" name="atlas_left_pane_section_map_size_button_huge" style="atlas_button" hidden="false">Huge
+							<action on="Load"><![CDATA[
+								setSizeArray("atlas_left_pane_section_map_size_button_huge", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_HUGE], left_screen, top_screen, left_screen, top_screen);
+							]]></action>
+							<action on="Press"><![CDATA[
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_width_input_box", 400);
+								GUIObjectSetCaption("atlas_left_pane_section_map_tile_height_input_box", 400);
+							]]></action>
+						</object>
+					</object>
+					<object type="text" name="atlas_left_pane_section_map_size_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_size_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_HR], left_screen, top_screen, left_screen, top_screen);
 						]]></action>
 					</object>
 				</object>
-				<object type="text" name="atlas_left_pane_section_map_size_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_size_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<!-- MAP SETTINGS -->
-				<object type="text" name="atlas_left_pane_section_map_settings_player_label" style="atlas_label_text" hidden="false">Players
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_player_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_LABEL], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_settings_player_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_player_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX], left_screen, mid_screen, left_screen, mid_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_map_settings_player_input_box", 4);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_map_settings_player_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_player_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_UP], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_map_settings_player_input_box", 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_map_settings_player_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_player_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_DN], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_map_settings_player_input_box", -1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_map_settings_settlement_label" style="atlas_label_text" hidden="false">Settlements
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_settlement_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_LABEL], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_settings_settlement_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX], left_screen, mid_screen, left_screen, mid_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_map_settings_settlement_input_box", 2);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_map_settings_settlement_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_UP], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_map_settings_settlement_input_box", 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_map_settings_settlement_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_DN], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_map_settings_settlement_input_box", -1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_map_settings_resources_label" style="atlas_label_text" hidden="false">Resources
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_resources_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_LABEL], left_screen, mid_screen, left_screen, mid_screen);
-					]]></action>
-				</object>
+				<object type="empty" name="atlas_left_pane_section_map_settings" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_left_pane_section_map_settings_player_label" style="atlas_label_text" hidden="false">Players
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_player_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_LABEL], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_map_settings_player_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_player_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX], left_screen, mid_screen, left_screen, mid_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_map_settings_player_input_box", 4);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_map_settings_player_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_player_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_UP], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_map_settings_player_input_box", 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_map_settings_player_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_player_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_DN], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_map_settings_player_input_box", -1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_map_settings_settlement_label" style="atlas_label_text" hidden="false">Settlements
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_settlement_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_LABEL], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_map_settings_settlement_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX], left_screen, mid_screen, left_screen, mid_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_map_settings_settlement_input_box", 2);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_map_settings_settlement_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_UP], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_map_settings_settlement_input_box", 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_map_settings_settlement_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_settlement_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_DN], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_map_settings_settlement_input_box", -1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_map_settings_resources_label" style="atlas_label_text" hidden="false">Resources
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_resources_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_LABEL], left_screen, mid_screen, left_screen, mid_screen);
+						]]></action>
+					</object>
 <!-- NOTE: Needs to be made a drop-down box when this control becomes available (options Low (.5), Normal (0), High (2) ). -->
-				<object type="input" name="atlas_left_pane_section_map_settings_resources_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_settings_resources_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX], left_screen, mid_screen, left_screen, mid_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_map_settings_resources_combo_box", "Normal");
-					]]></action>
+					<object type="input" name="atlas_left_pane_section_map_settings_resources_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_settings_resources_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX], left_screen, mid_screen, left_screen, mid_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_map_settings_resources_combo_box", "Normal");
+						]]></action>
+					</object>
 				</object>
-				<!-- GENERATE -->
-				<object type="text" name="atlas_left_pane_section_map_generate_terrain_map_label" style="atlas_label_text" hidden="false">Terrain Map
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_terrain_map_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_generate_terrain_map_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_terrain_map_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_INPUT_BOX], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_map_generate_height_map_label" style="atlas_label_text" hidden="false">Height Map
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_height_map_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_HEIGHT_MAP_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_map_generate_height_map_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_height_map_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_HEIGHT_MAP_INPUT_BOX], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_map_generate_border" sprite="atlas_border" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_border", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_BORDER], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_map_generate_button" sprite="atlas_button" style="atlas_heading" hidden="false">Generate!
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_map_generate_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_BUTTON], left_screen, bottom_screen, left_screen, bottom_screen);
-					]]></action>
+				<object type="empty" name="atlas_left_pane_section_map_generate" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_left_pane_section_map_generate_terrain_map_label" style="atlas_label_text" hidden="false">Terrain Map
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_terrain_map_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_map_generate_terrain_map_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_terrain_map_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_INPUT_BOX], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_map_generate_height_map_label" style="atlas_label_text" hidden="false">Height Map
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_height_map_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_HEIGHT_MAP_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_map_generate_height_map_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_height_map_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_HEIGHT_MAP_INPUT_BOX], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_map_generate_border" sprite="atlas_border" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_border", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_BORDER], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_map_generate_button" sprite="atlas_button" style="atlas_heading" hidden="false">Generate!
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_map_generate_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_GENERATE_BUTTON], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
 				</object>
 			</object>
 
 			<!-- TERRAIN EDITOR SECTION MENU -->
 			<object type="empty" name="atlas_left_pane_section_terrain" size="0 0 100% 100%" z="1" hidden="true">
-				<!-- TERRAIN EDITOR: EDIT ELEVATION -->
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_modify_button" style="atlas_button" hidden="false">Modify
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_modify_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_MODIFY_BUTTON], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_smooth_button" style="atlas_button" hidden="false">Smooth
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_smooth_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SMOOTH_BUTTON], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_sample_button" style="atlas_button" hidden="false">Sample
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_sample_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SAMPLE_BUTTON], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_intensity_label" style="atlas_label_text" hidden="false">Intensity
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
+				<object type="empty" name="atlas_left_pane_section_terrain_elevation" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_modify_button" style="atlas_button" hidden="false">Modify
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_modify_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_MODIFY_BUTTON], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_smooth_button" style="atlas_button" hidden="false">Smooth
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_smooth_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SMOOTH_BUTTON], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_sample_button" style="atlas_button" hidden="false">Sample
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_sample_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SAMPLE_BUTTON], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_intensity_label" style="atlas_label_text" hidden="false">Intensity
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
 <!-- NOTE: This will need to be replaced with a real slider when the control becomes available. -->
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_intensity_slider_bar" sprite="atlas_global_slider_bar_h" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_slider_bar", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_SLIDER_BAR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_intensity_slider_marker" sprite="atlas_global_slider_marker_h" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_slider_marker", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_SLIDER_MARKER], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_roughen_button" style="atlas_button" hidden="false">Roughen
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_roughen_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_ROUGHEN_BUTTON], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_style_label" style="atlas_label_text" hidden="false">Style
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_style_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_intensity_slider_bar" sprite="atlas_global_slider_bar_h" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_slider_bar", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_SLIDER_BAR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_intensity_slider_marker" sprite="atlas_global_slider_marker_h" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_intensity_slider_marker", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_SLIDER_MARKER], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_roughen_button" style="atlas_button" hidden="false">Roughen
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_roughen_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_ROUGHEN_BUTTON], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_style_label" style="atlas_label_text" hidden="false">Style
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_style_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
 <!-- NOTE: Needs to be made a drop-down box when this control becomes available. -->
-				<object type="input" name="atlas_left_pane_section_terrain_elevation_style_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_style_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_style_combo_box", "Bumpy");
-					]]></action>
+					<object type="input" name="atlas_left_pane_section_terrain_elevation_style_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_style_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_style_combo_box", "Bumpy");
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_power_label" style="atlas_label_text" hidden="false">Power
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_power_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_elevation_power_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_power_input_box", "2.1");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_power_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_power_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_power_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_power_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_scale_label" style="atlas_label_text" hidden="false">Scale
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_scale_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_elevation_scale_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", "1.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_scale_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_scale_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_increment_button" style="atlas_button" hidden="false">Increment
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_increment_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_amount_label" style="atlas_label_text" hidden="false">Amount
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_amount_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_elevation_amount_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", "1.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_amount_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_elevation_amount_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_elevation_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_elevation_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
 				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_power_label" style="atlas_label_text" hidden="false">Power
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_power_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
+				<object type="empty" name="atlas_left_pane_section_terrain_cliff" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_list" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_list", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_heading" style="atlas_label_text" hidden="false">Cliff
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_heading", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_heading_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_heading_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_button_place" style="atlas_button" hidden="false">Place Cliff
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_button_place", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_height_label" style="atlas_label_text" text_align="left" hidden="false">Height
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_height_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_cliff_height_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_height_input_box", "3.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_height_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_height_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_height_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_height_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_angle_label" style="atlas_label_text" text_align="left" hidden="false">Angle
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_angle_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_cliff_angle_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", "65.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_angle_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_angle_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_smooth_label" style="atlas_label_text" text_align="left" hidden="false">Smooth
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_cliff_smooth_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", "1.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_smooth_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_smooth_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_cliff_button_custom" style="atlas_button" hidden="false">Custom Cliff
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_button_custom", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_cliff_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_cliff_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
 				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_elevation_power_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_power_input_box", "2.1");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_power_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_power_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_power_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_power_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_power_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_scale_label" style="atlas_label_text" hidden="false">Scale
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_scale_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_elevation_scale_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", "1.0");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_scale_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_scale_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_scale_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_scale_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_increment_button" style="atlas_button" hidden="false">Increment
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_increment_button", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_amount_label" style="atlas_label_text" hidden="false">Amount
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_amount_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_elevation_amount_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", "1.0");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_amount_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_elevation_amount_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_amount_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_elevation_amount_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_elevation_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_elevation_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<!-- TERRAIN EDITOR: CLIFF -->
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_list" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_list", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_heading" style="atlas_label_text" hidden="false">Cliff
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_heading", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_heading_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_heading_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_button_place" style="atlas_button" hidden="false">Place Cliff
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_button_place", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_height_label" style="atlas_label_text" text_align="left" hidden="false">Height
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_height_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_cliff_height_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_height_input_box", "3.0");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_height_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_height_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_height_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_height_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_height_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_angle_label" style="atlas_label_text" text_align="left" hidden="false">Angle
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_angle_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_cliff_angle_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", "65.0");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_angle_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_angle_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_angle_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_angle_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_smooth_label" style="atlas_label_text" text_align="left" hidden="false">Smooth
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_LABEL], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="input" name="atlas_left_pane_section_terrain_cliff_smooth_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
-						GUIObjectSetCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", "1.0");
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_smooth_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", .1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_smooth_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_smooth_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-					<action on="Press"><![CDATA[
-						GUIObjectModifyCaption("atlas_left_pane_section_terrain_cliff_smooth_input_box", -.1, 1);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_cliff_button_custom" style="atlas_button" hidden="false">Custom Cliff
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_button_custom", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_cliff_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_cliff_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<!-- TERRAIN EDITOR: WATER -->
-				<object type="text" name="atlas_left_pane_section_terrain_water_list" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_list", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_water_heading" style="atlas_label_text" hidden="false">Water
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_heading", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_water_heading_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_heading_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_water_button_place" style="atlas_button" hidden="false">Place Water
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_button_place", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="button" name="atlas_left_pane_section_terrain_water_button_custom" style="atlas_button" hidden="false">Custom Water
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_button_custom", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_CUSTOM], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
-				</object>
-				<object type="text" name="atlas_left_pane_section_terrain_water_hr" sprite="atlas_hline" hidden="false">
-					<action on="Load"><![CDATA[
-						setSizeArray("atlas_left_pane_section_terrain_water_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HR], left_screen, top_screen, left_screen, top_screen);
-					]]></action>
+				<object type="empty" name="atlas_left_pane_section_terrain_water" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_left_pane_section_terrain_water_list" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_list", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_heading" style="atlas_label_text" hidden="false">Water
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_heading", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_heading_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_heading_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_button_place" style="atlas_button" hidden="false">Place Water
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_button_place", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_depth_label" style="atlas_label_text" text_align="left" hidden="false">Depth
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_depth_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_water_depth_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_depth_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_depth_input_box", "4.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_depth_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_depth_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_water_depth_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_depth_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_depth_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_water_depth_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_colour_label" style="atlas_label_text" text_align="left" hidden="false">Colour
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_colour_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_water_colour_r_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_colour_r_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_colour_r_input_box", "100");
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_water_colour_g_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_colour_g_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_colour_g_input_box", "255");
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_water_colour_b_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_colour_b_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_colour_b_input_box", "80");
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_colour_tint_box" style="atlas_indent" text_align="left" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_colour_tint_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_TINT_BOX], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_smooth_label" style="atlas_label_text" text_align="left" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_smooth_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_smooth_label","Smooth\nRadius");
+						]]></action>
+					</object>
+					<object type="input" name="atlas_left_pane_section_terrain_water_smooth_input_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_smooth_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
+							GUIObjectSetCaption("atlas_left_pane_section_terrain_water_smooth_input_box", "4.0");
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_smooth_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_smooth_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_water_smooth_input_box", .1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_smooth_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_smooth_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+							GUIObjectModifyCaption("atlas_left_pane_section_terrain_water_smooth_input_box", -.1, 1);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_left_pane_section_terrain_water_button_custom" style="atlas_button" hidden="false">Custom Water
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_button_custom", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_CUSTOM], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_left_pane_section_terrain_water_hr" sprite="atlas_hline" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_left_pane_section_terrain_water_hr", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HR], left_screen, top_screen, left_screen, top_screen);
+						]]></action>
+					</object>
 				</object>
 			</object>
 		</object>
-
+	
 		<!-- BOTTOM SELECTION PANE: Context panel along the bottom of the screen. -->
 		<object type="empty" name="atlas_bottom_pane" size="0 0 100% 100%" z="1" hidden="true">
 
@@ -527,6 +616,104 @@
 					setSizeArray("atlas_rb_corner", atlasCoord[ATLAS_RB_CORNER], right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
+
+			<object type="empty" name="atlas_bottom_pane_section_terrain" size="0 0 100% 100%" z="1" hidden="false">
+				<object type="empty" name="atlas_bottom_pane_section_terrain_other" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_bottom_pane_section_terrain_preview" style="atlas_indent" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_preview", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_bottom_pane_section_terrain_preview_label" style="atlas_label_text" hidden="false">Terrain Preview
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_preview_label", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_bottom_pane_section_terrain_brush_border_label" style="atlas_label_text" hidden="false">Brush
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_border_label", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="text" name="atlas_bottom_pane_section_terrain_brush_border" sprite="atlas_border" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_border", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+<!-- NOTE: This will need to be replaced with a real slider when the control becomes available. -->
+					<object type="text" name="atlas_bottom_pane_section_terrain_brush_size_slider_bar" sprite="atlas_global_slider_bar_v" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_size_slider_bar", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_brush_size_slider_marker" sprite="atlas_global_slider_marker_v" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_size_slider_marker", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_MARKER], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_brush_button_1" style="atlas_icon" cell_id="4" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_button_1", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_brush_button_2" style="atlas_icon" cell_id="5" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_button_2", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_2], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_brush_button_3" style="atlas_icon" cell_id="6" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_button_3", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_brush_button_4" style="atlas_icon" cell_id="7" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_brush_button_4", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_4], left_screen, bottom_screen, left_screen, bottom_screen);
+						]]></action>
+					</object>
+				</object>
+				<object type="empty" name="atlas_bottom_pane_section_terrain_palette" size="0 0 100% 100%" z="1" hidden="false">
+					<object type="text" name="atlas_bottom_pane_section_terrain_palette_bkg" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_palette_bkg", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG], right_screen, bottom_screen, right_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_1" style="atlas_tab" hidden="false">All
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_2" style="atlas_tab" hidden="false">Grass
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_3" style="atlas_tab" hidden="false">Dirt
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_4" style="atlas_tab" hidden="false">Snow
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_5" style="atlas_tab" hidden="false">Shoreline
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_6" style="atlas_tab" hidden="false">Forest
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_7" style="atlas_tab" hidden="false">Road
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_8" style="atlas_tab" hidden="false">City
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_tab_9" style="atlas_tab" hidden="false">Sand
+						<action on="Load"><![CDATA[
+							// Seek through ALL menu buttons and set their sizes at once. (So make sure this always goes in the last menu button.)
+							for (ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last = 1; ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last <= ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.max; ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last++)
+								setSizeArray("atlas_bottom_pane_section_terrain_palette_tab_" + ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last, atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last]], right_screen, bottom_screen, right_screen, bottom_screen);
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_rt_arrow" sprite="atlas_global_arrow_rt" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Terrain Palette Right Arrow[font=tahoma10]\nClick to display more terrain palette tabs." hidden="false">
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_palette_rt_arrow", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW], right_screen, bottom_screen, right_screen, bottom_screen);
+						]]></action>
+						<action on="Press"><![CDATA[
+						]]></action>
+					</object>
+					<object type="button" name="atlas_bottom_pane_section_terrain_palette_button_custom" style="atlas_button" hidden="false">Custom Terrain
+						<action on="Load"><![CDATA[
+							setSizeArray("atlas_bottom_pane_section_terrain_palette_button_custom", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BUTTON_CUSTOM], right_screen, bottom_screen, right_screen, bottom_screen);
+						]]></action>
+					</object>
+				</object>
+			</object>
 		</object>
 
 		<!-- RB: MINIMAP: Displays whole map. Identical functionality to session map, just a little smaller. -->
diff --git a/binaries/data/mods/official/gui/test/functions_atlas.js b/binaries/data/mods/official/gui/test/functions_atlas.js
index ddd63d4621..78129adb6a 100755
--- a/binaries/data/mods/official/gui/test/functions_atlas.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas.js
@@ -94,10 +94,10 @@ function initAtlas()
 
 	// Fully Minimise arrow on tool bar.
 	ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
-		8,
+		12,
 		4
 	); atlasCoord_Last 				= addSizeArrayXY(atlasCoord, atlasCoord_Last,
-		atlasCoord[ATLAS_MAINBORDER_RT_CORNER].x+atlasCoord[ATLAS_MAINBORDER_RT_CORNER].width+atlasCoord[ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW].width-11,
+		atlasCoord[ATLAS_MAINBORDER_RT_CORNER].x+atlasCoord[ATLAS_MAINBORDER_RT_CORNER].width+atlasCoord[ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW].width-15,
 		atlasCoord[ATLAS_MAINBORDER_TOOLBAR_BKG].y+3
 	);
 
@@ -164,6 +164,8 @@ function initAtlas()
 		atlasCoord[ATLAS_MAINBORDER_TOOLBAR_BKG].y+atlasCoord[ATLAS_MAINBORDER_TOOLBAR_BKG].height
 	);
 
+	// ============================================= GENERIC BOTTOM SECTION MENU ===============================================
+
 	// Bottom-right Mini Map Background.
 	ATLAS_MINIMAP_BKG	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		182,
@@ -218,6 +220,13 @@ function initAtlas()
 		atlasCoord[ATLAS_MINIMAP_BKG].y+atlasCoord[ATLAS_MINIMAP_BKG].height+4
 	);
 
+	// Setup margins for Bottom Section Menu.
+	ATLAS_BOTTOM_PANE_SECTION = new Object();
+	ATLAS_BOTTOM_PANE_SECTION.LMARGIN = 5;
+	ATLAS_BOTTOM_PANE_SECTION.RMARGIN = 5;
+	ATLAS_BOTTOM_PANE_SECTION.TMARGIN = 5;
+	ATLAS_BOTTOM_PANE_SECTION.BMARGIN = 5;
+
 	// ============================================= GENERIC LEFT SECTION MENU ===============================================
 
 	// Second heading of section menu.
@@ -532,7 +541,7 @@ function initAtlas()
 
 	// Intensity slider bar.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INTENSITY_SLIDER_BAR		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
-		110,
+		138,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SMOOTH_BUTTON].height
 	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SMOOTH_BUTTON].x,
@@ -912,6 +921,123 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR].height+(ATLAS_LEFT_PANE_SECTION.TMARGIN/2)
 	);
 
+	// Depth label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Depth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+				atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].y
+	);
+
+	// Up button for depth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		(atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height/2)+3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].y-3
+	);
+
+	// Down button for depth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_DN	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_DN].height
+	);
+
+	// Colour label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Colour input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height/3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
+	);
+
+	// Colour input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height/3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
+	);
+
+	// Colour input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height/3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
+	);
+
+	// Colour tint box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_TINT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].width/3,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].height/2
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].width/5,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].height+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL].height/3
+	);
+
+	// Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Up button for Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		(atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].height/2)+3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].y-3
+	);
+
+	// Down button for Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_DN	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_DN].height
+	);
+
+	// Smooth label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX].y-2
+	);
+
 	// Custom button.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_CUSTOM	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].width,
@@ -929,6 +1055,152 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR].x,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].height+ATLAS_LEFT_PANE_SECTION.BMARGIN
 	);
+
+	// =============================================     BOTTOM MENU SECTIONS  ===================================================
+
+	// ============================================= TERRAIN EDITOR: BRUSH SETTINGS ==============================================
+
+	// Terrain Preview.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		125,
+		125
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		ATLAS_LEFT_PANE_SECTION.LMARGIN,
+		ATLAS_LEFT_PANE_SECTION.LMARGIN
+	);
+
+	// Terrain Preview label.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW_LABEL	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].width,
+		15
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].x,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].height
+	);
+
+	// Brush border.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_RB_CORNER].x-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].x+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].width+(atlasCoord[ATLAS_RB_CORNER].width/4),
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW].y
+	);
+
+	// Brush border label.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER_LABEL	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].width,
+		15
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].x,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].height
+	);
+
+	// Brush size slider bar.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		15,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].height+11
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].x+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].width-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR].width-5,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].y-22
+	);
+
+	// Brush size slider marker.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_MARKER	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR].width,
+		8
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR].x-3,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_SIZE_SLIDER_BAR].y+70
+	);
+
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_SPAN = 5;
+
+	// Brush button.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		15,
+		15
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].x+10,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].height-15-10
+	);
+
+	// Brush button.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_2	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].x,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].y-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].height-ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_SPAN
+	);
+
+	// Brush button.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].x,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_2].y-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_2].height-ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_SPAN
+	);
+
+	// Brush button.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_4	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].x,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3].y-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3].height-ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_SPAN
+	);
+
+	// ============================================= TERRAIN EDITOR: PAINT TERRAIN ===============================================
+
+	// Terrain Palette Background.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		603,
+		122
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_RB_CORNER].x+atlasCoord[ATLAS_RB_CORNER].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_BKG].y+5
+	);
+
+	// Terrain Palette Tabs.	
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB = new Object();
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.span = 9;
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.max = 9;
+	for (ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last = 1; ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last <= ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.max; ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last++)
+	{
+		ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last] = atlasCoord_Last;
+		atlasCoord[atlasCoord_Last] = new Object();
+		atlasCoord[atlasCoord_Last].width = 63;
+		atlasCoord[atlasCoord_Last].height = 17;
+
+		if (ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last == 1)
+			atlasCoord[atlasCoord_Last].x = atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].x+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].width-atlasCoord[atlasCoord_Last].width+2;
+		else
+			atlasCoord[atlasCoord_Last].x = atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last]-1].x-atlasCoord[atlasCoord_Last].width+ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.span;
+
+		atlasCoord[atlasCoord_Last].y = atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].height;
+
+		atlasCoord_Last++;
+	}
+
+	// Custom button.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BUTTON_CUSTOM	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].x-1,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BKG].height+3
+	);
+
+	// Right arrow on Terrain Palette.
+	ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		6,
+		12
+	); atlasCoord_Last 				= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last-1]].x-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW].width-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW].width,
+		atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BUTTON_CUSTOM].y-2
+	);
 }
 
 // ====================================================================
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index d252d19787..5cd30d1e37 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -950,19 +950,19 @@
         </sprite>
 
         <sprite name="atlas_global_arrow_up">
-                <image texture="atlas/atlas_global_arrow_up.png" texture_size="0 0 8 4" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_up.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_dn">
-                <image texture="atlas/atlas_global_arrow_dn.png" texture_size="0 0 8 4" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_dn.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_lt">
-                <image texture="atlas/atlas_global_arrow_lt.png" texture_size="0 0 4 8" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_lt.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_rt">
-                <image texture="atlas/atlas_global_arrow_rt.png" texture_size="0 0 4 8" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_rt.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
 	<sprite name="atlas_sheet_toolbar_button">
@@ -996,21 +996,64 @@
 	</sprite>
 
         <sprite name="atlas_global_slider_bar_h">
-                <image texture="atlas/atlas_global_slider_bar_h.png" texture_size="0 0 128 16" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_slider_bar_h.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_slider_marker_h">
-                <image texture="atlas/atlas_global_slider_marker_h.png" texture_size="0 0 8 16" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_slider_marker_h.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_slider_bar_v">
-                <image texture="atlas/atlas_global_slider_bar_v.png" texture_size="0 0 16 128" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_slider_bar_v.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_slider_marker_v">
-                <image texture="atlas/atlas_global_slider_marker_v.png" texture_size="0 0 16 8" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_slider_marker_v.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
         </sprite>
 
+        <sprite name="atlas_global_tab">
+                <image texture="atlas/atlas_global_tab.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
+        </sprite>
+
+        <sprite name="atlas_global_tab_lit">
+                <image texture="atlas/atlas_global_tab_lit.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
+        </sprite>
+
+	<sprite name="atlas_sheet_icon">
+		<image texture="atlas/atlas_sheet_icon_15x15.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
+	</sprite>
+
+	<sprite name="atlas_sheet_icon_indent">
+		<!-- Starting with top left corner continuing in a clockwise manner -->
+		<!-- Top border -->
+		<image backcolor="109 122 146" size="0 0 100%-1 1" />
+		<!-- Right border -->
+		<image backcolor="220 223 228" size="100%-1 0 100% 100%" />
+		<!-- Bottom border -->
+		<image backcolor="220 223 228" size="0 100%-1 100% 100%" />
+		<!-- Left border -->
+		<image backcolor="109 122 146" size="0 0 1 100%-1" />
+		<!-- middle -->
+		<image backcolor="220 223 228" size="1 1 100%-1 100%-1"/>
+
+		<image texture="atlas/atlas_sheet_icon_15x15.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
+	</sprite>
+
+	<sprite name="atlas_sheet_icon_emboss">
+		<!-- Starting with top left corner continuing in a clockwise manner -->
+		<!-- Top border -->
+		<image backcolor="220 223 228" size="0 0 100% 1" />
+		<!-- Right border -->
+		<image backcolor="109 122 146" size="100%-1 1 100% 100%" />
+		<!-- Bottom border -->
+		<image backcolor="109 122 146" size="1 100%-1 100% 100%" />
+		<!-- Left border -->
+		<image backcolor="220 223 228" size="0 0 1 100%" />
+		<!-- middle -->
+		<image backcolor="184 190 201" size="1 1 100%-1 100%-1"/>
+
+		<image texture="atlas/atlas_sheet_icon_15x15.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
+	</sprite>
 
         <!--
         ==========================================
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index cac62b7fdb..6383a6e842 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -124,4 +124,40 @@
 		text_align="center"
 		text_valign="center"
 	/>
+
+	<style name="atlas_indent"
+		sprite="atlas_indent"
+		sprite_over="atlas_indent"
+		sprite_pressed="atlas_indent"
+		tooltip_style="atlas_tooltip"
+		tooltip=""
+		textcolor="0 0 0"
+		font="tahoma10"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="atlas_tab"
+		sprite="atlas_global_tab"
+		sprite_over="atlas_global_tab_lit"
+		sprite_pressed="atlas_global_tab_lit"
+		tooltip_style="atlas_tooltip"
+		tooltip="[font=tahoma10b]Tab[font=tahoma10]\nClick to choose this category."
+		textcolor="0 0 0"
+		font="tahoma10"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="atlas_icon"
+		sprite="atlas_sheet_icon_emboss"
+		sprite_over="atlas_sheet_icon_indent"
+		sprite_pressed="atlas_sheet_icon_indent"
+		tooltip_style="atlas_tooltip"
+		tooltip="[font=tahoma10b]Icon[font=tahoma10]\nClick to perform this function."
+		textcolor="0 0 0"
+		font="tahoma10"
+		text_align="center"
+		text_valign="center"
+	/>
 </styles>