diff --git a/moreblocks/locale/moreblocks.de.tr b/moreblocks/locale/moreblocks.de.tr
index 882d509..d433bb3 100644
--- a/moreblocks/locale/moreblocks.de.tr
+++ b/moreblocks/locale/moreblocks.de.tr
@@ -13,6 +13,7 @@
 #: nodes.lua
 
 All-faces @1=allseitiger @1
+No-faces @1=
 Cactus Brick=Kaktusziegel
 Cactus Checker=Kaktus-Mosaik
 Centered Wooden Tile=Holzfliese mittig
diff --git a/moreblocks/locale/moreblocks.es.tr b/moreblocks/locale/moreblocks.es.tr
index 5f85887..3b9ec8b 100644
--- a/moreblocks/locale/moreblocks.es.tr
+++ b/moreblocks/locale/moreblocks.es.tr
@@ -10,6 +10,7 @@
 #: nodes.lua
 
 All-faces @1=@1, todas las caras
+No-faces @1=
 Cactus Brick=Ladrillos de Cactus
 Cactus Checker=Cuadros de Cactus
 Centered Wooden Tile=Parqué​ Centrado
diff --git a/moreblocks/locale/moreblocks.fr.tr b/moreblocks/locale/moreblocks.fr.tr
index b044ab4..c6d86c1 100644
--- a/moreblocks/locale/moreblocks.fr.tr
+++ b/moreblocks/locale/moreblocks.fr.tr
@@ -14,6 +14,7 @@
 #: nodes.lua
 
 All-faces @1=@1 (toutes faces)
+No-faces @1=
 Cactus Brick=Briques de cactus
 Cactus Checker=Damier en cactus
 Centered Wooden Tile=Dalle en bois centrée
diff --git a/moreblocks/locale/moreblocks.it.tr b/moreblocks/locale/moreblocks.it.tr
index 15b430d..67d4e22 100644
--- a/moreblocks/locale/moreblocks.it.tr
+++ b/moreblocks/locale/moreblocks.it.tr
@@ -13,6 +13,7 @@
 #: nodes.lua
 
 All-faces @1=@1 su ogni lato
+No-faces @1=
 Cactus Brick=Mattoni di cactus
 Cactus Checker=Scacchiera in cactus
 Centered Wooden Tile=Mattonella in legno centrata
diff --git a/moreblocks/locale/moreblocks.pl.tr b/moreblocks/locale/moreblocks.pl.tr
index 959c4cb..35ce975 100644
--- a/moreblocks/locale/moreblocks.pl.tr
+++ b/moreblocks/locale/moreblocks.pl.tr
@@ -13,6 +13,7 @@
 #: nodes.lua
 
 All-faces @1=Wielostronna tekstura @1
+No-faces @1=
 Cactus Brick=Kaktusowa cegła
 Cactus Checker=Kaktusowa szachownica
 Centered Wooden Tile=Wyśrodkowany drewniany kafelek
diff --git a/moreblocks/locale/moreblocks.ru.tr b/moreblocks/locale/moreblocks.ru.tr
index 4c6d7da..72f13a7 100644
--- a/moreblocks/locale/moreblocks.ru.tr
+++ b/moreblocks/locale/moreblocks.ru.tr
@@ -16,6 +16,7 @@
 #: nodes.lua
 
 All-faces @1=всестороннее бревно @1
+No-faces @1=
 Cactus Brick=кирпич из кактуса
 Cactus Checker=мозаика из кактуса
 Centered Wooden Tile=деревянная мозаика (центр)
diff --git a/moreblocks/locale/moreblocks.template.tr b/moreblocks/locale/moreblocks.template.tr
index a0dd82a..15a7fef 100644
--- a/moreblocks/locale/moreblocks.template.tr
+++ b/moreblocks/locale/moreblocks.template.tr
@@ -27,6 +27,7 @@ Iron Checker=
 Iron Glass=
 Iron Stone=
 Iron Stone Bricks=
+No-faces @1=
 Plankstone=
 Rope=
 Split Stone Tile=
diff --git a/moreblocks/locale/moreblocks.zh_CN.tr b/moreblocks/locale/moreblocks.zh_CN.tr
index cfc31e9..4fe862f 100644
--- a/moreblocks/locale/moreblocks.zh_CN.tr
+++ b/moreblocks/locale/moreblocks.zh_CN.tr
@@ -8,6 +8,7 @@
 #: nodes.lua
 
 All-faces @1=全切面@1树木方块
+No-faces @1=
 Cactus Brick=仙人掌砖
 Cactus Checker=仙人掌棋盘方块
 Centered Wooden Tile=居中的木瓦
diff --git a/moreblocks/locale/moreblocks.zh_TW.tr b/moreblocks/locale/moreblocks.zh_TW.tr
index 9168642..78a8b2e 100644
--- a/moreblocks/locale/moreblocks.zh_TW.tr
+++ b/moreblocks/locale/moreblocks.zh_TW.tr
@@ -5,21 +5,10 @@
 # This file is distributed under the same license as the More Blocks package.
 # IFRFSX <IFRFSX@protonmail.com>, 2020.
 
