diff --git a/binaries/data/mods/official/entities/structures/hele_cc.xml b/binaries/data/mods/official/entities/structures/hele_cc.xml
new file mode 100644
index 0000000000..28e3a1e38b
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_cc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_cc" Parent="cc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Apoikia"
+			history="During the Great Colonisation, the Hellenes built numerous colonies all over the shores of the Mediterranean and Black Seas, which became miniature versions of Greece on foreign soil."
+		/>
+	</Traits>
+	<Actor>Hellenes Civilisation Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_fc.xml b/binaries/data/mods/official/entities/structures/hele_fc.xml
new file mode 100644
index 0000000000..829de02758
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_fc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_fc" Parent="fc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Sitobolion"
+			history="Grain wasn't plentiful in Hellas, which is why it was carefully stored in granaries, some of it being reserved for times of siege."
+		/>
+	</Traits>
+	<Actor>Hellenes Farm Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_ff.xml b/binaries/data/mods/official/entities/structures/hele_ff.xml
new file mode 100644
index 0000000000..dd49b219c2
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_ff.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_ff" Parent="ff">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Akropolis"
+			history="The Akropolis was usually a fortified citadel in the upper part of the city. The Athenian Akropolis was renowned for its marvellous temples, among which was the Parthenon, while the Acro-Corinthus was highly prized by the Macedonians for its strategic location and good defences."
+		/>
+	</Traits>
+	<Actor>Hellenes Fortress</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_hc.xml b/binaries/data/mods/official/entities/structures/hele_hc.xml
new file mode 100644
index 0000000000..a2ff57faa7
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_hc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_hc" Parent="hc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Anaktoron"
+			history="The Hellenes built marvelous temples in order to honour their polytheistic pantheon. While all gods were venerated, a specific patron deity was supposed to watch over each polis."
+		/>
+	</Traits>
+	<Actor>Hellenes Health Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_ho_b1.xml b/binaries/data/mods/official/entities/structures/hele_ho_1.xml
old mode 100755
new mode 100644
similarity index 90%
rename from binaries/data/mods/official/entities/structures/hele_ho_b1.xml
rename to binaries/data/mods/official/entities/structures/hele_ho_1.xml
index 849ba376a4..fc74a63568
--- a/binaries/data/mods/official/entities/structures/hele_ho_b1.xml
+++ b/binaries/data/mods/official/entities/structures/hele_ho_1.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<Entity Tag="hele_ho_b1" Parent="ho">
-	<Traits>
-		<Id
-			civ_code="hele"
-			civ="Hellenes"
-			internal_only="false"
-			icon="sheet_hele"
-
-			specific="Metathron"
-			history="Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia."
-		/>
-	</Traits>
-	<Actor>Hellenes House 1</Actor>
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_ho_1" Parent="ho">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Metathron"
+			history="Hellenic houses from the Classical Age were generally humble yet stylish. During the Hellenistic Age, however, luxurious palaces and estates became commonplace in the rich Hellenistic metropolises like Antioch, Alexandria and Seleucia."
+		/>
+	</Traits>
+	<Actor>Hellenes House 1</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_ho_2.xml b/binaries/data/mods/official/entities/structures/hele_ho_2.xml
new file mode 100644
index 0000000000..d120e4993c
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_ho_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_ho_2" Parent="hele_ho_1">
+	<Traits>
+		<Id
+		/>
+	</Traits>
+	<Actor>Hellenes House 2</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_ho_3.xml b/binaries/data/mods/official/entities/structures/hele_ho_3.xml
new file mode 100644
index 0000000000..f0f84372c4
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_ho_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_ho_3" Parent="hele_ho_1">
+	<Traits>
+		<Id
+		/>
+	</Traits>
+	<Actor>Hellenes House 3</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_mc.xml b/binaries/data/mods/official/entities/structures/hele_mc.xml
new file mode 100644
index 0000000000..4f971787ac
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_mc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_mc" Parent="mc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Strategion"
+			history="The Strategion was the main military headquarters, where important decisions were taken and plans for battles discussed by the Strategoi."
+		/>
+	</Traits>
+	<Actor>Hellenes Military Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_pc.xml b/binaries/data/mods/official/entities/structures/hele_pc.xml
new file mode 100644
index 0000000000..208f5c98cd
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_pc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_pc" Parent="pc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Limenos"
+			history="Greece is a sea country, which is why some of the greatest Hellenic and Hellenistic cities like Ephesus, Corinth, Alexandria and Antioch were built by the sea. It should also be noted that all colonies during the Great Colonisation were thriving port centres, which traded with the local population."
+		/>
+	</Traits>
+	<Actor>Hellenes Port Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_rc.xml b/binaries/data/mods/official/entities/structures/hele_rc.xml
new file mode 100644
index 0000000000..6b91517fe8
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_rc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_rc" Parent="rc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Anakeion"
+			history="Resources and building materials were kept in warehouses."
+		/>
+	</Traits>
+	<Actor>Hellenes Resource Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_sb1.xml b/binaries/data/mods/official/entities/structures/hele_sb1.xml
new file mode 100644
index 0000000000..5e5bb4ee13
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_sb1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_sb1" Parent="sb">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Theatron"
+			history="Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture."
+		/>
+	</Traits>
+	<Actor>Hellenes Theatron</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_sb2.xml b/binaries/data/mods/official/entities/structures/hele_sb2.xml
new file mode 100644
index 0000000000..3e6a6d1e56
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_sb2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_sb2" Parent="sb">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Gymnasion"
+			history="The gymnasion was a vital place in Hellenistic polises, where physical exercises were performed and social contacts established."
+		/>
+	</Traits>
+	<Actor>Hellenes Gymnasion</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_tc.xml b/binaries/data/mods/official/entities/structures/hele_tc.xml
new file mode 100644
index 0000000000..15193fce8c
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_tc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_tc" Parent="tc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Agora"
+			history="The most important place in most Classical Greek polises, the Agora served many purposes - it was a stage for public speeches and debates, as well as a market."
+		/>
+	</Traits>
+	<Actor>Hellenes Trade Centre</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_tf.xml b/binaries/data/mods/official/entities/structures/hele_tf.xml
new file mode 100644
index 0000000000..a6c58ffa8b
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_tf.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_tf" Parent="tf">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Pyrgion"
+			history="Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants."
+		/>
+	</Traits>
+	<Actor>Hellenes Tower</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_wc.xml b/binaries/data/mods/official/entities/structures/hele_wc.xml
new file mode 100644
index 0000000000..989c32c5b5
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_wc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_wc" Parent="wc">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Teichos"
+			history="All Hellenic cities were surrounded by stone walls for protection against enemy raids. Some of these fortifications, like the Athenian Long Walls, for example, were massive structures."
+		/>
+	</Traits>
+	<Actor>Hellenes Wall Section</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_wg.xml b/binaries/data/mods/official/entities/structures/hele_wg.xml
new file mode 100644
index 0000000000..93b4792e41
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_wg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_wg" Parent="wg">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Gate"
+			history="(Insert History Here)"
+		/>
+	</Traits>
+	<Actor>Hellenes Wall Section</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/hele_wt.xml b/binaries/data/mods/official/entities/structures/hele_wt.xml
new file mode 100644
index 0000000000..7adc054d68
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/hele_wt.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Tag="hele_tf" Parent="tf">
+	<Traits>
+		<Id
+			civ_code="hele"
+			civ="Hellenes"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Pyrgos"
+			history="Towers were an important part of city fortifications. The defending troops shot arrows at the enemy and poured boiling oil over the assailants."
+		/>
+	</Traits>
+	<Actor>Hellenes Tower</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/hele_isw_b1.xml b/binaries/data/mods/official/entities/units/hele_isw_b1.xml
deleted file mode 100755
index 3a145c8120..0000000000
--- a/binaries/data/mods/official/entities/units/hele_isw_b1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<Entity Tag="hele_isw_b1" Parent="isw">
-	<Traits>
-		<Id
-			civ="hele"
-			class2="Infantry"
-			class3="Melee"
-			generic="Infantry Swordsman"
-			specific="Dude"
-			ranked="Basic Dude"
-			personal1="hele_male_names_1st.csv"
-			personal2="hele_male_names_2nd.csv"
-			icon="unit_dude"
-			rollover="The Dude is hiding among the Hellenic forces, since the Greeks have no swordsmen."
-			type="UnitSwordsman, UnitNonMechanical, UnitMilitary, UnitCitizenSoldier"
-		/>
-		<Health
-			hitpoints="250"
-			hpcurr="10"
-		/>
-	</Traits>
-	<Event On="Initialize">
-	<![CDATA[
-	    // PASAP wander-between-houses script
-	    
-	    houses = entities.subset( "this.template.tag == \"House\"" );
-	    while( houses.length )
-	    {
-			index = Math.floor( Math.random() * houses.length );
-			house = houses[index];
-			console.write( house.position ); 
-			this.orderQueued( 4 /* patrol */, house.position.x, house.position.z );
-			houses.remove( index );
-		}
-		console.write( "A new Dude has entered your dungeon." );
-	]]>	
-	</Event>
-		
-	<Actor>The Dude</Actor>
-</Entity>
-
diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index 42141c10c2..e4181d0f62 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -623,7 +623,7 @@
 			</object>
 
 			<!-- PLAYER / CIV NAME HEADING -->
