diff --git a/src/Mods/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw
index 30d234fe9e9bcb35e3446eed0cc203225e0762c2..666537d772f7db56d21757c3ab100a7c15229809 100644
--- a/src/Mods/SecExp/edicts.tw
+++ b/src/Mods/SecExp/edicts.tw
@@ -5,214 +5,214 @@
 <div class="center">
 ''__Active Edicts__''
 </div>
-<<if $edicts.edicts.alternativeRents == 1>>
+<<if $edicts.alternativeRents == 1>>
 	<br>''Alternative rent payment:'' you are allowing citizens to pay for their rents in menial slaves rather than cash.
-	[[Repeal|edicts][$edicts.edicts.alternativeRents = 0]]
+	[[Repeal|edicts][$edicts.alternativeRents = 0]]
 <</if>>
 
-<<if $edicts.edicts.enslavementRights == 1>>
+<<if $edicts.enslavementRights == 1>>
 	<br>''Enslavement rights:'' you are the only authority able to declare a person enslaved or not.
-	[[Repeal|edicts][$edicts.edicts.enslavementRights = 0]]
+	[[Repeal|edicts][$edicts.enslavementRights = 0]]
 <</if>>
 
-<<if $edicts.edicts.sellData == 1>>
+<<if $edicts.sellData == 1>>
 	<br>''Private Data marketization:'' you are selling private citizens' data to the best bidder.
-	[[Repeal|edicts][$edicts.edicts.sellData = 0]]
+	[[Repeal|edicts][$edicts.sellData = 0]]
 <</if>>
 
-<<if $edicts.edicts.propCampaignBoost == 1>>
+<<if $edicts.propCampaignBoost == 1>>
 	<br>''Obligatory educational material:'' you are forcing residents to read curated educational material about the arcology.
-	[[Repeal|edicts][$edicts.edicts.propCampaignBoost = 0]]
+	[[Repeal|edicts][$edicts.propCampaignBoost = 0]]
 <</if>>
 
-<<if $edicts.edicts.tradeLegalAid == 1>>
+<<if $edicts.tradeLegalAid == 1>>
 	<br>''Legal aid for new businesses:'' New businesses can rely on your help for legal expenses and issues.
-	[[Repeal|edicts][$edicts.edicts.tradeLegalAid = 0]]
+	[[Repeal|edicts][$edicts.tradeLegalAid = 0]]
 <</if>>
 
-<<if $edicts.edicts.taxTrade == 1>>
+<<if $edicts.taxTrade == 1>>
 	<br>''Trade tariffs:'' all goods transitioning in your arcology have to pay a transition fee.
-	[[Repeal|edicts][$edicts.edicts.taxTrade = 0]]
+	[[Repeal|edicts][$edicts.taxTrade = 0]]
 <</if>>
 
-<<if $edicts.edicts.slaveWatch == 1>>
+<<if $edicts.slaveWatch == 1>>
 	<br>''@@.lime;Slave mistreatment watch:@@'' slaves are able access a special security service in case of mistreatment.
-	[[Repeal|edicts][$edicts.edicts.slaveWatch = 0]]
+	[[Repeal|edicts][$edicts.slaveWatch = 0]]
 <</if>>
 
-<<if $edicts.edicts.subsidyChurch == 1>>
+<<if $edicts.subsidyChurch == 1>>
 	<br>''@@.lime;Religious activities subsidy:@@'' you are providing economic support to religious activities following the official dogma.
-	[[Repeal|edicts][$edicts.edicts.subsidyChurch = 0]]
+	[[Repeal|edicts][$edicts.subsidyChurch = 0]]
 <</if>>
 
-<<if $SF.Toggle && $SF.Active >= 1 && $edicts.edicts.SFSupportLevel > 0>>
+<<if $SF.Toggle && $SF.Active >= 1 && $edicts.SFSupportLevel > 0>>
 	<br><br>__Special Force:__
-	<<if $edicts.edicts.SFSupportLevel === 1>>
+	<<if $edicts.SFSupportLevel === 1>>
 		<br>''Equipment provision:'' <<= App.SF.Caps()>> is providing the security HQ with advanced equipment, boosting its efficiency.
-		[[Repeal|edicts][$edicts.edicts.SFSupportLevel--]]
-	<<elseif $edicts.edicts.SFSupportLevel === 2>>
+		[[Repeal|edicts][$edicts.SFSupportLevel--]]
+	<<elseif $edicts.SFSupportLevel === 2>>
 		<br>''Personnel training:'' <<= App.SF.Caps()>> is currently providing advanced equipment and training to security HQ personnel.
-		[[Repeal|edicts][$edicts.edicts.SFSupportLevel--]]
-	<<elseif $edicts.edicts.SFSupportLevel === 3>>
+		[[Repeal|edicts][$edicts.SFSupportLevel--]]
+	<<elseif $edicts.SFSupportLevel === 3>>
 		<br>''Troops detachment:'' <<= App.SF.Caps()>> has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