-#: circular_saw.lua
-
-Circular Saw=圓鋸
-Input material=輸入@n材料
-Left-over=剩餘材料
-Max=最大值
-Recycle output=回收@n輸出物
-Set=設置
-owned by @1=屬於@1所有
-Circular Saw is empty=圓鋸是空的
-Circular Saw is working on @1=圓鋸正在加工@1
-
 #: nodes.lua
 
 All-faces @1=全切面@1樹木方塊
+No-faces @1=
 Cactus Brick=仙人掌磚
 Cactus Checker=仙人掌棋盤方塊
 Centered Wooden Tile=居中的木瓦
diff --git a/stairsplus/circular_saw.lua b/stairsplus/circular_saw.lua
index d3fdbf7..347d681 100644
--- a/stairsplus/circular_saw.lua
+++ b/stairsplus/circular_saw.lua
@@ -57,16 +57,21 @@ function circular_saw.build_formspec(meta, inv)
 end
 
 function circular_saw.update_metadata(meta, inv)
-	local parts = {}
-	if station.can_dig(meta, inv) then
-		table.insert(parts, S("Circular Saw is empty"))
-	end
+	local parts = {S("Circular Saw")}
 
 	local owner = meta:get_string("owner")
 	if owner ~= "" then
 		table.insert(parts, S("(owned by @1)", owner))
 	end
 
+	local working_on = station.get_current_node(inv)
+	if working_on then
+		local stack = ItemStack(working_on)
+		table.insert(parts, S("Working on @1", stack:get_short_description() or stack:get_description()))
+	else
+		table.insert(parts, S("Empty"))
+	end
+
 	meta:set_string("infotext", table.concat(parts, " "))
 end
 
diff --git a/stairsplus/locale/cleanup_tr.py b/stairsplus/locale/cleanup_tr.py
new file mode 100644
index 0000000..ff9151c
--- /dev/null
+++ b/stairsplus/locale/cleanup_tr.py
@@ -0,0 +1,39 @@
+import pathlib
+import re
+
+ourdir = pathlib.Path('./')
+
+template = (ourdir / 'stairsplus.template.tr').open().readlines()
+
+for tr in ourdir.glob('*.tr'):
+  if str(tr) == 'stairsplus.template.tr':
+    continue
+
+  trs = {}
+  for line in tr.open():
+    m = re.fullmatch('([^=]+)=(.*)', line.rstrip('\n'))
+    if m:
+      trs[m.group(1)] = m.group(2)
+
+  with tr.open('w') as fh:
+    for line in template:
+      m = re.fullmatch('([^=]+)=(.*)', line.rstrip())
+      if m:
+        key = m.group(1)
+        value = trs.get(m.group(1), "")
+        if value == "":
+          if 'Microblock' in key:
+            value = trs.get('@1 Microblock', "")
+          elif 'Panel' in key:
+            value = trs.get('@1 Panel', "")
+          elif 'Slab' in key:
+            value = trs.get('@1 Slab', "")
+          elif 'Slope' in key:
+            value = trs.get('@1 Slope', "")
+          elif 'Stair' in key:
+            value = trs.get('@1 Stairs', "")
+
+        print(f'{key}={value}', file=fh)
+      else:
+        print(line, end='', file=fh)
+
diff --git a/stairsplus/locale/stairsplus.de.tr b/stairsplus/locale/stairsplus.de.tr
index b1e615a..4659c18 100644
--- a/stairsplus/locale/stairsplus.de.tr
+++ b/stairsplus/locale/stairsplus.de.tr
@@ -1,33 +1,77 @@
 # textdomain: stairsplus
 
-# German translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# Xanthin, 2014.
-# CodeXP <codexp@gmx.net>, 2018.
-
 #: circular_saw.lua
 
 Circular Saw=Kreissäge
-Input material=Ausgangs-@nmaterial
-Left-over=Rest
+Empty=leer
+Input=Eingang
 Max=Anzahl
-Recycle output=Wiederver-@nwerten
+Microblocks=@1mikroblock
+Nodes=
+(owned by @1)=gehört @1
 Set=Ok
-owned by @1=gehört @1
-Circular Saw is empty=Kreissäge ist leer
-Circular Saw is working on @1=Kreissäge arbeitet mit @1
-
-#: stairsplus/common.lua
+Working on @1=arbeitet mit @1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=@1mikroblock
+@1 1/8 Microblock=@1mikroblock
+@1 1/4 Microblock=@1mikroblock
 @1 Microblock=@1mikroblock
-@1 Slab=@1platte
+@1 3/4 Microblock=@1mikroblock
+@1 7/8 Microblock=@1mikroblock
+@1 15/16 Microblock=@1mikroblock
+
+#: shapes/panels.lua
+@1 1/16 Panel=@1paneel
+@1 1/8 Panel=@1paneel
+@1 1/4 Panel=@1paneel
+@1 1/2 Panel=@1paneel
+@1 3/4 Panel=@1paneel
+@1 7/8 Panel=@1paneel
+@1 15/16 Panel=@1paneel
+
+#: shapes/slabs.lua
+@1 1/16 Slab=@1platte
+@1 1/8 Slab=@1platte
+@1 1/4 Slab=@1platte
+@1 1/2 Slab=@1platte
+@1 3/4 Slab=@1platte
+@1 7/8 Slab=@1platte
+@1 15/16 Slab=@1platte
+@1 1/16 Slab Three Sides=@1platte
+@1 1/16 Slab Three Sides U=@1platte
+@1 1/16 Slab Two Sides=@1platte
+
+#: shapes/slopes.lua
+@1 1/2 Slope=@1neigung
+@1 1/2 Slope Raised=@1neigung
 @1 Slope=@1neigung
