diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 1c5fad289ae6c3cc1f9b0582f42076110734d94f..1490bade52068924669a2ce9c73b00df6a9b602f 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -406,22 +406,22 @@ App.Data.resetOnNGPlus = {
 			lowerRequirements: 0,
 			noSubhumansInArmy: 0,
 			pregExemption: 0,
-			FS: {
-				legionTradition: 0,
-				eagleWarriors: 0,
-				ronin: 0,
-				sunTzu: 0,
-				mamluks: 0,
-				pharaonTradition: 0,
-			},
 			privilege: {
 				militiaSoldier: 0,
 				slaveSoldier: 0,
 				mercSoldier: 0,
 			},
+			// Soldiers
 			martialSchool: 0,
 			eliteOfficers: 0,
 			liveTargets: 0,
+			// FS soldiers
+			legionTradition: 0,
+			eagleWarriors: 0,
+			ronin: 0,
+			sunTzu: 0,
+			mamluks: 0,
+			pharaonTradition: 0,
 		}
 	},
 	/* buildings */
diff --git a/src/Mods/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw
index 4e9e6e8a3e2eb5b278199a1cf899a50e3df7ed7f..b8015cab790782e7b98829e00386f42798ae5f03 100644
--- a/src/Mods/SecExp/edicts.tw
+++ b/src/Mods/SecExp/edicts.tw
@@ -185,34 +185,34 @@
 <</if>>
 
 <<if $FSAnnounced>>
-	<<if $edicts.defense.FS.legionTradition == 1>>
+	<<if $edicts.defense.legionTradition == 1>>
 		<br>''@@.lime;Legionaries traditions:@@'' you are funding specialized training for your recruits following the Roman tradition of professional armies.
-		[[Repeal|edicts][$edicts.defense.FS.legionTradition = 0]]
+		[[Repeal|edicts][$edicts.defense.legionTradition = 0]]
 	<</if>>
 
-	<<if $edicts.defense.FS.pharaonTradition == 1>>
+	<<if $edicts.defense.pharaonTradition == 1>>
 		<br>''@@.lime;Pharaonic traditions:@@'' you are funding specialized training for your recruits to turn them into an army worthy of a pharaon.
-		[[Repeal|edicts][$edicts.defense.FS.pharaonTradition = 0]]
+		[[Repeal|edicts][$edicts.defense.pharaonTradition = 0]]
 	<</if>>
 
-	<<if $edicts.defense.FS.eagleWarriors == 1>>
+	<<if $edicts.defense.eagleWarriors == 1>>
 		<br>''@@.lime;Eagle warriors traditions:@@'' you are funding specialized training for your mercenaries following the Aztec tradition of elite warriors.
-		[[Repeal|edicts][$edicts.defense.FS.eagleWarriors = 0]]
+		[[Repeal|edicts][$edicts.defense.eagleWarriors = 0]]
 	<</if>>
 
-	<<if $edicts.defense.FS.ronin == 1>>
+	<<if $edicts.defense.ronin == 1>>
 		<br>''@@.lime;Ronin traditions:@@'' you are funding specialized training for your mercenaries following the Japanese tradition of elite errant samurai.
-		[[Repeal|edicts][$edicts.defense.FS.ronin = 0]]
+		[[Repeal|edicts][$edicts.defense.ronin = 0]]
 	<</if>>
 
-	<<if $edicts.defense.FS.mamluks == 1>>
+	<<if $edicts.defense.mamluks == 1>>
 		<br>''@@.lime;Mamluks traditions:@@'' you are funding specialized training for your slaves following the Arabian tradition of mamluks slave soldiers.
-		[[Repeal|edicts][$edicts.defense.FS.mamluks = 0]]
+		[[Repeal|edicts][$edicts.defense.mamluks = 0]]
 	<</if>>
 
-	<<if $edicts.defense.FS.sunTzu == 1>>
+	<<if $edicts.defense.sunTzu == 1>>
 		<br>''@@.lime;Sun Tzu Teachings:@@'' you are funding specialized training for your units and officers to follow the teachings of the "Art of War".
-		[[Repeal|edicts][$edicts.defense.FS.sunTzu = 0]]
+		[[Repeal|edicts][$edicts.defense.sunTzu = 0]]
 	<</if>>
 <</if>>
 
@@ -650,10 +650,10 @@
 <<if $FSAnnounced>>
 	<br><br>__Future Societies:__
 	<<if $arcologies[0].FSRomanRevivalist >= 40 && $edicts.defense.militiaFounded == 1>>
-		<<if $edicts.defense.FS.legionTradition == 0>>
+		<<if $edicts.defense.legionTradition == 0>>
 			<br>''@@.lime;Legionaries traditions:@@'' Fund specialized training for your recruits to turn them into the professional of Roman tradition.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.legionTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.legionTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -662,10 +662,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSEgyptianRevivalist >= 40 && $edicts.defense.militiaFounded == 1>>
-		<<if $edicts.defense.FS.pharaonTradition == 0>>
+		<<if $edicts.defense.pharaonTradition == 0>>
 			<br>''@@.lime;Pharaonic traditions:@@'' Fund specialized training for your recruits to turn them into an army worthy of a pharaoh.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.pharaonTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.pharaonTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -674,10 +674,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSAztecRevivalist >= 40 && $mercenaries > 0>>
