diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7709431bd..51af21b67 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Updated JEI, fixes crashes (way2muchnoise)
 - Fixed crash with Disk Manipulator (way2muchnoise)
 - Fixed autocrafting not giving back byproducts (raoulvdberge)
+- Detector amount text field doesn't autoselect anymore (raoulvdberge)
 
 ### 1.0.5
 - Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI (raoulvdberge)
diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java
index 532ceda5b..cb6b634f6 100755
--- a/src/main/java/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/refinedstorage/block/BlockDetector.java
@@ -17,7 +17,6 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileDetector;
 
-// @TODO: Fix detector model connectivity (also HITBOX)
 public class BlockDetector extends BlockNode {
     private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D);
 
diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java
index 6a2318841..9b4eefd44 100755
--- a/src/main/java/refinedstorage/gui/GuiDetector.java
+++ b/src/main/java/refinedstorage/gui/GuiDetector.java
@@ -33,8 +33,8 @@ public class GuiDetector extends GuiBase {
         AMOUNT.setEnableBackgroundDrawing(false);
         AMOUNT.setVisible(true);
         AMOUNT.setTextColor(16777215);
-        AMOUNT.setCanLoseFocus(false);
-        AMOUNT.setFocused(true);
+        AMOUNT.setCanLoseFocus(true);
+        AMOUNT.setFocused(false);
     }
 
     @Override
diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json
index 587bd4748..17a4dfe0f 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/detector.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json
@@ -2,8 +2,8 @@
   "forge_marker": 1,
   "defaults": {
     "textures": {
-      "particle": "refinedstorage:blocks/side_borderless",
-      "torch": "refinedstorage:blocks/wireless_transmitter_disconnected"
+      "particle": "refinedstorage:blocks/detector_top",
+      "torch": "refinedstorage:blocks/detector_side_off"
     },
     "model": "refinedstorage:detector"
   },
@@ -16,7 +16,7 @@
     "powered": {
       "true": {
         "textures": {
-          "torch": "refinedstorage:blocks/wireless_transmitter_connected"
+          "torch": "refinedstorage:blocks/detector_side_on"
         }
       },
       "false": {
diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json
index 20ee0a1b1..336ac0aba 100755
--- a/src/main/resources/assets/refinedstorage/models/block/detector.json
+++ b/src/main/resources/assets/refinedstorage/models/block/detector.json
@@ -1,10 +1,9 @@
 {
-  "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
+  "__comment": "Model made by CyanideX",
   "textures": {
-    "0": "refinedstorage:blocks/detector_side",
-    "1": "refinedstorage:blocks/detector_side",
-    "2": "refinedstorage:blocks/detector_top",
-    "3": "refinedstorage:blocks/detector_bottom"
+    "2": "refinedstorage:blocks/detector_side_off",
+    "3": "refinedstorage:blocks/detector_top",
+    "4": "refinedstorage:blocks/detector_bottom"
   },
   "elements": [
     {
@@ -16,63 +15,63 @@
       ],
       "to": [
         9.0,
-        15.0,
+        10.0,
         9.0
       ],
       "shade": false,
       "faces": {
         "north": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            1.0,
-            12.0,
+            7.0,
+            5.0,
+            9.0,
             11.0
           ]
         },
         "east": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            1.0,
-            12.0,
+            7.0,
+            5.0,
+            9.0,
             11.0
           ]
         },
         "south": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            1.0,
-            12.0,
+            7.0,
+            5.0,
+            9.0,
             11.0
           ]
         },
         "west": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            1.0,
-            12.0,
+            7.0,
+            5.0,
+            9.0,
             11.0
           ]
         },
         "up": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            1.0,
-            12.0,
-            3.0
+            7.0,
+            5.0,
+            9.0,
+            7.0
           ]
         },
         "down": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            10.0,
-            5.0,
-            12.0,
-            7.0
+            7.0,
+            7.0,
+            9.0,
+            9.0
           ]
         }
       }
@@ -86,26 +85,26 @@
       ],
       "to": [
         9.0,
-        16.0,
+        11.0,
         10.0
       ],
       "shade": false,
       "faces": {
         "east": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            9.0,
-            0.0,
-            13.0,
+            6.0,
+            4.0,
+            10.0,
             11.0
           ]
         },
         "west": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            9.0,
-            0.0,
-            13.0,
+            6.0,
+            4.0,
+            10.0,
             11.0
           ]
         }
@@ -120,26 +119,26 @@
       ],
       "to": [
         10.0,
-        16.0,
+        11.0,
         9.0
       ],
       "shade": false,
       "faces": {
         "north": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            9.0,
-            0.0,
-            13.0,
+            6.0,
+            4.0,
+            10.0,
             11.0
           ]
         },
         "south": {
-          "texture": "#0",
+          "texture": "#torch",
           "uv": [
-            9.0,
-            0.0,
-            13.0,
+            6.0,
+            4.0,
+            10.0,
             11.0
           ]
         }
@@ -159,7 +158,7 @@
       ],
       "faces": {
         "north": {
-          "texture": "#1",
+          "texture": "#2",
           "uv": [
             0.0,
             11.0,
@@ -168,7 +167,7 @@
           ]
         },
         "east": {
-          "texture": "#1",
+          "texture": "#2",
           "uv": [
             0.0,
             11.0,
@@ -177,7 +176,7 @@
           ]
         },
         "south": {
-          "texture": "#1",
+          "texture": "#2",
           "uv": [
             0.0,
             11.0,
@@ -186,7 +185,7 @@
           ]
         },
         "west": {
-          "texture": "#1",
+          "texture": "#2",
           "uv": [
             0.0,
             11.0,
@@ -195,7 +194,7 @@
           ]
         },
         "up": {
-          "texture": "#2",
+          "texture": "#3",
           "uv": [
             0.0,
             0.0,
@@ -204,7 +203,7 @@
           ]
         },
         "down": {
-          "texture": "#3",
+          "texture": "#4",
           "uv": [
             0.0,
             0.0,
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png
deleted file mode 100755
index 8795b0173..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png
new file mode 100755
index 000000000..71b27c2d3
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png
new file mode 100755
index 000000000..aa99a1721
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png differ