diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 8013ecc3..d26dbae5 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -763,72 +763,24 @@ layer:4,5,6,7
 *------*
 *------*
 ********
-# Air portal
-block:id=end_portal,scale=8
-layer:6
-********
-********
-********
-********
-********
-********
-********
-********
-# Air portal frame (no eye)
-block:id=end_portal_frame,data=0,data=1,data=2,data=3,scale=16
-layer:0,1,2,3,4,5,6,7,8,9,10,11,12
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-# Air portal fram (eye)
-block:id=end_portal_frame,data=4,data=5,data=6,data=7,scale=16
-layer:0,1,2,3,4,5,6,7,8,9,10,11,12
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-layer:13,14
-----------------
-----------------
-----------------
-----------------
-----********----
-----********----
-----********----
-----********----
-----********----
-----********----
-----********----
-----********----
-----------------
-----------------
-----------------
-----------------
+# End portal
+boxlist:id=end_portal,box=0:1:0:0.75:0:1:0/0/-1/-1/-1/-1
+# End portal frame (eye)
+boxlist:id=end_portal_frame,data=1,box=0:1:0:0.8125:0:1:0/1/2/2/2/2,box=0.25:0.75:0.8125:1:0.25:0.75:3/3/3/3/3/3
+patchblock:id=end_portal_frame,data=0
+patchrotate:id=end_portal_frame,data=1,roty=180
+patchblock:id=end_portal_frame,data=2
+patchrotate:id=end_portal_frame,data=1,roty=90
+patchblock:id=end_portal_frame,data=3
+patchrotate:id=end_portal_frame,data=1,roty=270
+# End portal frame (no eye)
+boxlist:id=end_portal_frame,data=5,box=0:1:0:0.8125:0:1:0/1/2/2/2/2
+patchblock:id=end_portal_frame,data=4
+patchrotate:id=end_portal_frame,data=5,roty=180
+patchblock:id=end_portal_frame,data=6
+patchrotate:id=end_portal_frame,data=5,roty=90
+patchblock:id=end_portal_frame,data=7
+patchrotate:id=end_portal_frame,data=5,roty=270
 # Dragon Egg
 block:id=dragon_egg,scale=8
 layer:0,7
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index 10c17683..eaf4d545 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -1152,11 +1152,9 @@ block:id=brewing_stand,patch0=0:brewing_stand_base,patch1-7=0:brewing_stand,tran
 # Cauldron
 block:id=cauldron,data=*,top=0:cauldron_top,bottom=0:cauldron_bottom,allsides=0:cauldron_side,stdrot=true,transparency=TRANSPARENT
 # End portal
-block:id=end_portal,data=*,topbottom=0:endportal,stdrot=true
-# End portal frame (no eye)
-block:id=end_portal_frame,data=0,data=1,data=2,data=3,top=0:end_portal_frame_top,allsides=0:end_portal_frame_side,bottom=0:end_stone,stdrot=true
-# End portal fram (eye installed) (TODO: eye installed)
-block:id=end_portal_frame,data=4,data=5,data=6,data=7,top=0:end_portal_frame_eye,allsides=0:end_portal_frame_side,bottom=0:end_stone,stdrot=true
+block:id=end_portal,data=*,patch0=0:endportal,stdrot=true
+# End portal frame
+block:id=end_portal_frame,data=*,patch0=0:end_stone,patch1=0:end_portal_frame_top,patch2=0:end_portal_frame_side,patch3=0:end_portal_frame_eye
 # End stone
 block:id=end_stone,allfaces=0:end_stone,stdrot=true
 # Dragon Egg