-		[[Repeal|edicts][$edicts.edicts.SFSupportLevel--]]
-	<<elseif $edicts.edicts.SFSupportLevel === 4>>
+		[[Repeal|edicts][$edicts.SFSupportLevel--]]
+	<<elseif $edicts.SFSupportLevel === 4>>
 		<br>''Full support:'' <<= App.SF.Caps()>> is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
-		[[Repeal|edicts][$edicts.edicts.SFSupportLevel--]]
-	<<elseif $edicts.edicts.SFSupportLevel === 5>>
+		[[Repeal|edicts][$edicts.SFSupportLevel--]]
+	<<elseif $edicts.SFSupportLevel === 5>>
 		<br>''Network assistance:'' <<= App.SF.Caps()>> is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel.
-		[[Repeal|edicts][$edicts.edicts.SFSupportLevel--]]
+		[[Repeal|edicts][$edicts.SFSupportLevel--]]
 	<</if>>
 <</if>>
 
-<<if $edicts.edicts.limitImmigration == 1 || $edicts.edicts.openBorders == 1>>
+<<if $edicts.limitImmigration == 1 || $edicts.openBorders == 1>>
 	<br><br>__Immigration:__
 
-	<<if $edicts.edicts.limitImmigration == 1>>
+	<<if $edicts.limitImmigration == 1>>
 		<br>''Immigration limits:'' you put strict limits to the amount of people the arcology can accept each week.