-@1 Panel=@1paneel
-@1 Stairs=@1treppe
+@1 Slope Cut=@1neigung
+@1 Slope Inner=@1neigung
+@1 Slope Inner Cut=@1neigung
+@1 Slope Inner Cut Half=@1neigung
+@1 Slope Inner Cut Half Raised=@1neigung
+@1 Slope Inner Half=@1neigung
+@1 Slope Inner Half Raised=@1neigung
+@1 Slope Outer=@1neigung
+@1 Slope Outer Cut=@1neigung
+@1 Slope Outer Cut Half=@1neigung
+@1 Slope Outer Cut Half Raised=@1neigung
+@1 Slope Outer Half=@1neigung
+@1 Slope Outer Half Raised=@1neigung
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=@1treppe
+@1 1/16 Alt Stair=@1treppe
+@1 1/8 Alt Stair=@1treppe
+@1 1/4 Alt Stair=@1treppe
+@1 1/2 Alt Stair=@1treppe
+@1 Inner Stair=@1treppe
+@1 Outer Stair=@1treppe
+@1 Half Stair=@1treppe
+@1 Right Half Stair=@1treppe
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.es.tr b/stairsplus/locale/stairsplus.es.tr
index 5c673d1..d4aa5e2 100644
--- a/stairsplus/locale/stairsplus.es.tr
+++ b/stairsplus/locale/stairsplus.es.tr
@@ -1,34 +1,77 @@
 # textdomain: stairsplus
 
-# Spanish translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# kaeza, 2013.
-# CodeXP <codexp@gmx.net>, 2018.
-# Carlos Barraza 2020.
-
 #: circular_saw.lua
 
 Circular Saw=Sierra circular
-Input material=Material de@nentrada
-Left-over=Sobrante
+Empty=vacia
+Input=aporte
 Max=Maximo
-Recycle output=Reciclar@nsalida
+Microblocks=Microbloque de @1
+Nodes=
+(owned by @1)=protegido por @1
 Set=Establecer
-owned by @1=protegido por @1
-Circular Saw is empty=La sierra circular está vacia
-Circular Saw is working on @1=Sierra circular trabajando en @1
-
-#: stairsplus/common.lua
+Working on @1=trabajando en @1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=Microbloque de @1
+@1 1/8 Microblock=Microbloque de @1
+@1 1/4 Microblock=Microbloque de @1
 @1 Microblock=Microbloque de @1
-@1 Slab=Losa de @1
+@1 3/4 Microblock=Microbloque de @1
+@1 7/8 Microblock=Microbloque de @1
+@1 15/16 Microblock=Microbloque de @1
+
+#: shapes/panels.lua
+@1 1/16 Panel=Panel de @1
+@1 1/8 Panel=Panel de @1
+@1 1/4 Panel=Panel de @1
+@1 1/2 Panel=Panel de @1
+@1 3/4 Panel=Panel de @1
+@1 7/8 Panel=Panel de @1
+@1 15/16 Panel=Panel de @1
+
+#: shapes/slabs.lua
+@1 1/16 Slab=Losa de @1
+@1 1/8 Slab=Losa de @1
+@1 1/4 Slab=Losa de @1
+@1 1/2 Slab=Losa de @1
+@1 3/4 Slab=Losa de @1
+@1 7/8 Slab=Losa de @1
+@1 15/16 Slab=Losa de @1
+@1 1/16 Slab Three Sides=Losa de @1
+@1 1/16 Slab Three Sides U=Losa de @1
+@1 1/16 Slab Two Sides=Losa de @1
+
+#: shapes/slopes.lua
+@1 1/2 Slope=Pendiente de @1
+@1 1/2 Slope Raised=Pendiente de @1
 @1 Slope=Pendiente de @1
-@1 Panel=Panel de @1
-@1 Stairs=Escalera de @1
+@1 Slope Cut=Pendiente de @1
+@1 Slope Inner=Pendiente de @1
+@1 Slope Inner Cut=Pendiente de @1
+@1 Slope Inner Cut Half=Pendiente de @1
+@1 Slope Inner Cut Half Raised=Pendiente de @1
+@1 Slope Inner Half=Pendiente de @1
+@1 Slope Inner Half Raised=Pendiente de @1
+@1 Slope Outer=Pendiente de @1
+@1 Slope Outer Cut=Pendiente de @1
+@1 Slope Outer Cut Half=Pendiente de @1
+@1 Slope Outer Cut Half Raised=Pendiente de @1
+@1 Slope Outer Half=Pendiente de @1
+@1 Slope Outer Half Raised=Pendiente de @1
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=Escalera de @1
+@1 1/16 Alt Stair=Escalera de @1
+@1 1/8 Alt Stair=Escalera de @1
+@1 1/4 Alt Stair=Escalera de @1
+@1 1/2 Alt Stair=Escalera de @1
+@1 Inner Stair=Escalera de @1
+@1 Outer Stair=Escalera de @1
+@1 Half Stair=Escalera de @1
+@1 Right Half Stair=Escalera de @1
 
