diff --git a/lib/ocelot-brain b/lib/ocelot-brain
index 45996d6..ed36db5 160000
--- a/lib/ocelot-brain
+++ b/lib/ocelot-brain
@@ -1 +1 @@
-Subproject commit 45996d6f93e6834b03662d1b204ff95b03f6648f
+Subproject commit ed36db5c0f81095f22e09d9f2b84df3ac0ce3449
diff --git a/spritepack.bat b/spritepack.bat
index ca4f7e2..13a81cc 100644
--- a/spritepack.bat
+++ b/spritepack.bat
@@ -1,2 +1,3 @@
-spritepack -s 512x512 -o ./src/main/resources/ocelot/desktop/images/spritesheet -n spritesheet ./sprites/
+:: keep .exe after 'spritepack' otherwise the batch script will call itself in loop
+spritepack.exe -s 512x512 -o ./src/main/resources/ocelot/desktop/images/spritesheet -n spritesheet ./sprites/
 pause
diff --git a/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.png b/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.png
index 0c9412f..811b5fa 100644
Binary files a/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.png and b/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.png differ
diff --git a/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.txt b/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.txt
index 76434a7..4bba6b9 100644
--- a/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.txt
+++ b/src/main/resources/ocelot/desktop/images/spritesheet/spritesheet.txt
@@ -37,12 +37,12 @@ icons\SettingsUI 13 322 12 17
 icons\Tier0 458 251 16 16
 icons\Tier1 475 251 16 16
 icons\Tier2 492 251 16 16
-icons\WaveLFSR 36 305 24 10
-icons\WaveNoise 61 305 24 10
-icons\WaveSawtooth 86 305 24 10
-icons\WaveSine 111 305 24 10
-icons\WaveSquare 136 305 24 10
-icons\WaveTriangle 161 305 24 10
+icons\WaveLFSR 53 305 24 10
+icons\WaveNoise 78 305 24 10
+icons\WaveSawtooth 103 305 24 10
+icons\WaveSine 128 305 24 10
+icons\WaveSquare 153 305 24 10
+icons\WaveTriangle 178 305 24 10
 icons\WireArrowLeft 2 394 4 8
 icons\WireArrowRight 7 394 4 8
 items\APU0 373 122 16 96
@@ -103,7 +103,7 @@ items\Server3 424 105 16 16
 items\SoundCard 356 122 16 128
 items\WirelessNetworkCard0 441 105 16 16
 items\WirelessNetworkCard1 458 105 16 16
-light-panel\BookmarkLeft 17 305 18 14
+light-panel\BookmarkLeft 34 305 18 14
 light-panel\BookmarkRight 391 219 20 14
 light-panel\BorderB 8 403 4 4
 light-panel\BorderL 98 403 4 2
@@ -116,19 +116,20 @@ light-panel\CornerTR 38 403 4 4
 light-panel\Fill 6 414 2 2
 light-panel\Vent 0 355 2 38
 nodes\Cable 3 366 8 8
-nodes\Computer 475 105 16 16
-nodes\ComputerActivityOverlay 492 105 16 16
-nodes\ComputerErrorOverlay 487 0 16 16
-nodes\ComputerOnOverlay 487 17 16 16
-nodes\DiskDrive 487 34 16 16
-nodes\DiskDriveActivity 385 51 16 16
-nodes\DiskDriveFloppy 402 51 16 16
-nodes\IronNoteBlock 419 51 16 16
-nodes\NewNode 436 51 16 16
-nodes\NoteBlock 453 51 16 16
-nodes\Relay 470 51 16 16
-nodes\Screen 487 51 16 16
-nodes\ScreenOnOverlay 0 305 16 16
+nodes\Camera 475 105 16 16
+nodes\Computer 492 105 16 16
+nodes\ComputerActivityOverlay 487 0 16 16
+nodes\ComputerErrorOverlay 487 17 16 16
+nodes\ComputerOnOverlay 487 34 16 16
+nodes\DiskDrive 385 51 16 16
+nodes\DiskDriveActivity 402 51 16 16
+nodes\DiskDriveFloppy 419 51 16 16
+nodes\IronNoteBlock 436 51 16 16
+nodes\NewNode 453 51 16 16
+nodes\NoteBlock 470 51 16 16
+nodes\Relay 487 51 16 16
+nodes\Screen 0 305 16 16
+nodes\ScreenOnOverlay 17 305 16 16
 panel\BorderB 43 403 4 4
 panel\BorderL 103 403 4 2
 panel\BorderR 48 403 4 4
diff --git a/src/main/scala/ocelot/desktop/node/NodeRegistry.scala b/src/main/scala/ocelot/desktop/node/NodeRegistry.scala
index eb4d2e9..114d4a1 100644
--- a/src/main/scala/ocelot/desktop/node/NodeRegistry.scala
+++ b/src/main/scala/ocelot/desktop/node/NodeRegistry.scala
@@ -1,7 +1,7 @@
 package ocelot.desktop.node
 
 import ocelot.desktop.node.nodes._
-import totoro.ocelot.brain.entity.{Cable, Case, FloppyDiskDrive, IronNoteBlock, NoteBlock, Relay, Screen}
+import totoro.ocelot.brain.entity.{Cable, Camera, Case, FloppyDiskDrive, IronNoteBlock, NoteBlock, Relay, Screen}
 
 import scala.collection.mutable
 
@@ -43,4 +43,8 @@ object NodeRegistry {
   register(NodeType("IronNoteBlock", "nodes/IronNoteBlock", -1, () => {
     new IronNoteBlockNode(new IronNoteBlock)
   }))
+
+  register(NodeType("Camera", "nodes/Camera", -1, () => {
+    new CameraNode(new Camera)
+  }))
 }
diff --git a/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala b/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
index bdfbefa..7c3dade 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
@@ -1,5 +1,8 @@
 package ocelot.desktop.node.nodes
 
-class CameraNode {
+import ocelot.desktop.node.Node
+import totoro.ocelot.brain.entity.Camera
 
+class CameraNode(val camera: Camera) extends Node(camera) {
+  override def icon: String = "nodes/Camera"
 }