diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml
index cef8eb0..12330ee 100644
--- a/Multiverse-Core/worlds.yml
+++ b/Multiverse-Core/worlds.yml
@@ -1,51 +1,4 @@
 worlds:
-  world:
-    ==: MVWorld
-    hidden: 'false'
-    alias: world
-    color: WHITE
-    style: NORMAL
-    pvp: 'true'
-    scale: '1.0'
-    respawnWorld: worldhub
-    allowWeather: 'true'
-    difficulty: HARD
-    spawning:
-      ==: MVSpawnSettings
-      animals:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-      monsters:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-    entryfee:
-      ==: MVEntryFee
-      amount: '0.0'
-    hunger: 'true'
-    autoHeal: 'true'
-    adjustSpawn: 'true'
-    portalForm: ALL
-    gameMode: SURVIVAL
-    keepSpawnInMemory: 'false'
-    spawnLocation:
-      ==: MVSpawnLocation
-      x: -32270.5
-      y: 67.0
-      z: -8198.5
-      pitch: 20.6998
-      yaw: -1.3500259
-    autoLoad: 'true'
-    bedRespawn: 'true'
-    worldBlacklist: []
-    environment: NORMAL
-    seed: '1923020019'
-    generator: 'null'
-    playerLimit: '-1'
-    allowFlight: 'true'
   world_the_end:
     ==: MVWorld
     hidden: 'false'
@@ -93,6 +46,53 @@ worlds:
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
+  world:
+    ==: MVWorld
+    hidden: 'false'
+    alias: world
+    color: WHITE
+    style: NORMAL
+    pvp: 'true'
+    scale: '1.0'
+    respawnWorld: worldhub
+    allowWeather: 'true'
+    difficulty: HARD
+    spawning:
+      ==: MVSpawnSettings
+      animals:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+      monsters:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+    entryfee:
+      ==: MVEntryFee
+      amount: '0.0'
+    hunger: 'true'
+    autoHeal: 'true'
+    adjustSpawn: 'true'
+    portalForm: ALL
+    gameMode: SURVIVAL
+    keepSpawnInMemory: 'false'
+    spawnLocation:
+      ==: MVSpawnLocation
+      x: -32270.5
+      y: 67.0
+      z: -8198.5
+      pitch: 20.6998
+      yaw: -1.3500259
+    autoLoad: 'true'
+    bedRespawn: 'true'
+    worldBlacklist: []
+    environment: NORMAL
+    seed: '1923020019'
+    generator: 'null'
+    playerLimit: '-1'
+    allowFlight: 'true'
   world_nether:
     ==: MVWorld
     hidden: 'false'
@@ -187,16 +187,16 @@ worlds:
     generator: PlotSquared
     playerLimit: '-1'
     allowFlight: 'true'
-  flatworld:
+  worldhub:
     ==: MVWorld
     hidden: 'false'
-    alias: flatworld
+    alias: worldhub
     color: WHITE
     style: NORMAL
     pvp: 'true'
     scale: '1.0'
     respawnWorld: ''
-    allowWeather: 'true'
+    allowWeather: 'false'
     difficulty: HARD
     spawning:
       ==: MVSpawnSettings
@@ -207,7 +207,7 @@ worlds:
         exceptions: []
       monsters:
         ==: MVSpawnSubSettings
-        spawn: 'true'
+        spawn: 'false'
         spawnrate: '-1'
         exceptions: []
     entryfee:
@@ -217,20 +217,20 @@ worlds:
     autoHeal: 'true'
     adjustSpawn: 'true'
     portalForm: ALL
-    gameMode: SURVIVAL
+    gameMode: ADVENTURE
     keepSpawnInMemory: 'false'
     spawnLocation:
       ==: MVSpawnLocation
-      x: -256.0
+      x: 162.5
       y: 4.0