-		[[Repeal|edicts][$edicts.edicts.limitImmigration = 0]]
+		[[Repeal|edicts][$edicts.limitImmigration = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.openBorders == 1>>
+	<<if $edicts.openBorders == 1>>
 		<br>''Open borders:'' you have lowered considerably the requirements to become citizens.
-		[[Repeal|edicts][$edicts.edicts.openBorders = 0]]
+		[[Repeal|edicts][$edicts.openBorders = 0]]
 	<</if>>
 <</if>>
 
 <br><br>__Weapons:__
 
-<<if $edicts.edicts.weaponsLaw == 0>>
+<<if $edicts.weaponsLaw == 0>>
 	<br>''Forbid weapons inside the arcology:'' residents are forbidden to buy, sell and keep weaponry while within the arcology.
-	[[Repeal|edicts][$edicts.edicts.weaponsLaw = 3]]
-<<elseif $edicts.edicts.weaponsLaw == 2>>
+	[[Repeal|edicts][$edicts.weaponsLaw = 3]]
+<<elseif $edicts.weaponsLaw == 2>>
 	<br>''Heavy weaponry forbidden:'' residents are allowed to buy, sell and keep weapons within the arcology as long as they are non-heavy, non-explosive.
-	[[Repeal|edicts][$edicts.edicts.weaponsLaw = 3]]
-<<elseif $edicts.edicts.weaponsLaw == 1>>
+	[[Repeal|edicts][$edicts.weaponsLaw = 3]]
+<<elseif $edicts.weaponsLaw == 1>>
 	<br>''Heavily restricted weaponry:'' residents are allowed to buy, sell and keep weapons within the arcology as long as they are non-automatic, non-high caliber.
-	[[Repeal|edicts][$edicts.edicts.weaponsLaw = 3]]
+	[[Repeal|edicts][$edicts.weaponsLaw = 3]]
 <<else>>
 	<br>''All weapons allowed:'' residents are allowed to buy, sell and keep all kind of weapons in the arcology.
 <</if>>
 
 <<if $battlesCount > 0 || $rebellionsCount > 0>>
 	<br><br>__Defense Force:__
-	<<if $edicts.edicts.defense.soldierWages == 0>>
+	<<if $edicts.defense.soldierWages == 0>>
 		<br>''Low wages for soldiers:'' wages for soldiers are set to a low level compared to market standards.
-		[[Repeal|edicts][$edicts.edicts.defense.soldierWages = 1]]
-	<<elseif $edicts.edicts.defense.soldierWages == 1>>
+		[[Repeal|edicts][$edicts.defense.soldierWages = 1]]
+	<<elseif $edicts.defense.soldierWages == 1>>
 		<br>''Average wages for soldiers:'' wages for soldiers are set to the market standards.
 	<<else>>
 		<br>''High wages for soldiers:'' wages for soldiers are set to a high level compared to market standards.
-		[[Repeal|edicts][$edicts.edicts.defense.soldierWages = 1]]
+		[[Repeal|edicts][$edicts.defense.soldierWages = 1]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.slavesOfficers == 1>>
+	<<if $edicts.defense.slavesOfficers == 1>>
 		<br>''Slave Officers:'' your trusted slaves are allowed to lead the defense forces of the arcology.
-		[[Repeal|edicts][$edicts.edicts.defense.slavesOfficers = 0]]
+		[[Repeal|edicts][$edicts.defense.slavesOfficers = 0]]
 	<</if>>
 
 	<<if $mercenaries > 0>>
-		<<if $edicts.edicts.defense.discountMercenaries == 1>>
+		<<if $edicts.defense.discountMercenaries == 1>>
 			<br>''Mercenary subsidy:'' mercenaries willing to immigrate in your arcology will be offered a discount on rent.
-			[[Repeal|edicts][$edicts.edicts.defense.discountMercenaries = 0]]
+			[[Repeal|edicts][$edicts.defense.discountMercenaries = 0]]
 		<</if>>
 	<</if>>
 
-	<<if $edicts.edicts.defense.militiaFounded == 1>>
-		<<if $edicts.edicts.defense.conscription == 1>>
+	<<if $edicts.defense.militiaFounded == 1>>
+		<<if $edicts.defense.conscription == 1>>
 			<br>''Conscription:'' every citizen is required to train in the militia and serve the arcology for a limited amount of time.
-			[[Repeal|edicts][$edicts.edicts.defense.conscription = 0, $edicts.edicts.defense.recruitVolunteers = 1]]
+			[[Repeal|edicts][$edicts.defense.conscription = 0, $edicts.defense.recruitVolunteers = 1]]
 		<</if>>
-		<<if $edicts.edicts.defense.militaryService == 1>>
+		<<if $edicts.defense.militaryService == 1>>
 			<br>''Obligatory military service:'' every citizen is required to register and serve under the militia.
-			[[Repeal|edicts][$edicts.edicts.defense.militaryService = 0, $edicts.edicts.defense.recruitVolunteers = 1]]
+			[[Repeal|edicts][$edicts.defense.militaryService = 0, $edicts.defense.recruitVolunteers = 1]]
 		<</if>>
-		<<if $edicts.edicts.defense.militarizedSociety == 1>>
+		<<if $edicts.defense.militarizedSociety == 1>>
 			<br>''Militarized Society:'' every adult citizen is required to train and actively participate in the military of the arcology.
-			[[Repeal|edicts][$edicts.edicts.defense.militarizedSociety = 0, $edicts.edicts.defense.recruitVolunteers = 1]]
+			[[Repeal|edicts][$edicts.defense.militarizedSociety = 0, $edicts.defense.recruitVolunteers = 1]]
 		<</if>>
 
-		<<if $edicts.edicts.defense.militaryExemption == 1>>
+		<<if $edicts.defense.militaryExemption == 1>>
 			<br>''Military exemption:'' you allow citizens to avoid military duty by paying a weekly fee.
-			[[Repeal|edicts][$edicts.edicts.defense.militaryExemption = 0]]
+			[[Repeal|edicts][$edicts.defense.militaryExemption = 0]]
 		<</if>>
 
-		<<if $edicts.edicts.defense.lowerRequirements == 1>>
+		<<if $edicts.defense.lowerRequirements == 1>>
 			<br>''@@.lime;Revised minimum requirements:@@'' you allow citizens outside the normally accepted range to join the militia.
-			[[Repeal|edicts][$edicts.edicts.defense.lowerRequirements = 0]]
+			[[Repeal|edicts][$edicts.defense.lowerRequirements = 0]]
 		<</if>>
 
-		<<if $edicts.edicts.defense.noSubhumansInArmy == 1>>
+		<<if $edicts.defense.noSubhumansInArmy == 1>>
 			<br>''@@.lime;No subhumans in the militia:@@'' it is forbidden for subhumans to join the militia.
-			[[Repeal|edicts][$edicts.edicts.defense.noSubhumansInArmy = 0]]
+			[[Repeal|edicts][$edicts.defense.noSubhumansInArmy = 0]]
 		<</if>>
 
-		<<if $edicts.edicts.defense.pregExemption == 1>>
+		<<if $edicts.defense.pregExemption == 1>>
 			<br>''@@.lime;Military exemption for pregnancies:@@'' pregnant citizens are allowed, and encouraged, to avoid military service.
-			[[Repeal|edicts][$edicts.edicts.defense.pregExemption = 0]]
+			[[Repeal|edicts][$edicts.defense.pregExemption = 0]]
 		<</if>>
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.militiaSoldier == 1>>
+	<<if $edicts.defense.privilege.militiaSoldier == 1>>
 		<br>''Special militia privileges:'' citizens joining the militia are exempt from rent payment.
-		[[Repeal|edicts][$edicts.edicts.defense.privilege.militiaSoldier = 0]]
+		[[Repeal|edicts][$edicts.defense.privilege.militiaSoldier = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.slaveSoldier == 1>>
+	<<if $edicts.defense.privilege.slaveSoldier == 1>>
 		<br>''Special slaves privileges:'' Slaves into the army are allowed to have material possessions.
-		[[Repeal|edicts][$edicts.edicts.defense.privilege.slaveSoldier = 0]]
+		[[Repeal|edicts][$edicts.defense.privilege.slaveSoldier = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.mercSoldier == 1>>
+	<<if $edicts.defense.privilege.mercSoldier == 1>>
 		<br>''Special mercenary privileges:'' Mercenaries under contract can claim part of the loot gained from battles.
-		[[Repeal|edicts][$edicts.edicts.defense.privilege.mercSoldier = 0]]
+		[[Repeal|edicts][$edicts.defense.privilege.mercSoldier = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.martialSchool == 1>>
+	<<if $edicts.defense.martialSchool == 1>>
 		<br>''@@.lime;Slave martial schools:@@'' specialized schools are training slaves in martial arts and bodyguarding.
-		[[Repeal|edicts][$edicts.edicts.defense.martialSchool = 0]]
+		[[Repeal|edicts][$edicts.defense.martialSchool = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.eliteOfficers == 1>>
+	<<if $edicts.defense.eliteOfficers == 1>>
 		<br>''@@.lime;Elite officers:@@'' officers are exclusively recruited from the elite of society.
-		[[Repeal|edicts][$edicts.edicts.defense.eliteOfficers = 0]]
+		[[Repeal|edicts][$edicts.defense.eliteOfficers = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.liveTargets == 1>>
+	<<if $edicts.defense.liveTargets == 1>>
 		<br>''@@.lime;Live targets drills:@@'' disobedient slaves are used as live targets at shooting ranges.
-		[[Repeal|edicts][$edicts.edicts.defense.liveTargets = 0]]
+		[[Repeal|edicts][$edicts.defense.liveTargets = 0]]
 	<</if>>
 <</if>>
 
 <<if $FSAnnounced>>
-	<<if $edicts.edicts.defense.FS.legionTradition == 1>>
+	<<if $edicts.defense.FS.legionTradition == 1>>
 		<br>''@@.lime;Legionaries traditions:@@'' you are funding specialized training for your recruits following the Roman tradition of professional armies.
-		[[Repeal|edicts][$edicts.edicts.defense.FS.legionTradition = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.legionTradition = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.FS.pharaonTradition == 1>>
+	<<if $edicts.defense.FS.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.edicts.defense.FS.pharaonTradition = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.pharaonTradition = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.FS.eagleWarriors == 1>>
+	<<if $edicts.defense.FS.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.edicts.defense.FS.eagleWarriors = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.eagleWarriors = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.FS.ronin == 1>>
+	<<if $edicts.defense.FS.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.edicts.defense.FS.ronin = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.ronin = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.FS.mamluks == 1>>
+	<<if $edicts.defense.FS.mamluks == 1>>
 		<br>''@@.lime;Mamluks traditions:@@'' you are funding specialized training for your slaves following the Arabian tradition of edicts.defense.FS.mamluks slave soldiers.
-		[[Repeal|edicts][$edicts.edicts.defense.FS.mamluks = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.mamluks = 0]]
 	<</if>>
 
-	<<if $edicts.edicts.defense.FS.sunTzu == 1>>
+	<<if $edicts.defense.FS.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.edicts.defense.FS.sunTzu = 0]]
+		[[Repeal|edicts][$edicts.defense.FS.sunTzu = 0]]
 	<</if>>
 <</if>>
 
@@ -224,30 +224,30 @@
 ''__Available Edicts__''
 <br>//Passing any edict will cost <<print cashFormat(5000)>> and some authority. More edicts will become available as the arcology develops.//
 </div>
-<<if $edicts.edicts.alternativeRents == 0>>
+<<if $edicts.alternativeRents == 0>>
 	<br>''Alternative rent payment:'' allow citizens to pay for their rents in menial slaves rather than cash, if so they wish.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.alternativeRents = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.alternativeRents = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will decrease rents, but will supply a small amount of menial slaves each week.//
 <</if>>
 
-<<if $edicts.edicts.enslavementRights == 0>>
+<<if $edicts.enslavementRights == 0>>
 	<br>''Enslavement rights:'' the arcology owner will be the only authority able to declare a person enslaved or not.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.enslavementRights = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.enslavementRights = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will provide cash each week. The higher the flux of citizens to slaves the higher the income. Will cost a small amount of authority each week.//
 <</if>>
 
-<<if $edicts.edicts.sellData == 0 && ($secUpgrades.nanoCams == 1 || $secUpgrades.cyberBots == 1 || $secUpgrades.eyeScan == 1 || $secUpgrades.cryptoAnalyzer == 1 || $crimeUpgrades.autoTrial == 1 || $crimeUpgrades.autoArchive == 1 || $crimeUpgrades.worldProfiler == 1 || $crimeUpgrades.advForensic == 1)>>
+<<if $edicts.sellData == 0 && ($secUpgrades.nanoCams == 1 || $secUpgrades.cyberBots == 1 || $secUpgrades.eyeScan == 1 || $secUpgrades.cryptoAnalyzer == 1 || $crimeUpgrades.autoTrial == 1 || $crimeUpgrades.autoArchive == 1 || $crimeUpgrades.worldProfiler == 1 || $crimeUpgrades.advForensic == 1)>>
 	<br>''Private Data marketization:'' allow the selling of private citizens' data.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.sellData = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.sellData = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
@@ -255,10 +255,10 @@
 <</if>>
 
 <<if $SecExp.buildings.propHub.active == 1>>
-	<<if $edicts.edicts.propCampaignBoost == 0>>
+	<<if $edicts.propCampaignBoost == 0>>
 		<br>''Obligatory educational material:'' force residents to read curated educational material about the arcology.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.propCampaignBoost = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.propCampaignBoost = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -267,19 +267,19 @@
 <</if>>
 
 <<if $transportHub == 1>>
-	<<if $edicts.edicts.tradeLegalAid == 0>>
+	<<if $edicts.tradeLegalAid == 0>>
 		<br>''Legal aid for new businesses:'' Support new businesses in the arcology by helping them cover legal costs and issues.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.tradeLegalAid = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.tradeLegalAid = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase trade, but will incur upkeep costs.//
 	<</if>>
-	<<if $edicts.edicts.taxTrade == 0>>
+	<<if $edicts.taxTrade == 0>>
 		<br>''Trade tariffs:'' all goods transitioning in your arcology will have to pay a transition fee.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.taxTrade = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.taxTrade = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -288,10 +288,10 @@
 <</if>>
 
 <<if $arcologies[0].FSPaternalist != "unset">>
-	<<if $edicts.edicts.slaveWatch == 0>>
+	<<if $edicts.slaveWatch == 0>>
 		<br>''@@.lime;Slave mistreatment watch:@@'' slaves will be able access a special security service in case of mistreatment.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.slaveWatch = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.slaveWatch = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -300,10 +300,10 @@
 <</if>>
 
 <<if $arcologies[0].FSChattelReligionist >= 40>>
-	<<if $edicts.edicts.subsidyChurch == 0>>
+	<<if $edicts.subsidyChurch == 0>>
 		<br>''@@.lime;Religious activities subsidy:@@'' will provide economic support to religious activities following the official dogma.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.subsidyChurch = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.subsidyChurch = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -311,44 +311,44 @@
 	<</if>>
 <</if>>
 
-<<if $SF.Toggle && $SF.Active >= 1 && $edicts.edicts.SFSupportLevel < 5>>
+<<if $SF.Toggle && $SF.Active >= 1 && $edicts.SFSupportLevel < 5>>
 	<br><br>__Special Force:__
 	<<if !$edicts.SFSupportLevel && App.SecExp.Check.reqMenials() > 5>>
 		<br>''Equipment provision:'' <<= App.SF.Caps()>> will provide the security HQ with advanced equipment.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.//
-	<<elseif $edicts.edicts.SFSupportLevel && $SF.Squad.Firebase >= 4 && App.SecExp.Check.reqMenials() > 5>>
+	<<elseif $edicts.SFSupportLevel && $SF.Squad.Firebase >= 4 && App.SecExp.Check.reqMenials() > 5>>
 		<br>''Personnel training:'' <<= App.SF.Caps()>> will provide the security HQ personnel with advanced training.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
-	<<elseif $edicts.edicts.SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
+	<<elseif $edicts.SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
 		<br>''Troops detachment:'' <<= App.SF.Caps()>> will provide troops to the security department.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
-	<<elseif $edicts.edicts.SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
+	<<elseif $edicts.SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>>
 		<br>''Full Support:'' <<= App.SF.Caps()>> will give the security department its full support.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
-	<<elseif $edicts.edicts.SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && App.SecExp.Check.reqMenials() > 5>>
+	<<elseif $edicts.SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && App.SecExp.Check.reqMenials() > 5>>
 		<br>''Network assistance:'' <<= App.SF.Caps()>> will assist the security department with installing a local version of their custom network.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.SFSupportLevel++, cashX(-50000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.SFSupportLevel++, cashX(-50000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -358,20 +358,20 @@
 
 <br><br>__Immigration:__
 
-<<if $edicts.edicts.limitImmigration == 0>>
+<<if $edicts.limitImmigration == 0>>
 	<br>''Immigration limits:'' institute limits to the amount of people the arcology will accept each week.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.openBorders = 0, $edicts.edicts.limitImmigration = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.openBorders = 0, $edicts.limitImmigration = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower the amount of people immigrating into the arcology and enhance security.//
 <</if>>
 
-<<if $edicts.edicts.openBorders == 0>>
+<<if $edicts.openBorders == 0>>
 	<br>''Open borders:'' considerably lower requirements to become citizens.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.openBorders = 1, $edicts.edicts.limitImmigration = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.openBorders = 1, $edicts.limitImmigration = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
@@ -379,48 +379,48 @@
 <</if>>
 
 <br><br>__Weapons:__
-<<if $edicts.edicts.weaponsLaw == 3>>
+<<if $edicts.weaponsLaw == 3>>
 	<br>''Heavy weaponry forbidden:'' set the range of weapons allowed within the arcology to non-heavy, non-explosive.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 2, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 2, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will slightly increase prosperity, but will cost a small amount of authority each week and will leave rebellions decently armed.//
-<<elseif $edicts.edicts.weaponsLaw == 2>>
+<<elseif $edicts.weaponsLaw == 2>>
 	<br>''All weapons allowed:'' allow residents of the arcology to buy, sell and keep weaponry of any kind within the arcology.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 3, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 3, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will slightly increase prosperity and provide a small weekly amount of reputation, but rebellions will be very well armed.//
 	<br>''Heavily restricted weaponry:'' set the range of weapons allowed within the arcology to non-automatic, non-high caliber.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will cost some authority each week, but rebellions will be poorly armed.//
-<<elseif $edicts.edicts.weaponsLaw == 1>>
+<<elseif $edicts.weaponsLaw == 1>>
 	<br>''Heavy weaponry forbidden:'' set the range of weapons allowed within the arcology to non-heavy, non-explosive.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 2, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 2, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will slightly increase prosperity, but will cost a small amount of authority each week and will leave rebellions decently armed.//
 	<br>''Forbid weapons inside the arcology:'' forbid residents to buy, sell and keep weaponry while within the arcology.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will cost a moderate amount of authority each week, but rebellions will be very poorly armed.//
-<<elseif $edicts.edicts.weaponsLaw == 0>>
+<<elseif $edicts.weaponsLaw == 0>>
 	<br>''Heavily restricted weaponry:'' set the range of weapons allowed within the arcology to non-automatic, non-high caliber.
 	<<if $SecExp.core.authority >= 1000>>
-		[[Implement|edicts][$edicts.edicts.weaponsLaw = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+		[[Implement|edicts][$edicts.weaponsLaw = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 	<<else>>
 		<br>//Not enough Authority.//
 	<</if>>
@@ -430,25 +430,25 @@
 <<if $battlesCount > 0 || $rebellionsCount > 0 || $mercenaries > 0>>
 	<br><br>__Defense Force__:
 
-	<<if $edicts.edicts.defense.soldierWages == 0>>
+	<<if $edicts.defense.soldierWages == 0>>
 		<br>''Average wages for soldiers:'' will set the wages paid to the soldiers of the arcology to an average amount.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.soldierWages += 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.soldierWages += 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will raise all units upkeep and push loyalty to average levels.//
-	<<elseif edicts.edicts.defense.soldierWages == 1>>
+	<<elseif edicts.defense.soldierWages == 1>>
 		<br>''Low wages for soldiers:'' will set the wages paid to the soldiers of the arcology to a low amount.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.soldierWages -= 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.soldierWages -= 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower all units upkeep and push loyalty to low levels.//
 		<br>''High wages for soldiers:'' will set the wages paid to the soldiers of the arcology to a high amount.
 		<<if $edicts.SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.soldierWages += 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.soldierWages += 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -456,17 +456,17 @@
 	<<else>>
 		<br>''Average wages for soldiers:'' will set the wages paid to the soldiers of the arcology to an average amount.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.soldierWages -= 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.soldierWages -= 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will lower all units upkeep and push loyalty to average levels.//
 	<</if>>
 
-	<<if $edicts.edicts.defense.slavesOfficers == 0>>
+	<<if $edicts.defense.slavesOfficers == 0>>
 		<br>''Slave Officers:'' allow your trusted slaves to lead the defense forces of the arcology.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.slavesOfficers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.slavesOfficers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -474,10 +474,10 @@
 	<</if>>
 
 	<<if $mercenaries > 0>>
-		<<if $edicts.edicts.defense.discountMercenaries == 0>>
+		<<if $edicts.defense.discountMercenaries == 0>>
 			<br>''Mercenary subsidy:'' mercenaries willing to immigrate in your arcology will be offered a discount on rent.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.discountMercenaries = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.discountMercenaries = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -485,58 +485,58 @@
 		<</if>>
 	<</if>>
 
-	<<if $edicts.edicts.defense.militiaFounded == 0>>
+	<<if $edicts.defense.militiaFounded == 0>>
 		<br>''Found the militia:'' lay the groundwork for the formation of the arcology's citizens' army.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.militiaFounded = 1, $edicts.edicts.defense.recruitVolunteers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.militiaFounded = 1, $edicts.defense.recruitVolunteers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for the recruitment and training of citizens.//
 	<</if>>
 
-	<<if $edicts.edicts.defense.militiaFounded == 1>>
-		<<if $edicts.edicts.defense.recruitVolunteers == 0>>
+	<<if $edicts.defense.militiaFounded == 1>>
+		<<if $edicts.defense.recruitVolunteers == 0>>
 			<br>''Volunteers' militia:'' only volunteers will be accepted in the militia.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.militarizedSociety = 0, $edicts.edicts.defense.militaryService = 0, $edicts.edicts.defense.conscription = 0, $edicts.edicts.defense.recruitVolunteers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.militarizedSociety = 0, $edicts.defense.militaryService = 0, $edicts.defense.conscription = 0, $edicts.defense.recruitVolunteers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will replenish militia manpower slowly and will cap at 2% of the total citizens population.//
 		<</if>>
-		<<if $edicts.edicts.defense.conscription == 0>>
+		<<if $edicts.defense.conscription == 0>>
 			<br>''Conscription:'' every citizen is required to train in the militia and serve the arcology if the need arises.
 			<<if $SecExp.core.authority >= 4000>>
-				[[Implement|edicts][$edicts.edicts.defense.militarizedSociety = 0, $edicts.edicts.defense.militaryService = 0, $edicts.edicts.defense.conscription = 1, $edicts.edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 4000]]
+				[[Implement|edicts][$edicts.defense.militarizedSociety = 0, $edicts.defense.militaryService = 0, $edicts.defense.conscription = 1, $edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 4000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will replenish militia manpower moderately fast and will cap at 5% of the total citizens population, but has a high authority cost//
 		<</if>>
-		<<if $edicts.edicts.defense.militaryService == 0>>
+		<<if $edicts.defense.militaryService == 0>>
 			<br>''Obligatory military service:'' every citizen is required to register and serve under the militia.
 			<<if $SecExp.core.authority >= 6000>>
-				[[Implement|edicts][$edicts.edicts.defense.militarizedSociety = 0, $edicts.edicts.defense.militaryService = 1, $edicts.edicts.defense.conscription = 0, $edicts.edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 6000]]
+				[[Implement|edicts][$edicts.defense.militarizedSociety = 0, $edicts.defense.militaryService = 1, $edicts.defense.conscription = 0, $edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 6000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will quickly replenish militia manpower and will cap at 10% of the total citizens population, but has a very high authority cost//
 		<</if>>
-		<<if $edicts.edicts.defense.militarizedSociety == 0>>
+		<<if $edicts.defense.militarizedSociety == 0>>
 			<br>''Militarized Society:'' every adult citizen is required to train and participate in the defense of the arcology.
 			<<if $SecExp.core.authority >= 8000>>
-				[[Implement|edicts][$edicts.edicts.defense.militarizedSociety = 1, $edicts.edicts.defense.militaryService = 0, $edicts.edicts.defense.conscription = 0, $edicts.edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 8000]]
+				[[Implement|edicts][$edicts.defense.militarizedSociety = 1, $edicts.defense.militaryService = 0, $edicts.defense.conscription = 0, $edicts.defense.recruitVolunteers = 0, cashX(-5000, "edicts"), $SecExp.core.authority -= 8000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will very quickly replenish militia manpower and will cap at 20% of the total citizens population, but has an extremely high authority cost//
 		<</if>>
 
-		<<if $edicts.edicts.defense.militaryExemption == 0 && ($edicts.edicts.defense.conscription == 1 || $edicts.edicts.defense.militaryService == 1 || $edicts.edicts.defense.militarizedSociety == 1)>>
+		<<if $edicts.defense.militaryExemption == 0 && ($edicts.defense.conscription == 1 || $edicts.defense.militaryService == 1 || $edicts.defense.militarizedSociety == 1)>>
 			<br>''Military exemption:'' allow citizens to avoid military duty by paying a weekly fee.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.militaryExemption = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.militaryExemption = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -544,10 +544,10 @@
 		<</if>>
 
 		<<if $arcologies[0].FSHedonisticDecadence >= 40>>
-			<<if $edicts.edicts.defense.lowerRequirements == 0>>
+			<<if $edicts.defense.lowerRequirements == 0>>
 				<br>''@@.lime;Revised minimum requirements:@@'' will allow citizens outside the normally accepted range to join the militia.
 				<<if $SecExp.core.authority >= 1000>>
-					[[Implement|edicts][$edicts.edicts.defense.lowerRequirements = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+					[[Implement|edicts][$edicts.defense.lowerRequirements = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 				<<else>>
 					<br>//Not enough Authority.//
 				<</if>>
@@ -556,10 +556,10 @@
 		<</if>>
 
 		<<if $arcologies[0].FSSubjugationist >= 40>>
-			<<if $edicts.edicts.defense.noSubhumansInArmy == 0>>
+			<<if $edicts.defense.noSubhumansInArmy == 0>>
 				<br>''@@.lime;No subhumans in the militia:@@'' prevent subhumans from joining the militia.
 				<<if $SecExp.core.authority >= 1000>>
-					[[Implement|edicts][$edicts.edicts.defense.noSubhumansInArmy = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+					[[Implement|edicts][$edicts.defense.noSubhumansInArmy = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 				<<else>>
 					<br>//Not enough Authority.//
 				<</if>>
@@ -567,11 +567,11 @@
 			<</if>>
 		<</if>>
 
-		<<if $arcologies[0].FSRepopulationFocus >= 40 && ($edicts.edicts.defense.conscription == 1 || $edicts.edicts.defense.militaryService == 1 || $edicts.edicts.defense.militarizedSociety == 1)>>
-			<<if $edicts.edicts.defense.pregExemption == 0>>
+		<<if $arcologies[0].FSRepopulationFocus >= 40 && ($edicts.defense.conscription == 1 || $edicts.defense.militaryService == 1 || $edicts.defense.militarizedSociety == 1)>>
+			<<if $edicts.defense.pregExemption == 0>>
 				<br>''@@.lime;Military exemption for pregnancies:@@'' pregnant citizens will be allowed, and encouraged, to avoid military service.
 				<<if $SecExp.core.authority >= 1000>>
-					[[Implement|edicts][$edicts.edicts.defense.pregExemption = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+					[[Implement|edicts][$edicts.defense.pregExemption = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 				<<else>>
 					<br>//Not enough Authority.//
 				<</if>>
@@ -580,30 +580,30 @@
 		<</if>>
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.militiaSoldier == 0 && $edicts.edicts.defense.militiaFounded == 1>>
+	<<if $edicts.defense.privilege.militiaSoldier == 0 && $edicts.defense.militiaFounded == 1>>
 		<br>''Special militia privileges'' will allow citizens joining the militia to avoid paying rent.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.privilege.militiaSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.privilege.militiaSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the loyalty of militia units, but will decrease rents.//
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.slaveSoldier == 0>>
+	<<if $edicts.defense.privilege.slaveSoldier == 0>>
 		<br>''Special slaves privileges'' will allow slaves drafted into the army to be able to have material possessions.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.privilege.slaveSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.privilege.slaveSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the loyalty of slave units, but will cost authority each week.//
 	<</if>>
 
-	<<if $edicts.edicts.defense.privilege.mercSoldier == 0 && $mercenaries > 0>>
+	<<if $edicts.defense.privilege.mercSoldier == 0 && $mercenaries > 0>>
 		<br>''Special mercenary privileges'' will allow mercenaries under contract to claim part of the loot gained from battles.
 		<<if $SecExp.core.authority >= 1000>>
-			[[Implement|edicts][$edicts.edicts.defense.privilege.mercSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+			[[Implement|edicts][$edicts.defense.privilege.mercSoldier = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 		<<else>>
 			<br>//Not enough Authority.//
 		<</if>>
@@ -611,10 +611,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSPhysicalIdealist >= 40>>
-		<<if $edicts.edicts.defense.martialSchool == 0>>
+		<<if $edicts.defense.martialSchool == 0>>
 			<br>''@@.lime;Slave martial schools:@@'' specialized schools will be set up to train slaves in martial arts and bodyguarding.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.martialSchool = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.martialSchool = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -623,10 +623,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSRestart >= 40>>
-		<<if $edicts.edicts.defense.eliteOfficers == 0>>
+		<<if $edicts.defense.eliteOfficers == 0>>
 			<br>''@@.lime;Elite officers:@@'' officers will be exclusively recruited from the elite of society.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.eliteOfficers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.eliteOfficers = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -635,10 +635,10 @@
 	<</if>>
 
 	<<if $arcologies[0].FSDegradationist >= 40>>
-		<<if $edicts.edicts.defense.liveTargets == 0>>
+		<<if $edicts.defense.liveTargets == 0>>
 			<br>''@@.lime;Live targets drills:@@'' disobedient slaves will be used as live targets at shooting ranges.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.liveTargets = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.liveTargets = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -649,11 +649,11 @@
 
 <<if $FSAnnounced>>
 	<br><br>__Future Societies:__
-	<<if $arcologies[0].FSRomanRevivalist >= 40 && $edicts.edicts.defense.militiaFounded == 1>>
-		<<if $edicts.edicts.defense.FS.legionTradition == 0>>
+	<<if $arcologies[0].FSRomanRevivalist >= 40 && $edicts.defense.militiaFounded == 1>>
+		<<if $edicts.defense.FS.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.edicts.defense.FS.legionTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.legionTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>
@@ -661,11 +661,11 @@
 		<</if>>
 	<</if>>
 
-	<<if $arcologies[0].FSEgyptianRevivalist >= 40 && $edicts.edicts.defense.militiaFounded == 1>>
-		<<if $edicts.edicts.defense.FS.pharaonTradition == 0>>
+	<<if $arcologies[0].FSEgyptianRevivalist >= 40 && $edicts.defense.militiaFounded == 1>>
+		<<if $edicts.defense.FS.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.edicts.defense.FS.pharaonTradition = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.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.edicts.defense.FS.eagleWarriors == 0>>
+		<<if $edicts.defense.FS.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.edicts.defense.FS.eagleWarriors = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.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.edicts.defense.FS.ronin == 0>>
+		<<if $edicts.defense.FS.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.edicts.defense.FS.ronin = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.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.edicts.defense.FS.mamluks == 0>>
+		<<if $edicts.defense.FS.mamluks == 0>>
 			<br>''@@.lime;Mamluks traditions:@@'' Fund specialized training for your slaves to turn them into the edicts.defense.FS.mamluks slave soldiers of Arabian tradition.
 			<<if $SecExp.core.authority >= 1000>>
-				[[Implement|edicts][$edicts.edicts.defense.FS.mamluks = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.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.edicts.defense.FS.sunTzu == 0>>
+		<<if $edicts.defense.FS.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.edicts.defense.FS.sunTzu = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
+				[[Implement|edicts][$edicts.defense.FS.sunTzu = 1, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]]
 			<<else>>
 				<br>//Not enough Authority.//
 			<</if>>