diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_0.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_0.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_0_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_0_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_1.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_1_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_2.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_2_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_4.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_4_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/unoccupied_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_0.5.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_00.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_00_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_01.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_01_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_02.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_02_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_03.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_03_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_04.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_04_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_05.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_05_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_06.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_06_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_07.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_07_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_08.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_08_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_09.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_09_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_1.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_1_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_2.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_2_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_4.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/working_4_pc.png b/data/tribes/buildings/productionsites/frisians/blacksmithy/working_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_0.5.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_00.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_00_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_01.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_01_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_02.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_02_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_03.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_03_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_04.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_04_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_05.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_05_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_06.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_06_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_07.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_07_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_08.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_08_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_09.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_09_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_1.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_1_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_2.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_2_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_4.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/idle_4_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/idle_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/init.lua b/data/tribes/buildings/productionsites/frisians/brewery/init.lua
@@ -21,21 +21,32 @@ tribes:new_productionsite_type {
       reed = 1
    },
 
-   animations = {
+   spritesheets = {
       idle = {
-         pictures = path.list_files (dirname .. "idle_??.png"),
-         hotspot = {56, 92},
-         fps = 10,
+         directory = dirname,
+         basename = "idle",
+         hotspot = {50, 80},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
       },
       working = {
-         pictures = path.list_files (dirname .. "working_??.png"),
-         hotspot = {56, 92},
-         fps = 10,
-      },
+         directory = dirname,
+         basename = "working",
+         hotspot = {50, 80},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
+      }
+   },
+   animations = {
       unoccupied = {
-         pictures = path.list_files (dirname .. "unoccupied_?.png"),
-         hotspot = {56, 69},
-      },
+         directory = dirname,
+         basename = "unoccupied",
+         hotspot = {50, 60}
+      }
    },
 
    aihints = {

diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.5.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_0_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_1.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_1_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_2.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_2_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_4.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_4_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/unoccupied_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_0.5.png b/data/tribes/buildings/productionsites/frisians/brewery/working_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_00.png b/data/tribes/buildings/productionsites/frisians/brewery/working_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_00_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_01.png b/data/tribes/buildings/productionsites/frisians/brewery/working_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_01_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_02.png b/data/tribes/buildings/productionsites/frisians/brewery/working_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_02_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_03.png b/data/tribes/buildings/productionsites/frisians/brewery/working_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_03_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_04.png b/data/tribes/buildings/productionsites/frisians/brewery/working_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_04_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_05.png b/data/tribes/buildings/productionsites/frisians/brewery/working_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_05_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_06.png b/data/tribes/buildings/productionsites/frisians/brewery/working_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_06_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_07.png b/data/tribes/buildings/productionsites/frisians/brewery/working_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_07_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_08.png b/data/tribes/buildings/productionsites/frisians/brewery/working_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_08_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_09.png b/data/tribes/buildings/productionsites/frisians/brewery/working_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_09_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_1.png b/data/tribes/buildings/productionsites/frisians/brewery/working_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_1_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_2.png b/data/tribes/buildings/productionsites/frisians/brewery/working_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_2_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_4.png b/data/tribes/buildings/productionsites/frisians/brewery/working_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/working_4_pc.png b/data/tribes/buildings/productionsites/frisians/brewery/working_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_0.5.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_00.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_00_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_01.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_01_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_02.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_02_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_03.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_03_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_04.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_04_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_05.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_05_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_06.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_06_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_07.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_07_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_08.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_08_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_09.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_09_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_1.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_1_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_2.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_2_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_4.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_4_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/idle_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua b/data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua
@@ -21,21 +21,32 @@ tribes:new_productionsite_type {
       reed = 1
    },
 
-   animations = {
+   spritesheets = {
       idle = {
-         pictures = path.list_files (dirname .. "idle_??.png"),
-         hotspot = {56, 83},
-         fps = 10,
+         directory = dirname,
+         basename = "idle",
+         hotspot = {50, 72},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
       },
       working = {
-         pictures = path.list_files (dirname .. "working_??.png"),
-         hotspot = {56, 86},
-         fps = 10,
-      },
+         directory = dirname,
+         basename = "working",
+         hotspot = {50, 75},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
+      }
+   },
+   animations = {
       unoccupied = {
-         pictures = path.list_files (dirname .. "unoccupied_?.png"),
-         hotspot = {56, 66},
-      },
+         directory = dirname,
+         basename = "unoccupied",
+         hotspot = {50, 58}
+      }
    },
 
    aihints = {

diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.5.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_0_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_1.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_1_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_2.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_2_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_4.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_4_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/unoccupied_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_0.5.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_00.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_00_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_01.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_01_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_02.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_02_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_03.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_03_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_04.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_04_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_05.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_05_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_06.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_06_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_07.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_07_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_08.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_08_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_09.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_09_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_1.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_1_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_2.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_2_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_4.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/working_4_pc.png b/data/tribes/buildings/productionsites/frisians/brick_kiln/working_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_0.5.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_00.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_00_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_01.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_01_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_02.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_02_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_03.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_03_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_04.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_04_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_05.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_05_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_06.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_06_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_07.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_07_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_08.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_08_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_09.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_09_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_1.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_1_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_2.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_2_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_4.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_4_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/idle_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua
@@ -21,21 +21,32 @@ tribes:new_productionsite_type {
       reed = 1
    },
 
-   animations = {
+   spritesheets = {
       idle = {
-         pictures = path.list_files (dirname .. "idle_??.png"),
-         hotspot = {56, 94},
-         fps = 10,
+         directory = dirname,
+         basename = "idle",
+         hotspot = {50, 82},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
       },
       working = {
-         pictures = path.list_files (dirname .. "working_??.png"),
-         hotspot = {56, 94},
-         fps = 10,
-      },
+         directory = dirname,
+         basename = "working",
+         hotspot = {50, 82},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
+      }
+   },
+   animations = {
       unoccupied = {
-         pictures = path.list_files (dirname .. "unoccupied_?.png"),
-         hotspot = {56, 72},
-      },
+         directory = dirname,
+         basename = "unoccupied",
+         hotspot = {50, 64}
+      }
    },
 
    aihints = {

diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.5.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_0_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_1.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_1_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_2.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_2_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_4.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_4_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/unoccupied_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_0.5.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_00.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_00_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_01.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_01_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_02.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_02_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_03.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_03_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_04.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_04_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_05.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_05_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_06.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_06_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_07.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_07_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_08.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_08_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_09.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_09_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_1.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_1_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_2.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_2_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_4.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_4_pc.png b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/working_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_0.5.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_00.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_00_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_01.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_01_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_02.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_02_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_03.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_03_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_04.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_04_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_05.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_05_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_06.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_06_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_07.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_07_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_08.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_08_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_09.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_09_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_1.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_1_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_2.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_2_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_4.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/idle_4_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/idle_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/init.lua b/data/tribes/buildings/productionsites/frisians/clay_pit/init.lua
@@ -18,21 +18,32 @@ tribes:new_productionsite_type {
       brick = 1
    },
 
-   animations = {
+   spritesheets = {
       idle = {
-         pictures = path.list_files (dirname .. "idle_??.png"),
-         hotspot = {49, 84},
-         fps = 10,
+         directory = dirname,
+         basename = "idle",
+         hotspot = {40, 68},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
       },
       working = {
-         pictures = path.list_files (dirname .. "working_??.png"),
-         hotspot = {49, 84},
-         fps = 10,
-      },
+         directory = dirname,
+         basename = "working",
+         hotspot = {40, 68},
+         frames = 10,
+         columns = 5,
+         rows = 2,
+         fps = 10
+      }
+   },
+   animations = {
       unoccupied = {
-         pictures = path.list_files (dirname .. "unoccupied_?.png"),
-         hotspot = {49, 63},
-      },
+         directory = dirname,
+         basename = "unoccupied",
+         hotspot = {40, 52}
+      }
    },
 
    indicate_workarea_overlaps = {

diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.5.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_0_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_1.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_1_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_1_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_2.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_2.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_2_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_2_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_4.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_4.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_4_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/unoccupied_4_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_0.5.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_0.5.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_0.5_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_0.5_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_00.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_00.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_00_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_00_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_01.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_01.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_01_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_01_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_02.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_02.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_02_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_02_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_03.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_03.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_03_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_03_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_04.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_04.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_04_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_04_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_05.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_05.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_05_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_05_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_06.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_06.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_06_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_06_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_07.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_07.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_07_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_07_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_08.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_08.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_08_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_08_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_09.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_09.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_09_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_09_pc.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_1.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_1.png
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/working_1_pc.png b/data/tribes/buildings/productionsites/frisians/clay_pit/working_1_pc.png