diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/structures/sb1.png b/binaries/data/mods/public/art/textures/ui/session/portraits/structures/rotarymill.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/structures/sb1.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/structures/rotarymill.png
diff --git a/binaries/data/mods/public/simulation/data/technologies/celts/special_gather_crop_rotation.json b/binaries/data/mods/public/simulation/data/technologies/celts/special_gather_crop_rotation.json
deleted file mode 100644
index d8fa537eee..0000000000
--- a/binaries/data/mods/public/simulation/data/technologies/celts/special_gather_crop_rotation.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"genericName": "Crop Rotation",
-	"description": "Crop rotation increases yield by preventing the depletion of vital nutrients and minerals from the soil.",
-	"cost": {"food": 300, "wood": 300, "stone": 0, "metal": 0},
-	"requirements": {"all": [{"tech": "phase_city"}, {"any": [{"civ": "celt"}, {"civ": "brit"}, {"civ": "gaul"}]}]},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "crop_rotation.png",
-	"researchTime": 40,
-	"tooltip": "Increase the yield of your farms. +25% farming rate.",
-	"modifications": [{"value": "ResourceGatherer/Rates/food.grain", "multiply": 1.25}],
-	"affects": ["Worker"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
index 73e6182d14..23432b53d7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
@@ -10,6 +10,18 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Auras>
+    <Aura1>
+    <Type>range</Type>
+      <Radius>60</Radius>
+      <Affects>Worker</Affects>
+      <Modifications>
+        <ResourceGatherer.Rates.food..grain> <Multiply>1.25</Multiply> </ResourceGatherer.Rates.food..grain>
+      </Modifications>
+      <AuraName>Farming bonus</AuraName>
+      <AuraDescription>Boosts nearby farming with +25%.</AuraDescription>
+    </Aura1>
+  </Auras>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
@@ -19,19 +31,13 @@
     <Civ>Brit</Civ>
     <GenericName>Rotary Mill</GenericName>
     <SpecificName>Melonas</SpecificName>
-    <Tooltip>Increase nearby farming output +25%. (Currently, a special technology can be researched to serve this function)</Tooltip>
+    <Tooltip>Increase nearby farming output +25%.</Tooltip>
     <History>The Celts developed the first rotary flour mill.</History>
-    <Icon>structures/sb1.png</Icon>
+    <Icon>structures/rotarymill.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      celts/special_gather_crop_rotation
-    </Technologies>
-  </ProductionQueue>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml b/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml
deleted file mode 100644
index fc56c34539..0000000000
--- a/binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>100</BuildTime>
-    <PopulationBonus>2</PopulationBonus>
-    <Resources>
-      <food>0</food>
-      <wood>200</wood>
-      <stone>100</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="9.0"/>
-    <Height>6.0</Height>
-  </Footprint>
-  <GarrisonHolder disable=""/>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>celt</Civ>
-    <GenericName>Rotary Mill</GenericName>
-    <SpecificName>Melonas</SpecificName>
-    <Tooltip>Increase nearby farming output +25%. (Currently, a special technology can be researched to serve this function)</Tooltip>
-    <History>The Celts developed the first rotary flour mill.</History>
-    <Icon>structures/sb1.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="16.0" depth="16.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      celts/special_gather_crop_rotation
-    </Technologies>
-  </ProductionQueue>
-  <RallyPoint disable=""/>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_ffactri.xml</select>
-      <constructed>interface/complete/building/complete_ffactri.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>8.0</HeightOffset>
-  </StatusBars>
-  <TerritoryInfluence>
-    <Radius>32</Radius>
-  </TerritoryInfluence>
-  <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-  </VisualActor>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
index 2b0dae7a76..4f99d1e06f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
@@ -10,6 +10,18 @@
       <metal>0</metal>
     </Resources>
   </Cost>
+  <Auras>
+    <Aura1>
+    <Type>range</Type>
+      <Radius>60</Radius>
+      <Affects>Worker</Affects>
+      <Modifications>
+        <ResourceGatherer.Rates.food..grain> <Multiply>1.25</Multiply> </ResourceGatherer.Rates.food..grain>
+      </Modifications>
+      <AuraName>Farming bonus</AuraName>
+      <AuraDescription>Boosts nearby farming with +25%.</AuraDescription>
+    </Aura1>
+  </Auras>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
@@ -19,19 +31,13 @@
     <Civ>gaul</Civ>
     <GenericName>Rotary Mill</GenericName>
     <SpecificName>Melonas</SpecificName>
-    <Tooltip>Increase nearby farming output +25%. (Currently, a special technology can be researched to serve this function)</Tooltip>
+    <Tooltip>Increase nearby farming output +25%.</Tooltip>
     <History>The Celts developed the first rotary flour mill.</History>
-    <Icon>structures/sb1.png</Icon>
+    <Icon>structures/rotarymill.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      celts/special_gather_crop_rotation
-    </Technologies>
-  </ProductionQueue>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>