-Concrete=Concreto
-Cement=Cemento
-Brass Block=Bloque de latón
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.fr.tr b/stairsplus/locale/stairsplus.fr.tr
index 6e0f0b0..93eaef7 100644
--- a/stairsplus/locale/stairsplus.fr.tr
+++ b/stairsplus/locale/stairsplus.fr.tr
@@ -1,34 +1,77 @@
 # textdomain: stairsplus
 
-# French translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# Hugo Locurcio <hugo.locurcio@hugo.pro>, 2013-2019.
-# Jat15, 2013.
-# CodeXP <codexp@gmx.net>, 2018.
-
 #: circular_saw.lua
 
 Circular Saw=Scie circulaire
-Input material=Matériau@nd'entrée
-Left-over=Reste
+Empty=vide
+Input=saisir
 Max=Max
-Recycle output=Sortie à@nrecycler
+Microblocks=Microbloc en @1
+Nodes=
+(owned by @1)=propriété de @1
 Set=Définir
-owned by @1=propriété de @1
-Circular Saw is empty=Scie circulaire vide
-Circular Saw is working on @1=Scie circulaire manipulant @1
-
-#: stairsplus/common.lua
+Working on @1=manipulant @1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=Microbloc en @1
+@1 1/8 Microblock=Microbloc en @1
+@1 1/4 Microblock=Microbloc en @1
 @1 Microblock=Microbloc en @1
-@1 Slab=Demi-dalle en @1
+@1 3/4 Microblock=Microbloc en @1
+@1 7/8 Microblock=Microbloc en @1
+@1 15/16 Microblock=Microbloc en @1
+
+#: shapes/panels.lua
+@1 1/16 Panel=Barre en @1
+@1 1/8 Panel=Barre en @1
+@1 1/4 Panel=Barre en @1
+@1 1/2 Panel=Barre en @1
+@1 3/4 Panel=Barre en @1
+@1 7/8 Panel=Barre en @1
+@1 15/16 Panel=Barre en @1
+
+#: shapes/slabs.lua
+@1 1/16 Slab=Demi-dalle en @1
+@1 1/8 Slab=Demi-dalle en @1
+@1 1/4 Slab=Demi-dalle en @1
+@1 1/2 Slab=Demi-dalle en @1
+@1 3/4 Slab=Demi-dalle en @1
+@1 7/8 Slab=Demi-dalle en @1
+@1 15/16 Slab=Demi-dalle en @1
+@1 1/16 Slab Three Sides=Demi-dalle en @1
+@1 1/16 Slab Three Sides U=Demi-dalle en @1
+@1 1/16 Slab Two Sides=Demi-dalle en @1
+
+#: shapes/slopes.lua
+@1 1/2 Slope=Pente en @1
+@1 1/2 Slope Raised=Pente en @1
 @1 Slope=Pente en @1
-@1 Panel=Barre en @1
-@1 Stairs=Escaliers en @1
+@1 Slope Cut=Pente en @1
+@1 Slope Inner=Pente en @1
+@1 Slope Inner Cut=Pente en @1
+@1 Slope Inner Cut Half=Pente en @1
+@1 Slope Inner Cut Half Raised=Pente en @1
+@1 Slope Inner Half=Pente en @1
+@1 Slope Inner Half Raised=Pente en @1
+@1 Slope Outer=Pente en @1
+@1 Slope Outer Cut=Pente en @1
+@1 Slope Outer Cut Half=Pente en @1
+@1 Slope Outer Cut Half Raised=Pente en @1
+@1 Slope Outer Half=Pente en @1
+@1 Slope Outer Half Raised=Pente en @1
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=Escaliers en @1
+@1 1/16 Alt Stair=Escaliers en @1
+@1 1/8 Alt Stair=Escaliers en @1
+@1 1/4 Alt Stair=Escaliers en @1
+@1 1/2 Alt Stair=Escaliers en @1
+@1 Inner Stair=Escaliers en @1
+@1 Outer Stair=Escaliers en @1
+@1 Half Stair=Escaliers en @1
+@1 Right Half Stair=Escaliers en @1
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.it.tr b/stairsplus/locale/stairsplus.it.tr
index 046b01d..91d01e5 100644
--- a/stairsplus/locale/stairsplus.it.tr
+++ b/stairsplus/locale/stairsplus.it.tr
@@ -1,33 +1,77 @@
 # textdomain: stairsplus
 
-# Italian translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# Emon, 2016.
-# CodeXP <codexp@gmx.net>, 2018.
-
 #: circular_saw.lua
 
 Circular Saw=Sega circolare
-Input material=Materiale@niniziale
-Left-over=Scarto
+Empty=vuota
+Input=ingresso
 Max=Max.
