diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png
new file mode 100644
index 00000000..298cdf95
Binary files /dev/null and b/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png differ
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_nether.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png
new file mode 100644
index 00000000..574d213b
Binary files /dev/null and b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png differ
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_the_end.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_biome.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_biome.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_cave.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_cave.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_flat.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_surface.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_surface.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/js/map.js b/DynmapCore/src/main/resources/extracted/web/js/map.js
index 9d8ca201..d8b97938 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/map.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/map.js
@@ -278,12 +278,17 @@ DynMap.prototype = {
 					worldsadded[wname] = true;
 				}
 
+				var worldName = wname;
+				if(wname.startsWith('world_')) {
+					worldName = wname.substring(6);
+				}
+
 				map.element = $('<li/>')
 					.addClass('map item')
 					.append($('<a/>')
 							.attr({ title: map.options.title, href: '#' })
 							.addClass('maptype')
-							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + mapindex + '.png')) + ')' })
+							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + worldName + '_' + mapindex + '.png')) + ')' })
 							.text(map.options.title)
 					)
 					.click(function() {
diff --git a/DynmapCore/src/main/resources/worlds.txt b/DynmapCore/src/main/resources/worlds.txt
index ddd3c124..bf5ad70d 100644
--- a/DynmapCore/src/main/resources/worlds.txt
+++ b/DynmapCore/src/main/resources/worlds.txt
@@ -115,9 +115,9 @@ worlds:
   #      background: "#300806"
   #      mapzoomin: 1
   #    - class: org.dynmap.hdmap.HDMap
-  #      name: nether
+  #      name: surface
   #      title: "Surface"
-  #      prefix: nt
+  #      prefix: surface
   #      perspective: iso_SE_30_hires
   #      shader: stdtexture
   #      lighting: nethershadows
diff --git a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
index 240fb2f6..cef1e9b4 100644
--- a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
+++ b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
@@ -1288,7 +1288,7 @@ public class DynmapPlugin
         public void sendMessage(String msg)
         {
             ITextComponent ichatcomponent = new StringTextComponent(msg);
-            server.getPlayerList().func_232641_a_(ichatcomponent, ChatType.CHAT, player.getUniqueID());
+            player.sendMessage(ichatcomponent, Util.field_240973_b_);
         }
         @Override
         public boolean isInvisible() {
diff --git a/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapPlugin.java b/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapPlugin.java
index 3b361c21..d5afe09c 100644
--- a/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapPlugin.java
+++ b/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapPlugin.java
@@ -1298,7 +1298,7 @@ public class DynmapPlugin
         public void sendMessage(String msg)
         {
             ITextComponent ichatcomponent = new StringTextComponent(msg);
-            server.getPlayerList().func_232641_a_(ichatcomponent, ChatType.CHAT, player.getUniqueID());
+            player.sendMessage(ichatcomponent, Util.field_240973_b_);
         }
         @Override
         public boolean isInvisible() {