diff --git a/README.md b/README.md
index b04f5e5..c18a91e 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ This is the unfinished port of the WebDisplays mod for Minecraft 1.12.2. The tex
 * French translations
 * Embedded videos sound/distance
 * minePad management: check GuiContainer.draggedStack for minePad
+* Enhance crafts
+* Enhance models
 
 ### Config elements
 * Site blacklist
diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java
index 5f85b56..3c6d319 100644
--- a/src/main/java/net/montoyo/wd/client/ClientProxy.java
+++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java
@@ -253,8 +253,8 @@ public class ClientProxy extends SharedProxy implements IResourceManagerReloadLi
         registerItemModel(wd.blockScreen.getItem(), 0, "inventory");
         ModelLoader.setCustomModelResourceLocation(wd.blockPeripheral.getItem(), 0, new ModelResourceLocation("webdisplays:kb_inv", "normal"));
         registerItemModel(wd.blockPeripheral.getItem(), 1, "facing=0,type=remotectrl");
-        registerItemModel(wd.blockPeripheral.getItem(), 2, "facing=0,type=ccinterface"); //TODO: This doesn't work...
-        registerItemModel(wd.blockPeripheral.getItem(), 3, "facing=0,type=cointerface");
+        registerItemModel(wd.blockPeripheral.getItem(), 2, "facing=2,type=ccinterface");
+        registerItemModel(wd.blockPeripheral.getItem(), 3, "facing=2,type=cointerface");
         registerItemModel(wd.itemScreenCfg, 0, "normal");
         registerItemModel(wd.itemOwnerThief, 0, "normal");
         registerItemModel(wd.itemLinker, 0, "normal");
diff --git a/src/main/resources/assets/webdisplays/blockstates/peripheral.json b/src/main/resources/assets/webdisplays/blockstates/peripheral.json
index e9cdccf..5b2f9a1 100644
--- a/src/main/resources/assets/webdisplays/blockstates/peripheral.json
+++ b/src/main/resources/assets/webdisplays/blockstates/peripheral.json
@@ -1,23 +1,23 @@
 {
-	"variants": {
-        "facing=0,type=keyboard": { "model": "webdisplays:kb_left"             },
-        "facing=1,type=keyboard": { "model": "webdisplays:kb_left", "y": 90.0  },
-        "facing=2,type=keyboard": { "model": "webdisplays:kb_left", "y": 180.0 },
-        "facing=3,type=keyboard": { "model": "webdisplays:kb_left", "y": 270.0 },
+  "variants": {
+    "facing=0,type=keyboard": { "model": "webdisplays:kb_left"             },
+    "facing=1,type=keyboard": { "model": "webdisplays:kb_left", "y": 90.0  },
+    "facing=2,type=keyboard": { "model": "webdisplays:kb_left", "y": 180.0 },
+    "facing=3,type=keyboard": { "model": "webdisplays:kb_left", "y": 270.0 },
 
-        "facing=0,type=remotectrl": { "model": "webdisplays:peripheral" },
-        "facing=1,type=remotectrl": { "model": "webdisplays:peripheral" },
-        "facing=2,type=remotectrl": { "model": "webdisplays:peripheral" },
-        "facing=3,type=remotectrl": { "model": "webdisplays:peripheral" },
+    "facing=0,type=remotectrl": { "model": "webdisplays:rctrl" },
+    "facing=1,type=remotectrl": { "model": "webdisplays:rctrl" },
+    "facing=2,type=remotectrl": { "model": "webdisplays:rctrl" },
+    "facing=3,type=remotectrl": { "model": "webdisplays:rctrl" },
 
-        "facing=0,type=ccinterface": { "model": "webdisplays:peripheral" },
-        "facing=1,type=ccinterface": { "model": "webdisplays:peripheral" },
-        "facing=2,type=ccinterface": { "model": "webdisplays:peripheral" },
-        "facing=3,type=ccinterface": { "model": "webdisplays:peripheral" },
+    "facing=0,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 180.0 },
+    "facing=1,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 270.0 },
+    "facing=2,type=ccinterface": { "model": "webdisplays:ccinterface"             },
+    "facing=3,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 90.0  },
 
-        "facing=0,type=cointerface": { "model": "webdisplays:peripheral" },
-        "facing=1,type=cointerface": { "model": "webdisplays:peripheral" },
-        "facing=2,type=cointerface": { "model": "webdisplays:peripheral" },
-        "facing=3,type=cointerface": { "model": "webdisplays:peripheral" }
-    }
+    "facing=0,type=cointerface": { "model": "webdisplays:ocinterface", "y": 180.0 },
+    "facing=1,type=cointerface": { "model": "webdisplays:ocinterface", "y": 270.0 },
+    "facing=2,type=cointerface": { "model": "webdisplays:ocinterface"             },
+    "facing=3,type=cointerface": { "model": "webdisplays:ocinterface", "y": 90.0  }
+  }
 }