-Recycle output=Ricicla@nfinale
+Microblocks=Microblocco @1
+Nodes=
+(owned by @1)=
 Set=Imp.
-owned by @1=
-Circular Saw is empty=Sega circolare, vuota
-Circular Saw is working on @1=Sega circolare, in funzione su @1
-
-#: stairsplus/common.lua
+Working on @1=in funzione su @1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=Microblocco @1
+@1 1/8 Microblock=Microblocco @1
+@1 1/4 Microblock=Microblocco @1
 @1 Microblock=Microblocco @1
-@1 Slab=Lastra - @1
+@1 3/4 Microblock=Microblocco @1
+@1 7/8 Microblock=Microblocco @1
+@1 15/16 Microblock=Microblocco @1
+
+#: shapes/panels.lua
+@1 1/16 Panel=Pannello - @1
+@1 1/8 Panel=Pannello - @1
+@1 1/4 Panel=Pannello - @1
+@1 1/2 Panel=Pannello - @1
+@1 3/4 Panel=Pannello - @1
+@1 7/8 Panel=Pannello - @1
+@1 15/16 Panel=Pannello - @1
+
+#: shapes/slabs.lua
+@1 1/16 Slab=Lastra - @1
+@1 1/8 Slab=Lastra - @1
+@1 1/4 Slab=Lastra - @1
+@1 1/2 Slab=Lastra - @1
+@1 3/4 Slab=Lastra - @1
+@1 7/8 Slab=Lastra - @1
+@1 15/16 Slab=Lastra - @1
+@1 1/16 Slab Three Sides=Lastra - @1
+@1 1/16 Slab Three Sides U=Lastra - @1
+@1 1/16 Slab Two Sides=Lastra - @1
+
+#: shapes/slopes.lua
+@1 1/2 Slope=
+@1 1/2 Slope Raised=
 @1 Slope=
-@1 Panel=Pannello - @1
-@1 Stairs=Scale - @1
+@1 Slope Cut=
+@1 Slope Inner=
+@1 Slope Inner Cut=
+@1 Slope Inner Cut Half=
+@1 Slope Inner Cut Half Raised=
+@1 Slope Inner Half=
+@1 Slope Inner Half Raised=
+@1 Slope Outer=
+@1 Slope Outer Cut=
+@1 Slope Outer Cut Half=
+@1 Slope Outer Cut Half Raised=
+@1 Slope Outer Half=
+@1 Slope Outer Half Raised=
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=Scale - @1
+@1 1/16 Alt Stair=Scale - @1
+@1 1/8 Alt Stair=Scale - @1
+@1 1/4 Alt Stair=Scale - @1
+@1 1/2 Alt Stair=Scale - @1
+@1 Inner Stair=Scale - @1
+@1 Outer Stair=Scale - @1
+@1 Half Stair=Scale - @1
+@1 Right Half Stair=Scale - @1
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.pl.tr b/stairsplus/locale/stairsplus.pl.tr
index eb51818..be15515 100644
--- a/stairsplus/locale/stairsplus.pl.tr
+++ b/stairsplus/locale/stairsplus.pl.tr
@@ -1,33 +1,77 @@
 # textdomain: stairsplus
 
-# Polish translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# mat9117, 2019
-# CodeXP <codexp@gmx.net>, 2018.
-
 #: circular_saw.lua
 
 Circular Saw=Piła tarczowa
-Input material=wejście@nmateriał
-Left-over=Resztki
+Empty=jest pusta
+Input=Wejście
 Max=Maks
-Recycle output=Przetwarzanie@nWyjście
+Microblocks=@1 Mikroblok
+Nodes=
+(owned by @1)=Należy do @1
 Set=Ustaw
-owned by @1=Należy do @1
-Circular Saw is empty=Piła tarczowa jest pusta
-Circular Saw is working on @1=Piła tarczowa pracuje na @1
-
-#: stairsplus/common.lua
+Working on @1=pracuje na @1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=@1 Mikroblok
+@1 1/8 Microblock=@1 Mikroblok
+@1 1/4 Microblock=@1 Mikroblok
 @1 Microblock=@1 Mikroblok
-@1 Slab=@1 Płyta
+@1 3/4 Microblock=@1 Mikroblok
+@1 7/8 Microblock=@1 Mikroblok
+@1 15/16 Microblock=@1 Mikroblok
+
+#: shapes/panels.lua
+@1 1/16 Panel=@1 Panel
+@1 1/8 Panel=@1 Panel
+@1 1/4 Panel=@1 Panel
+@1 1/2 Panel=@1 Panel
+@1 3/4 Panel=@1 Panel
+@1 7/8 Panel=@1 Panel
+@1 15/16 Panel=@1 Panel
+
+#: shapes/slabs.lua
+@1 1/16 Slab=@1 Płyta
+@1 1/8 Slab=@1 Płyta
+@1 1/4 Slab=@1 Płyta
+@1 1/2 Slab=@1 Płyta
+@1 3/4 Slab=@1 Płyta
+@1 7/8 Slab=@1 Płyta
+@1 15/16 Slab=@1 Płyta
+@1 1/16 Slab Three Sides=@1 Płyta
+@1 1/16 Slab Three Sides U=@1 Płyta
+@1 1/16 Slab Two Sides=@1 Płyta
+
+#: shapes/slopes.lua
+@1 1/2 Slope=@1 Spad
+@1 1/2 Slope Raised=@1 Spad
 @1 Slope=@1 Spad
