diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index 825b1ee478..bfafdbfba1 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -357,17 +357,138 @@
 						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: CLIFF -->
+				<!-- 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);
diff --git a/binaries/data/mods/official/gui/test/functions_atlas.js b/binaries/data/mods/official/gui/test/functions_atlas.js
index e9c0471f52..ddd63d4621 100755
--- a/binaries/data/mods/official/gui/test/functions_atlas.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas.js
@@ -710,6 +710,8 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON].height+ATLAS_LEFT_PANE_SECTION.BMARGIN
 	);
 
+	// ============================================= TERRAIN EDITOR: CLIFF ===============================================
+
 	// List of cliff portraits.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		75,
@@ -719,6 +721,150 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].x+3
 	);
 
+	// "Cliff" heading.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].x-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].width,
+		22
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].height
+	);
+
+	// Horizontal rule under heading.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].width-ATLAS_LEFT_PANE_SECTION.LMARGIN-ATLAS_LEFT_PANE_SECTION.RMARGIN,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].x+ATLAS_LEFT_PANE_SECTION.LMARGIN,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].height
+	);
+
+	// Place button.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		84,
+		15
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].height+(ATLAS_LEFT_PANE_SECTION.TMARGIN/2)
+	);
+
+	// Height label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		48,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].x+2,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Height input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		40,
+		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_CLIFF_HEIGHT_LABEL].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].y
+	);
+
+	// Up button for height input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		(atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].height/2)+3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].y-3
+	);
+
+	// Down button for height input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_DN	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_DN].height
+	);
+
+	// Angle label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_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_CLIFF_HEIGHT_LABEL].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Angle input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_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_CLIFF_HEIGHT_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Up button for angle input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		(atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].height/2)+3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].y-3
+	);
+
+	// Down button for Angle input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_DN	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_DN].height
+	);
+
+	// Smooth label.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_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_CLIFF_ANGLE_LABEL].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_LABEL].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_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_CLIFF_ANGLE_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN*1.5
+	);
+
+	// Up button for Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		(atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].height/2)+3
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].y-3
+	);
+
+	// Down button for Smooth input box.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_DN	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		ATLAS_COUNTER_BOX.width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_DN].height
+	);
+
+	// Custom button.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].height
+	);
+
 	// Horizontal rule at end of Paint Cliff.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_HR].width,
@@ -728,6 +874,8 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].height+ATLAS_LEFT_PANE_SECTION.BMARGIN
 	);
 
+	// ============================================= TERRAIN EDITOR: WATER ===============================================
+
 	// List of water portraits.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_LIST].width,
@@ -737,6 +885,42 @@ function initAtlas()
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR].x+3
 	);
 
+	// "Water" heading.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR].y
+	);
+
+	// Horizontal rule under heading.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING].height
+	);
+
+	// Place button.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE	= addSizeArrayWH(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].width,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].height
+	); atlasCoord_Last 			= addSizeArrayXY(atlasCoord, atlasCoord_Last,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].x,
+		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)
+	);
+
+	// Custom button.
+	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_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_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].x,
+		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_CUSTOM].height
+	);
+
 	// Horizontal rule at end of Paint Water.
 	ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HR		= addSizeArrayWH(atlasCoord, atlasCoord_Last,
 		atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HR].width,