-		<<if $edicts.defense.FS.eagleWarriors == 0>>
+		<<if $edicts.defense.eagleWarriors == 0>>
 			<br>''@@.lime;Eagle warriors traditions:@@'' Fund specialized training for your mercenaries to turn them into the elite units of Aztec tradition.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.eagleWarriors = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.eagleWarriors = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -686,10 +686,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSEdoRevivalist >= 40 && $mercenaries > 0>>
-		<<if $edicts.defense.FS.ronin == 0>>
+		<<if $edicts.defense.ronin == 0>>
 			<br>''@@.lime;Ronin traditions:@@'' Fund specialized training for your mercenaries to turn them into the errant samurai of Japanese tradition.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.ronin = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.ronin = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -698,10 +698,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSArabianRevivalist >= 40>>
-		<<if $edicts.defense.FS.mamluks == 0>>
+		<<if $edicts.defense.mamluks == 0>>
 			<br>''@@.lime;Mamluks traditions:@@'' Fund specialized training for your slaves to turn them into the mamluks slave soldiers of Arabian tradition.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.mamluks = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.mamluks = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -710,10 +710,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSChineseRevivalist >= 40>>
-		<<if $edicts.defense.FS.sunTzu == 0>>
+		<<if $edicts.defense.sunTzu == 0>>
 			<br>''@@.lime;Sun Tzu Teachings:@@'' Fund specialized training for your units and officers to conform your army to the teachings of the "Art of War".
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.defense.FS.sunTzu = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.sunTzu = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index 514418ea20a599dcdca50b309c84e8beee706f33..ae1ea97ffd2ae079f107b0f6f2276a76e1808ec3 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -22,12 +22,12 @@ App.SecExp.upkeep = (function() {
 
 		if (V.edicts.defense.martialSchool) { value++; }
 
-		if (V.edicts.defense.FS.legionTradition) { value++; }
-		if (V.edicts.defense.FS.pharaonTradition) { value++; }
-		if (V.edicts.defense.FS.eagleWarriors) { value++; }
-		if (V.edicts.defense.FS.ronin) { value++; }
-		if (V.edicts.defense.FS.mamluks) { value++; }
-		if (V.edicts.defense.FS.sunTzu) { value++; }
+		if (V.edicts.defense.legionTradition) { value++; }
+		if (V.edicts.defense.pharaonTradition) { value++; }
+		if (V.edicts.defense.eagleWarriors) { value++; }
+		if (V.edicts.defense.ronin) { value++; }
+		if (V.edicts.defense.mamluks) { value++; }
+		if (V.edicts.defense.sunTzu) { value++; }
 
 		return value*1000;
 	}
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 431be4a1003243858c73fd8ae9427112483efe97..b394246162ad1feb955d5cbac90b4a6370f2878f 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1287,12 +1287,12 @@ App.Update.globalVariables = function(node) {
 		V.edicts.defense.noSubhumansInArmy = V.edicts.defense.noSubhumansInArmy || V.noSubhumansInArmy || 0;
 		V.edicts.defense.pregExemption = V.edicts.defense.pregExemption || V.pregExemption || 0;
 
-		V.edicts.defense.FS.legionTradition = V.edicts.defense.FS.legionTradition || V.legionTradition || 0;
-		V.edicts.defense.FS.eagleWarriors = V.edicts.defense.FS.eagleWarriors || V.eagleWarriors || 0;
-		V.edicts.defense.FS.ronin = V.edicts.defense.FS.ronin || V.ronin || 0;
-		V.edicts.defense.FS.sunTzu = V.edicts.defense.FS.sunTzu || V.sunTzu || 0;
-		V.edicts.defense.FS.mamluks = V.edicts.defense.FS.mamluks || V.mamluks || 0;
-		V.edicts.defense.FS.pharaonTradition = V.edicts.defense.FS.pharaonTradition || V.pharaonTradition || 0;
+		V.edicts.defense.legionTradition = V.edicts.defense.legionTradition || V.legionTradition || 0;
+		V.edicts.defense.eagleWarriors = V.edicts.defense.eagleWarriors || V.eagleWarriors || 0;
+		V.edicts.defense.ronin = V.edicts.defense.ronin || V.ronin || 0;
+		V.edicts.defense.sunTzu = V.edicts.defense.sunTzu || V.sunTzu || 0;
+		V.edicts.defense.mamluks = V.edicts.defense.mamluks || V.mamluks || 0;
+		V.edicts.defense.pharaonTradition = V.edicts.defense.pharaonTradition || V.pharaonTradition || 0;
 		V.edicts.defense.privilege.militiaSoldier = V.edicts.defense.privilege.militiaSoldier || V.militiaSoldier || 0;
 		V.edicts.defense.privilege.slaveSoldier = V.edicts.defense.privilege.slaveSoldier || V.slaveSoldier || 0;
 		V.edicts.defense.privilege.mercSoldier = V.edicts.defense.privilege.mercSoldier || V.mercSoldier || 0;