-@1 Panel=@1 Panel
-@1 Stairs=@1 Schody
+@1 Slope Cut=@1 Spad
+@1 Slope Inner=@1 Spad
+@1 Slope Inner Cut=@1 Spad
+@1 Slope Inner Cut Half=@1 Spad
+@1 Slope Inner Cut Half Raised=@1 Spad
+@1 Slope Inner Half=@1 Spad
+@1 Slope Inner Half Raised=@1 Spad
+@1 Slope Outer=@1 Spad
+@1 Slope Outer Cut=@1 Spad
+@1 Slope Outer Cut Half=@1 Spad
+@1 Slope Outer Cut Half Raised=@1 Spad
+@1 Slope Outer Half=@1 Spad
+@1 Slope Outer Half Raised=@1 Spad
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=@1 Schody
+@1 1/16 Alt Stair=@1 Schody
+@1 1/8 Alt Stair=@1 Schody
+@1 1/4 Alt Stair=@1 Schody
+@1 1/2 Alt Stair=@1 Schody
+@1 Inner Stair=@1 Schody
+@1 Outer Stair=@1 Schody
+@1 Half Stair=@1 Schody
+@1 Right Half Stair=@1 Schody
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.ru.tr b/stairsplus/locale/stairsplus.ru.tr
index f8874d8..dcbfd10 100644
--- a/stairsplus/locale/stairsplus.ru.tr
+++ b/stairsplus/locale/stairsplus.ru.tr
@@ -1,34 +1,77 @@
 # textdomain: stairsplus
 
-# Russian translation for MOREBLOCKS minetest mod.
-# Copyright (C) 2018 Hugo Locurcio and contributors
-# This file is distributed under the same license as the MOREBLOCKS package.
-# CodeXP <codexp@gmx.net>, 2018.
-#
-#, fuzzy
-
 #: circular_saw.lua
 
 Circular Saw=циркулярная пила
-Input material=Входной@nматериал
-Left-over=Остатки
+Empty=пустая
+Input=вход
 Max=Кол.
-Recycle output=Пере-@nобработка
+Microblocks=@1 (микроблок)
+Nodes=
+(owned by @1)=принадлежит @1
 Set=ОК
-owned by @1=принадлежит @1
-Circular Saw is empty=циркулярная пила пустая
-Circular Saw is working on @1=циркулярная пила, @1 в обработке
-
-#: stairsplus/common.lua
+Working on @1=@1 в обработке
 
+#: shapes/micros.lua
+@1 1/16 Microblock=@1 (микроблок)
+@1 1/8 Microblock=@1 (микроблок)
+@1 1/4 Microblock=@1 (микроблок)
 @1 Microblock=@1 (микроблок)
-@1 Slab=@1 (плита)
+@1 3/4 Microblock=@1 (микроблок)
+@1 7/8 Microblock=@1 (микроблок)
+@1 15/16 Microblock=@1 (микроблок)
+
+#: shapes/panels.lua
+@1 1/16 Panel=@1 (панель)
+@1 1/8 Panel=@1 (панель)
+@1 1/4 Panel=@1 (панель)
+@1 1/2 Panel=@1 (панель)
+@1 3/4 Panel=@1 (панель)
+@1 7/8 Panel=@1 (панель)
+@1 15/16 Panel=@1 (панель)
+
+#: shapes/slabs.lua
+@1 1/16 Slab=@1 (плита)
+@1 1/8 Slab=@1 (плита)
+@1 1/4 Slab=@1 (плита)
+@1 1/2 Slab=@1 (плита)
+@1 3/4 Slab=@1 (плита)
+@1 7/8 Slab=@1 (плита)
+@1 15/16 Slab=@1 (плита)
+@1 1/16 Slab Three Sides=@1 (плита)
+@1 1/16 Slab Three Sides U=@1 (плита)
+@1 1/16 Slab Two Sides=@1 (плита)
+
+#: shapes/slopes.lua
+@1 1/2 Slope=@1 (наклон)
+@1 1/2 Slope Raised=@1 (наклон)
 @1 Slope=@1 (наклон)