-      z: -96.0
+      z: -95.5
       pitch: 0.0
       yaw: 0.0
     autoLoad: 'true'
     bedRespawn: 'true'
     worldBlacklist: []
     environment: NORMAL
-    seed: '4622440486943241231'
+    seed: '-5692829584426207714'
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
@@ -281,16 +281,16 @@ worlds:
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
-  worldhub:
+  flatworld:
     ==: MVWorld
     hidden: 'false'
-    alias: worldhub
+    alias: flatworld
     color: WHITE
     style: NORMAL
     pvp: 'true'
     scale: '1.0'
     respawnWorld: ''
-    allowWeather: 'false'
+    allowWeather: 'true'
     difficulty: HARD
     spawning:
       ==: MVSpawnSettings
@@ -301,7 +301,7 @@ worlds:
         exceptions: []
       monsters:
         ==: MVSpawnSubSettings
-        spawn: 'false'
+        spawn: 'true'
         spawnrate: '-1'
         exceptions: []
     entryfee:
@@ -311,20 +311,20 @@ worlds:
     autoHeal: 'true'
     adjustSpawn: 'true'
     portalForm: ALL
-    gameMode: ADVENTURE
+    gameMode: SURVIVAL
     keepSpawnInMemory: 'false'
     spawnLocation:
       ==: MVSpawnLocation
-      x: 162.5
+      x: -256.0
       y: 4.0
-      z: -95.5
+      z: -96.0
       pitch: 0.0
       yaw: 0.0
     autoLoad: 'true'
     bedRespawn: 'true'
     worldBlacklist: []
     environment: NORMAL
-    seed: '-5692829584426207714'
+    seed: '4622440486943241231'
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
diff --git a/PlotSquared/user_cache.db b/PlotSquared/user_cache.db
deleted file mode 100644
index f8c6332..0000000
Binary files a/PlotSquared/user_cache.db and /dev/null differ
diff --git a/Server/server.properties b/Server/server.properties
index 0433cda..49f509a 100644
--- a/Server/server.properties
+++ b/Server/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sun Jul 26 12:01:28 UTC 2020
+#Tue Jul 28 13:02:45 UTC 2020
 spawn-protection=16
 max-tick-time=60000
 query.port=25565
@@ -41,11 +41,11 @@ spawn-animals=true
 white-list=false
 rcon.password=
 generate-structures=true
-online-mode=false
 max-build-height=256
+online-mode=false
 level-seed=1923020019
-prevent-proxy-connections=false
 use-native-transport=true
+prevent-proxy-connections=false
 enable-jmx-monitoring=false
-motd=Chromacraft v5
 enable-rcon=false
+motd=Chromacraft v5
diff --git a/update.sh b/update.sh
index fd798a1..0a1109f 100755
--- a/update.sh
+++ b/update.sh
@@ -12,12 +12,12 @@ git add -f 'dynmap/configuration.txt' 'dynmap/worlds.txt' 'dynmap/templates/cust
 git add -f 'MythicMobs/*' ':!:MythicMobs/SavedData/*'
 git add -f ':(glob)Jobs/*.yml' ':!:Jobs/furnaceBrewingStands.yml'
 git add -f 'Towny/settings/*' ':!:Towny/settings/*.rej' ':!:Towny/settings/english.yml'
-git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' ':!:PlotSquared/translations*'
+git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' ':!:PlotSquared/translations*' ':!:PlotSquared/user_cache.db'
 #git add -f 'PermissionsEx/permissions.yml'
 git add -f 'Multiverse-Core/worlds.yml'
 git add -f 'ServerRunner/config.yml' # Not a plugin
 git add -f 'DungeonsXL/dungeons' 'DungeonsXL/scripts'
-git add -f ':(glob)TerrainControl/*' 'TerrainControl/worlds/world/*'
+#git add -f ':(glob)TerrainControl/*' 'TerrainControl/worlds/world/*'
 git add -f 'Server/*' # Files are hardlinked from one above
 git add -f 'Factions/config'