-			<object type="text" name="session_panel_status_heading" font="verdana10" textcolor="200 200 200" text-align="center" ghost="true" z="70" hidden="false">Acumen [icon=bullet_icon] Pre-Imperial Romans
+			<object type="text" name="session_panel_status_heading" font="verdana10" textcolor="200 200 200" text-align="center" ghost="true" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_heading_x, crd_status_orb_heading_y, crd_status_orb_heading_x+crd_status_orb_heading_width, crd_status_orb_heading_y+crd_status_orb_heading_height, left_screen, top_screen, left_screen, top_screen,
diff --git a/binaries/data/mods/official/gui/test/functions_manual.js b/binaries/data/mods/official/gui/test/functions_manual.js
index b5d3676398..4b118e9dab 100755
--- a/binaries/data/mods/official/gui/test/functions_manual.js
+++ b/binaries/data/mods/official/gui/test/functions_manual.js
@@ -5,16 +5,16 @@ function manualDisplay()
 					ManualBkg.caption = "In-Game Help: ";
 					if (selection[0].traits.id.civ)
 						ManualBkg.caption += selection[0].traits.id.civ + ": ";
-//					if (selection[0].traits.id.generic)
-//						ManualBkg.caption += selection[0].traits.id.generic + ": ";
 					if (selection[0].traits.id.specific)
 						ManualBkg.caption += selection[0].traits.id.specific;
 
 					// Display portrait.
 					if (selection[0].traits.id.icon)
 					{
-						ManualPortrait = getGUIObjectByName("manual_portrait");
-						setPortrait("manual_portrait", selection[0].traits.id.icon);
+						if (selection[0].traits.id.icon_cell && selection[0].traits.id.icon_cell != "")
+							setPortrait("manual_portrait", selection[0].traits.id.icon + "_" + selection[0].traits.id.icon_cell);
+						else
+							setPortrait("manual_portrait", selection[0].traits.id.icon);
 					}
 
 					// Display rollover text.