-@1 Panel=@1 (панель)
-@1 Stairs=@1 (лестница)
+@1 Slope Cut=@1 (наклон)
+@1 Slope Inner=@1 (наклон)
+@1 Slope Inner Cut=@1 (наклон)
+@1 Slope Inner Cut Half=@1 (наклон)
+@1 Slope Inner Cut Half Raised=@1 (наклон)
+@1 Slope Inner Half=@1 (наклон)
+@1 Slope Inner Half Raised=@1 (наклон)
+@1 Slope Outer=@1 (наклон)
+@1 Slope Outer Cut=@1 (наклон)
+@1 Slope Outer Cut Half=@1 (наклон)
+@1 Slope Outer Cut Half Raised=@1 (наклон)
+@1 Slope Outer Half=@1 (наклон)
+@1 Slope Outer Half Raised=@1 (наклон)
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=@1 (лестница)
+@1 1/16 Alt Stair=@1 (лестница)
+@1 1/8 Alt Stair=@1 (лестница)
+@1 1/4 Alt Stair=@1 (лестница)
+@1 1/2 Alt Stair=@1 (лестница)
+@1 Inner Stair=@1 (лестница)
+@1 Outer Stair=@1 (лестница)
+@1 Half Stair=@1 (лестница)
+@1 Right Half Stair=@1 (лестница)
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.template.tr b/stairsplus/locale/stairsplus.template.tr
index 68e8f09..c6690b8 100644
--- a/stairsplus/locale/stairsplus.template.tr
+++ b/stairsplus/locale/stairsplus.template.tr
@@ -3,13 +3,14 @@
 #: circular_saw.lua
 
 Circular Saw=
-Circular Saw is empty=
-Microblocks=
-Nodes=
+Empty=
 Input=
 Max=
+Microblocks=
+Nodes=
 (owned by @1)=
 Set=
+Working on @1=
 
 #: shapes/micros.lua
 @1 1/16 Microblock=
@@ -70,7 +71,6 @@ Set=
 @1 Half Stair=
 @1 Right Half Stair=
 
-
 # compat2/stairs.lua
 
 Inner @1=
diff --git a/stairsplus/locale/stairsplus.zh_CN.tr b/stairsplus/locale/stairsplus.zh_CN.tr
index 5cceb00..493a702 100644
--- a/stairsplus/locale/stairsplus.zh_CN.tr
+++ b/stairsplus/locale/stairsplus.zh_CN.tr
@@ -1,32 +1,77 @@
 # textdomain: stairsplus
 
-# zh_CN translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# IFRFSX <IFRFSX@protonmail.com>, 2020.
-
 #: circular_saw.lua
 
 Circular Saw=圆锯
-Input material=输入@n材料
-Left-over=剩余材料
+Empty=是空的
+Input=输入
 Max=最大值
-Recycle output=回收@n输出物
+Microblocks=@1小方块
+Nodes=
+(owned by @1)=属于@1所有
 Set=设置
-owned by @1=属于@1所有
-Circular Saw is empty=圆锯是空的
-Circular Saw is working on @1=圆锯正在加工@1
-
-#: stairsplus/common.lua
+Working on @1=正在加工@1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=@1小方块
+@1 1/8 Microblock=@1小方块
+@1 1/4 Microblock=@1小方块
 @1 Microblock=@1小方块
-@1 Slab=@1台阶
+@1 3/4 Microblock=@1小方块
+@1 7/8 Microblock=@1小方块
+@1 15/16 Microblock=@1小方块
+
+#: shapes/panels.lua
+@1 1/16 Panel=@1嵌板
+@1 1/8 Panel=@1嵌板
+@1 1/4 Panel=@1嵌板
+@1 1/2 Panel=@1嵌板
+@1 3/4 Panel=@1嵌板
+@1 7/8 Panel=@1嵌板
+@1 15/16 Panel=@1嵌板
+
+#: shapes/slabs.lua
+@1 1/16 Slab=@1台阶
+@1 1/8 Slab=@1台阶
+@1 1/4 Slab=@1台阶
+@1 1/2 Slab=@1台阶
+@1 3/4 Slab=@1台阶
+@1 7/8 Slab=@1台阶
+@1 15/16 Slab=@1台阶
+@1 1/16 Slab Three Sides=@1台阶
+@1 1/16 Slab Three Sides U=@1台阶
+@1 1/16 Slab Two Sides=@1台阶
+
+#: shapes/slopes.lua
+@1 1/2 Slope=@1斜坡
+@1 1/2 Slope Raised=@1斜坡
 @1 Slope=@1斜坡
-@1 Panel=@1嵌板
-@1 Stairs=@1楼梯
+@1 Slope Cut=@1斜坡
+@1 Slope Inner=@1斜坡
+@1 Slope Inner Cut=@1斜坡
+@1 Slope Inner Cut Half=@1斜坡
+@1 Slope Inner Cut Half Raised=@1斜坡
+@1 Slope Inner Half=@1斜坡
+@1 Slope Inner Half Raised=@1斜坡
+@1 Slope Outer=@1斜坡
+@1 Slope Outer Cut=@1斜坡
+@1 Slope Outer Cut Half=@1斜坡
+@1 Slope Outer Cut Half Raised=@1斜坡
+@1 Slope Outer Half=@1斜坡
+@1 Slope Outer Half Raised=@1斜坡
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=@1楼梯
+@1 1/16 Alt Stair=@1楼梯
+@1 1/8 Alt Stair=@1楼梯
+@1 1/4 Alt Stair=@1楼梯
+@1 1/2 Alt Stair=@1楼梯
+@1 Inner Stair=@1楼梯
+@1 Outer Stair=@1楼梯
+@1 Half Stair=@1楼梯
+@1 Right Half Stair=@1楼梯
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus/locale/stairsplus.zh_TW.tr b/stairsplus/locale/stairsplus.zh_TW.tr
index 824dc07..0210c96 100644
--- a/stairsplus/locale/stairsplus.zh_TW.tr
+++ b/stairsplus/locale/stairsplus.zh_TW.tr
@@ -1,32 +1,77 @@
 # textdomain: stairsplus
 
