diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 58db8464..4d94f8f5 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -533,53 +533,53 @@ rotate:id=white_bed,data=0,rot=270
 customblock:id=oak_door,id=iron_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
 
 # Lever (on) (base, lever)
-modellist:id=lever,data=0,box=5/0/4:11/3/12:d/0/5/4/11/12:u/0/5/4/11/12:n/0/5/0/11/3:s/0/5/0/11/3:w/0/4/0/12/3:e/0/4/0/12/3,box=7/1/7:9/11/9/45/0/0/8/1/8:u/1/7/6/9/8:n/1/7/6/9/16:s/1/7/6/9/16:w/1/7/6/9/16:e/1/7/6/9/16
-patchblock:id=lever,data=2
-patchrotate:id=lever,data=0,roty=180
-patchblock:id=lever,data=4
-patchrotate:id=lever,data=0,roty=270
-patchblock:id=lever,data=6
-patchrotate:id=lever,data=0,roty=90
-patchblock:id=lever,data=8
-patchrotate:id=lever,data=0,rotx=90
-patchblock:id=lever,data=10
-patchrotate:id=lever,data=0,rotx=90,roty=180
-patchblock:id=lever,data=12
-patchrotate:id=lever,data=0,rotx=90,roty=270
-patchblock:id=lever,data=14
-patchrotate:id=lever,data=0,rotx=90,roty=90
-patchblock:id=lever,data=16
-patchrotate:id=lever,data=0,rotx=180
-patchblock:id=lever,data=18
-patchrotate:id=lever,data=0,rotx=180,roty=180
-patchblock:id=lever,data=20
-patchrotate:id=lever,data=0,rotx=180,roty=270
-patchblock:id=lever,data=22
-patchrotate:id=lever,data=0,rotx=180,roty=90
+modellist:id=lever,state=face:floor/facing:north/powered:true,box=5/0/4:11/3/12:d/0/5/4/11/12:u/0/5/4/11/12:n/0/5/0/11/3:s/0/5/0/11/3:w/0/4/0/12/3:e/0/4/0/12/3,box=7/1/7:9/11/9/-45/0/0/8/1/8:u/1/7/6/9/8:n/1/7/6/9/16:s/1/7/6/9/16:w/1/7/6/9/16:e/1/7/6/9/16
+patchblock:id=lever,state=face:floor/facing:south/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,roty=180
+patchblock:id=lever,state=face:floor/facing:west/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,roty=270
+patchblock:id=lever,state=face:floor/facing:east/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,roty=90
+patchblock:id=lever,state=face:wall/facing:north/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=90
+patchblock:id=lever,state=face:wall/facing:south/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=90,roty=180
+patchblock:id=lever,state=face:wall/facing:west/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=90,roty=270
+patchblock:id=lever,state=face:wall/facing:east/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=90,roty=90
+patchblock:id=lever,state=face:ceiling/facing:north/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=180
+patchblock:id=lever,state=face:ceiling/facing:south/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=180,roty=180
+patchblock:id=lever,state=face:ceiling/facing:west/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=180,roty=270
+patchblock:id=lever,state=face:ceiling/facing:east/powered:true
+patchrotate:id=lever,state=face:floor/facing:north/powered:true,rotx=180,roty=90
 # Lever (off) (base, lever)
-modellist:id=lever,data=1,box=5/0/4:11/3/12:d/0/5/4/11/12:u/0/5/4/11/12:n/0/5/0/11/3:s/0/5/0/11/3:w/0/4/0/12/3:e/0/4/0/12/3,box=7/1/7:9/11/9/-45/0/0/8/1/8:u/1/7/6/9/8:n/1/7/6/9/16:s/1/7/6/9/16:w/1/7/6/9/16:e/1/7/6/9/16
-patchblock:id=lever,data=3
-patchrotate:id=lever,data=1,roty=180
-patchblock:id=lever,data=5
-patchrotate:id=lever,data=1,roty=270
-patchblock:id=lever,data=7
-patchrotate:id=lever,data=1,roty=90
-patchblock:id=lever,data=9
-patchrotate:id=lever,data=1,rotx=90
-patchblock:id=lever,data=11
-patchrotate:id=lever,data=1,rotx=90,roty=180
-patchblock:id=lever,data=13
-patchrotate:id=lever,data=1,rotx=90,roty=270
-patchblock:id=lever,data=15
-patchrotate:id=lever,data=1,rotx=90,roty=90
-patchblock:id=lever,data=17
-patchrotate:id=lever,data=1,rotx=180
-patchblock:id=lever,data=19
-patchrotate:id=lever,data=1,rotx=180,roty=180
-patchblock:id=lever,data=21
-patchrotate:id=lever,data=1,rotx=180,roty=270
-patchblock:id=lever,data=23
-patchrotate:id=lever,data=1,rotx=180,roty=90
+modellist:id=lever,state=face:floor/facing:north/powered:false,box=5/0/4:11/3/12:d/0/5/4/11/12:u/0/5/4/11/12:n/0/5/0/11/3:s/0/5/0/11/3:w/0/4/0/12/3:e/0/4/0/12/3,box=7/1/7:9/11/9/45/0/0/8/1/8:u/1/7/6/9/8:n/1/7/6/9/16:s/1/7/6/9/16:w/1/7/6/9/16:e/1/7/6/9/16
+patchblock:id=lever,state=face:floor/facing:south/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,roty=180
+patchblock:id=lever,state=face:floor/facing:west/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,roty=270
+patchblock:id=lever,state=face:floor/facing:east/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,roty=90
+patchblock:id=lever,state=face:wall/facing:north/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=90
+patchblock:id=lever,state=face:wall/facing:south/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=90,roty=180
+patchblock:id=lever,state=face:wall/facing:west/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=90,roty=270
+patchblock:id=lever,state=face:wall/facing:east/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=90,roty=90
+patchblock:id=lever,state=face:ceiling/facing:north/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=180
+patchblock:id=lever,state=face:ceiling/facing:south/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=180,roty=180
+patchblock:id=lever,state=face:ceiling/facing:west/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=180,roty=270
+patchblock:id=lever,state=face:ceiling/facing:east/powered:false
+patchrotate:id=lever,state=face:floor/facing:north/powered:false,rotx=180,roty=90
 
 # Cactus
 patchblock:id=cactus,patch0=VertX00625,patch1=VertX00625@90,patch2=VertX00625@180,patch3=VertX00625@270,patch4=HorizY100ZTop,patch5=HorizY100ZTop@180/0/0