@@ -60,23 +60,26 @@ function manualDisplay()
 					if (selection[0].traits.up && selection[0].traits.up.curr && selection[0].traits.up.req)
 						ManualRollover.caption += "XP: " + selection[0].traits.up.curr + "/" + selection[0].traits.up.req + "\n";
 
-					// Display UP on death.
-					if (selection[0].traits.loot.up)
-						ManualRollover.caption += "UP: " + selection[0].traits.loot.up + "\n";
-
-					// Display loot.
-					if (selection[0].traits.loot.food || selection[0].traits.loot.wood || selection[0].traits.loot.stone || selection[0].traits.loot.ore)
+					if (selection[0].traits.loot)
 					{
-						ManualRollover.caption += "Loot: ";
-						if (selection[0].traits.loot.food)
-							ManualRollover.caption += selection[0].traits.loot.food + " Food ";
-						if (selection[0].traits.loot.wood)
-							ManualRollover.caption += selection[0].traits.loot.wood + " Wood ";
-						if (selection[0].traits.loot.stone)
-							ManualRollover.caption += selection[0].traits.loot.stone + " Stone ";
-						if (selection[0].traits.loot.ore)
-							ManualRollover.caption += selection[0].traits.loot.ore + " Ore ";
-						ManualRollover.caption += "\n";
+						// Display UP on death.
+						if (selection[0].traits.loot.up)
+							ManualRollover.caption += "UP: " + selection[0].traits.loot.up + "\n";
+	
+						// Display loot.
+						if (selection[0].traits.loot.food || selection[0].traits.loot.wood || selection[0].traits.loot.stone || selection[0].traits.loot.ore)
+						{
+							ManualRollover.caption += "Loot: ";
+							if (selection[0].traits.loot.food)
+								ManualRollover.caption += selection[0].traits.loot.food + " Food ";
+							if (selection[0].traits.loot.wood)
+								ManualRollover.caption += selection[0].traits.loot.wood + " Wood ";
+							if (selection[0].traits.loot.stone)
+								ManualRollover.caption += selection[0].traits.loot.stone + " Stone ";
+							if (selection[0].traits.loot.ore)
+								ManualRollover.caption += selection[0].traits.loot.ore + " Ore ";
+							ManualRollover.caption += "\n";
+						}
 					}
 
 					// Armour.
diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
index 1265aa6343..2538e230db 100755
--- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js
+++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
@@ -173,6 +173,12 @@ function initStatusOrb()
 
 function UpdateStatusOrb()
 {
+	// Update heading.
+	GUIObject = getGUIObjectByName("session_panel_status_heading");
+	GUIObject.caption = "Acumen"; // Player name (placeholder; replace with proper callsign).
+	if (selection[0].traits.id.civ)
+		GUIObject.caption += " [icon=bullet_icon] " + selection[0].traits.id.civ;
+
 	// Update name text.
 	GUIObject = getGUIObjectByName("session_panel_status_name1");
 	GUIObject.caption = "";