diff --git a/src/main/resources/assets/webdisplays/models/block/ccinterface.json b/src/main/resources/assets/webdisplays/models/block/ccinterface.json
new file mode 100644
index 0000000..643ca5b
--- /dev/null
+++ b/src/main/resources/assets/webdisplays/models/block/ccinterface.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/orientable",
+  "textures": {
+    "top": "webdisplays:blocks/cci_topbot",
+    "front": "webdisplays:blocks/cci_front",
+    "side": "webdisplays:blocks/cci_side"
+  }
+}
diff --git a/src/main/resources/assets/webdisplays/models/block/ocinterface.json b/src/main/resources/assets/webdisplays/models/block/ocinterface.json
new file mode 100644
index 0000000..0cdb319
--- /dev/null
+++ b/src/main/resources/assets/webdisplays/models/block/ocinterface.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/orientable",
+  "textures": {
+    "top": "webdisplays:blocks/oci_topbot",
+    "front": "webdisplays:blocks/oci_front",
+    "side": "webdisplays:blocks/oci_side"
+  }
+}
diff --git a/src/main/resources/assets/webdisplays/models/block/peripheral.json b/src/main/resources/assets/webdisplays/models/block/rctrl.json
similarity index 100%
rename from src/main/resources/assets/webdisplays/models/block/peripheral.json
rename to src/main/resources/assets/webdisplays/models/block/rctrl.json
diff --git a/src/main/resources/assets/webdisplays/recipes/ccinterface.json b/src/main/resources/assets/webdisplays/recipes/ccinterface.json
new file mode 100644
index 0000000..3916e35
--- /dev/null
+++ b/src/main/resources/assets/webdisplays/recipes/ccinterface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "CCC",
+    "CSC",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "minecraft:dye",
+      "data": 6
+    },
+    "S": {
+      "item": "webdisplays:screen"
+    }
+  },
+  "result": {
+    "item": "webdisplays:peripheral",
+    "data": 2
+  }
+}
diff --git a/src/main/resources/assets/webdisplays/recipes/ocinterface.json b/src/main/resources/assets/webdisplays/recipes/ocinterface.json
new file mode 100644
index 0000000..8d3d264
--- /dev/null
+++ b/src/main/resources/assets/webdisplays/recipes/ocinterface.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "GGG",
+    "GSG",
+    "GGG"
+  ],
+  "key": {
+    "G": {
+      "item": "minecraft:dye",
+      "data": 8
+    },
+    "S": {
+      "item": "webdisplays:screen"
+    }
+  },
+  "result": {
+    "item": "webdisplays:peripheral",
+    "data": 3
+  }
+}
diff --git a/src/main/resources/assets/webdisplays/recipes/rctrl.json b/src/main/resources/assets/webdisplays/recipes/rctrl.json
new file mode 100644
index 0000000..10d9346
--- /dev/null
+++ b/src/main/resources/assets/webdisplays/recipes/rctrl.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " E ",
+    "BBB"
+  ],
+  "key": {
+    "E": {
+      "item": "minecraft:ender_pearl"
+    },
+    "B": {
+      "item": "minecraft:wooden_button"
+    }
+  },
+  "result": {
+    "item": "webdisplays:peripheral",
+    "data": 1
+  }
+}
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png b/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png
new file mode 100644
index 0000000..c61e5cc
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_side.png b/src/main/resources/assets/webdisplays/textures/blocks/cci_side.png
new file mode 100644
index 0000000..6ad8514
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/cci_side.png differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png b/src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png
new file mode 100644
index 0000000..91b3736
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/interface.png b/src/main/resources/assets/webdisplays/textures/blocks/interface.png
deleted file mode 100644
index 470f364..0000000
Binary files a/src/main/resources/assets/webdisplays/textures/blocks/interface.png and /dev/null differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png b/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png
new file mode 100644
index 0000000..52a1737
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_side.png b/src/main/resources/assets/webdisplays/textures/blocks/oci_side.png
new file mode 100644
index 0000000..5671faf
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/oci_side.png differ
diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png b/src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png
new file mode 100644
index 0000000..0b0aac0
Binary files /dev/null and b/src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png differ