-# zh_TW translation for More Blocks.
-# Copyright © 2011-2020 Hugo Locurcio and contributors
-# This file is distributed under the same license as the More Blocks package.
-# IFRFSX <IFRFSX@protonmail.com>, 2020.
-
 #: circular_saw.lua
 
 Circular Saw=圓鋸
-Input material=輸入@n材料
-Left-over=剩餘材料
+Empty=是空的
+Input=輸入
 Max=最大值
-Recycle output=回收@n輸出物
+Microblocks=@1小方塊
+Nodes=
+(owned by @1)=屬於@1所有
 Set=設置
-owned by @1=屬於@1所有
-Circular Saw is empty=圓鋸是空的
-Circular Saw is working on @1=圓鋸正在加工@1
-
-#: stairsplus/common.lua
+Working on @1=正在加工@1
 
+#: shapes/micros.lua
+@1 1/16 Microblock=@1小方塊
+@1 1/8 Microblock=@1小方塊
+@1 1/4 Microblock=@1小方塊
 @1 Microblock=@1小方塊
-@1 Slab=@1臺階
+@1 3/4 Microblock=@1小方塊
+@1 7/8 Microblock=@1小方塊
+@1 15/16 Microblock=@1小方塊
+
+#: shapes/panels.lua
+@1 1/16 Panel=@1嵌板
+@1 1/8 Panel=@1嵌板
+@1 1/4 Panel=@1嵌板
+@1 1/2 Panel=@1嵌板
+@1 3/4 Panel=@1嵌板
+@1 7/8 Panel=@1嵌板
+@1 15/16 Panel=@1嵌板
+
+#: shapes/slabs.lua
+@1 1/16 Slab=@1臺階
+@1 1/8 Slab=@1臺階
+@1 1/4 Slab=@1臺階
+@1 1/2 Slab=@1臺階
+@1 3/4 Slab=@1臺階
+@1 7/8 Slab=@1臺階
+@1 15/16 Slab=@1臺階
+@1 1/16 Slab Three Sides=@1臺階
+@1 1/16 Slab Three Sides U=@1臺階
+@1 1/16 Slab Two Sides=@1臺階
+
+#: shapes/slopes.lua
+@1 1/2 Slope=@1斜坡
+@1 1/2 Slope Raised=@1斜坡
 @1 Slope=@1斜坡
-@1 Panel=@1嵌板
-@1 Stairs=@1樓梯
+@1 Slope Cut=@1斜坡
+@1 Slope Inner=@1斜坡
+@1 Slope Inner Cut=@1斜坡
+@1 Slope Inner Cut Half=@1斜坡
+@1 Slope Inner Cut Half Raised=@1斜坡
+@1 Slope Inner Half=@1斜坡
+@1 Slope Inner Half Raised=@1斜坡
+@1 Slope Outer=@1斜坡
+@1 Slope Outer Cut=@1斜坡
+@1 Slope Outer Cut Half=@1斜坡
+@1 Slope Outer Cut Half Raised=@1斜坡
+@1 Slope Outer Half=@1斜坡
+@1 Slope Outer Half Raised=@1斜坡
 
-#: stairsplus/registrations.lua
+#: shapes/stairs.lua
+@1 Stair=@1樓梯
+@1 1/16 Alt Stair=@1樓梯
+@1 1/8 Alt Stair=@1樓梯
+@1 1/4 Alt Stair=@1樓梯
+@1 1/2 Alt Stair=@1樓梯
+@1 Inner Stair=@1樓梯
+@1 Outer Stair=@1樓梯
+@1 Half Stair=@1樓梯
+@1 Right Half Stair=@1樓梯
 
-Concrete=
-Cement=
-Brass Block=
+# compat2/stairs.lua
+
+Inner @1=
+Outer @1=
diff --git a/stairsplus_legacy/wool.lua b/stairsplus_legacy/wool.lua
index a67c28e..90d5ef0 100644
--- a/stairsplus_legacy/wool.lua
+++ b/stairsplus_legacy/wool.lua
@@ -1,11 +1,9 @@
 local dyes = {"white", "grey", "black", "red", "yellow", "green", "cyan",
               "blue", "magenta", "orange", "violet", "brown", "pink",
               "dark_grey", "dark_green"}
-for _, name in pairs(dyes) do
-	local mod = "wool"
-	local nodename = mod .. ":" .. name
-	local ndef = table.copy(minetest.registered_nodes[nodename])
-	ndef.sunlight_propagates = true
 
-	stairsplus:register_all(mod, name, nodename, ndef)
+for _, name in ipairs(dyes) do
+	local node = ("wool:%s"):format(name)
+	stairsplus_legacy.register_legacy(node)
+	stairsplus.api.register_alias_all(("moreblocks:%s"):format(name), node)
 end