diff --git a/commands.yml b/commands.yml
index db64e44..60b087e 100644
--- a/commands.yml
+++ b/commands.yml
@@ -33,10 +33,6 @@ aliases:
   - minecraft:kill $1-
   list:
   - minecraft:list $1-
-  minecraft:locate:
-  - []
-  locate:
-  - []
   me:
   - minecraft:me $1-
   msg:
diff --git a/paper.yml b/paper.yml
index abb5c4e..3145615 100644
--- a/paper.yml
+++ b/paper.yml
@@ -11,48 +11,7 @@
 # Docs: https://paper.readthedocs.org/ 
 
 verbose: false
-config-version: 18
-settings:
-  sleep-between-chunk-saves: false
-  queue-light-updates-max-loss: 10
-  player-auto-save-rate: -1
-  max-player-auto-save-per-tick: -1
-  load-permissions-yml-before-plugins: true
-  bungee-online-mode: true
-  save-player-data: true
-  region-file-cache-size: 256
-  incoming-packet-spam-threshold: 300
-  use-alternative-luck-formula: false
-  use-versioned-world: false
-  suggest-player-names-when-null-tab-completions: true
-  enable-player-collisions: true
-  save-empty-scoreboard-teams: false
-  velocity-support:
-    enabled: false
-    online-mode: false
-    secret: ''
-  watchdog:
-    early-warning-every: 15000
-    early-warning-delay: 20000
-  spam-limiter:
-    tab-spam-increment: 1
-    tab-spam-limit: 500
-  book-size:
-    page-max: 2560
-    total-multiplier: 0.98
-  async-chunks:
-    enable: true
-    generation: true
-    thread-per-world-generation: true
-    load-threads: -1
-messages:
-  no-permission: '&cI''m sorry, but you do not have permission to perform this command.
-    Please contact the server administrators if you believe that this is in error.'
-  kick:
-    authentication-servers-down: ''
-    connection-throttle: Connection throttled! Please wait before reconnecting.
-    flying-player: Flying is not enabled on this server
-    flying-vehicle: Flying is not enabled on this server
+config-version: 20
 timings:
   enabled: false
   verbose: true
@@ -60,62 +19,99 @@ timings:
   hidden-config-entries:
   - database
   - settings.bungeecord-addresses
+  - settings.velocity-support.secret
   history-interval: 300
   history-length: 3600
   server-name: Unknown Server
+settings:
+  load-permissions-yml-before-plugins: true
+  region-file-cache-size: 256
+  enable-player-collisions: true
+  save-empty-scoreboard-teams: false
+  bungee-online-mode: true
+  incoming-packet-spam-threshold: 300
+  suggest-player-names-when-null-tab-completions: true
+  save-player-data: true
+  use-alternative-luck-formula: true
+  watchdog:
+    early-warning-every: 15000
+    early-warning-delay: 20000
+  spam-limiter:
+    tab-spam-increment: 1
+    tab-spam-limit: 500
+  velocity-support:
+    enabled: false
+    online-mode: false
+    secret: ''
+  book-size:
+    page-max: 2560
+    total-multiplier: 0.98
+  async-chunks:
+    enable: true
+    load-threads: -1
+messages:
+  no-permission: '&cI''m sorry, but you do not have permission to perform this command.
+    Please contact the server administrators if you believe that this is in error.'
+  kick:
+    flying-player: Flying is not enabled on this server
+    flying-vehicle: Flying is not enabled on this server
+    authentication-servers-down: ''
+    connection-throttle: Connection throttled! Please wait before reconnecting.
 world-settings:
   default:
-    queue-light-updates: false
-    count-all-mobs-for-spawning: false
-    fire-physics-event-for-redstone: false
-    delay-chunk-unloads-by: 10s
-    save-queue-limit-for-auto-save: 50
-    max-chunk-sends-per-tick: 81
-    max-chunk-gens-per-tick: 10
-    skip-entity-ticking-in-chunks-scheduled-for-unload: true
-    prevent-moving-into-unloaded-chunks: true
-    max-auto-save-chunks-per-tick: 6
+    baby-zombie-movement-modifier: 0.5
+    spawner-nerfed-mobs-should-jump: false
+    keep-spawn-loaded: false
     falling-block-height-nerf: 0
     tnt-entity-height-nerf: 0
-    filter-nbt-data-from-spawn-eggs-and-related: true
-    max-entity-collisions: 1
-    disable-creeper-lingering-effect: false
-    duplicate-uuid-resolver: saferegen
-    duplicate-uuid-saferegen-delete-range: 32
-    remove-corrupt-tile-entities: false
-    optimize-explosions: true
-    portal-search-radius: 16
-    disable-teleportation-suffocation-check: true
-    fixed-chunk-inhabited-time: -1
-    use-vanilla-world-scoreboard-name-coloring: false
-    enable-treasure-maps: true
-    treasure-maps-return-already-discovered: false
-    experience-merge-max-value: -1
-    disable-thunder: false
-    skeleton-horse-thunder-spawn-chance: 0.01
-    disable-ice-and-snow: false
-    keep-spawn-loaded-range: 5
-    keep-spawn-loaded: true
-    auto-save-interval: 100
-    armor-stands-do-collision-entity-lookups: true
     nether-ceiling-void-damage-height: 0
-    water-over-lava-flow-speed: 5
-    grass-spread-tick-rate: 400
-    bed-search-radius: 1
-    use-faster-eigencraft-redstone: true
-    allow-non-player-entities-on-scoreboards: false
+    optimize-explosions: true
     disable-explosion-knockback: false
-    parrots-are-unaffected-by-player-movement: false
+    disable-thunder: false
+    disable-ice-and-snow: false
+    mob-spawner-tick-rate: 200
     container-update-tick-rate: 1
+    all-chunks-are-slime-chunks: false
+    portal-search-radius: 16
+    portal-create-radius: 16
+    disable-teleportation-suffocation-check: true
+    allow-non-player-entities-on-scoreboards: false
+    allow-leashing-undead-horse: false
     non-player-arrow-despawn-rate: -1
     creative-arrow-despawn-rate: -1
+    skeleton-horse-thunder-spawn-chance: 0.01
+    fixed-chunk-inhabited-time: -1
+    grass-spread-tick-rate: 400
+    use-vanilla-world-scoreboard-name-coloring: false
     prevent-tnt-from-moving-in-water: false
+    remove-corrupt-tile-entities: false
+    filter-nbt-data-from-spawn-eggs-and-related: true
+    enable-treasure-maps: true
+    treasure-maps-return-already-discovered: false
+    seed-based-feature-search: true
+    max-entity-collisions: 1
+    parrots-are-unaffected-by-player-movement: false
+    disable-creeper-lingering-effect: false
+    experience-merge-max-value: -1
+    iron-golems-can-spawn-in-air: false
+    bed-search-radius: 1
+    armor-stands-do-collision-entity-lookups: true
     armor-stands-tick: true
-    spawner-nerfed-mobs-should-jump: false
-    baby-zombie-movement-speed: 0.5
-    allow-leashing-undead-horse: false
-    all-chunks-are-slime-chunks: false
-    mob-spawner-tick-rate: 200
+    water-over-lava-flow-speed: 5
+    prevent-moving-into-unloaded-chunks: true
+    use-faster-eigencraft-redstone: true
+    duplicate-uuid-resolver: saferegen
+    duplicate-uuid-saferegen-delete-range: 32
+    keep-spawn-loaded-range: 5
+    auto-save-interval: 200
+    max-auto-save-chunks-per-tick: 6
+    count-all-mobs-for-spawning: false
+    fix-zero-tick-instant-grow-farms: true
+    per-player-mob-spawns: false
+    entities-target-with-follow-range: false
+    zombie-villager-infection-chance: -1.0
+    tracker-update-distance: 1.0
+    light-queue-size: 20
     max-growth-height:
       cactus: 3
       reeds: 3
@@ -125,6 +121,25 @@ world-settings:
     despawn-ranges:
       soft: 32
       hard: 128
+    game-mechanics:
+      disable-end-credits: false
+      disable-chest-cat-detection: false
+      disable-player-crits: false
+      disable-sprint-interruption-on-attack: false
+      disable-unloaded-chunk-enderpearl-exploit: true
+      shield-blocking-delay: 5
+      scan-for-legacy-ender-dragon: false
+      disable-relative-projectile-velocity: false
+      disable-pillager-patrols: true
+      nerf-pigmen-from-nether-portals: false
+      pillager-patrols:
+        spawn-chance: 0.2
+        spawn-delay:
+          per-player: false
+          ticks: 12000
+        start:
+          per-player: false
+          day: 5
     lightning-strike-distance-limit:
       sound: -1
       impact-sound: -1
@@ -141,18 +156,8 @@ world-settings:
       max-refills: -1
       refresh-min: 12h
       refresh-max: 2d
-    hopper:
-      cooldown-when-full: true
-      disable-move-event: true
-    game-mechanics:
-      villages-load-chunks: false
-      scan-for-legacy-ender-dragon: false
-      disable-chest-cat-detection: false
-      shield-blocking-delay: 5
-      disable-player-crits: false
-      disable-sprint-interruption-on-attack: false
-      disable-end-credits: false
-      disable-unloaded-chunk-enderpearl-exploit: true
+    squid-spawn-height:
+      maximum: 0.0
     anti-xray:
       enabled: false
       engine-mode: 1
@@ -175,5 +180,12 @@ world-settings:
       replacement-blocks:
       - stone
       - oak_planks
-    squid-spawn-height:
-      maximum: 0.0
+    alt-item-despawn-rate:
+      enabled: false
+      items:
+        COBBLESTONE: 300
+    generator-settings:
+      flat-bedrock: false
+    hopper:
+      cooldown-when-full: true
+      disable-move-event: true
diff --git a/plugins/DummyFawe.jar b/plugins/DummyFawe.jar
index fbb1de1..2682176 100644
Binary files a/plugins/DummyFawe.jar and b/plugins/DummyFawe.jar differ
diff --git a/plugins/Extras.jar b/plugins/Extras.jar
index c7cbc63..9f734a1 100644
Binary files a/plugins/Extras.jar and b/plugins/Extras.jar differ
diff --git a/plugins/FastAsyncWorldEdit.jar b/plugins/FastAsyncWorldEdit.jar
index 9ffd103..ac64552 100644
Binary files a/plugins/FastAsyncWorldEdit.jar and b/plugins/FastAsyncWorldEdit.jar differ
diff --git a/plugins/FastAsyncWorldEdit/config.yml b/plugins/FastAsyncWorldEdit/config.yml
index 93758d3..5390e40 100644
--- a/plugins/FastAsyncWorldEdit/config.yml
+++ b/plugins/FastAsyncWorldEdit/config.yml
@@ -1,15 +1,10 @@
 # These first 6 aren't configurable
-issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues"
-wiki: "https://github.com/boy0001/FastAsyncWorldedit/wiki/"
-date: "10 Jan 2020 22:00:00 GMT"
-build: "https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/208"
-commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/commit/14eb649"
-platform: "bukkit"
-# Options: cn, de, es, fr, it, nl, ru, tr
-# Create a PR to contribute a translation: https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/tree/master/worldedit-core/src/main/resources
-language: ''
-# Send anonymous usage statistics
-metrics: false
+issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit/issues"
+wiki: "https://github.com/IntellectualSites/FastAsyncWorldEdit/wiki"
+date: "14 May 2020 22:00:00 GMT"
+build: "https://ci.athion.net/job/FastAsyncWorldEdit-1.15/167"
+commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/commit/f7c96d89"
+platform: "Bukkit"
 # Set true to enable WorldEdit restrictions per region (e.g. PlotSquared or WorldGuard).
 # To be allowed to WorldEdit in a region, users need the appropriate
 # fawe.<plugin>  permission. See the Permissions page for supported region plugins.
@@ -19,7 +14,7 @@ prevent-crashes: true
 # FAWE will cancel non admin edits when memory consumption exceeds this %
 #  - Bypass with `/wea` or `//fast` or `fawe.bypass`
 #  - Disable with 100 or -1.
-max-memory-percent: 95
+max-memory-percent: 60
 
 clipboard:
   # Store the clipboard on disk instead of memory
@@ -73,10 +68,6 @@ web:
   #  - Downloads can be deleted by the user
   #  - Supports clipboard uploads, downloads and saves
   url: "https://athion.net/fawe/"
-  # The web interface for assets
-  #  - All schematics are organized and public
-  #  - Assets can be searched, selected and downloaded
-  assets: "https://athion.net/assetpack/"
 
 extent:
   # Don't bug console when these plugins slow down WorldEdit operations
@@ -93,7 +84,7 @@ experimental:
   #  - IMPROPER USE CAN CAUSE WORLD CORRUPTION!
   anvil-queue-mode: false
   # [SAFE] Dynamically increase the number of chunks rendered
-  #  - Requires Paper: ci.destroystokyo.com/job/Paper-1.13/
+  #  - Requires Paper
   #  - Set your server view distance to 1 (spigot.yml, server.properties)
   #  - Based on tps and player movement
   #  - Note: If entities become hidden, increase the server view distance to 3
@@ -105,9 +96,6 @@ experimental:
   # [SAFE] Keep entities that are positioned in non-air blocks when editing an area
   # Might cause client-side FPS lagg in some situations
   keep-entities-in-blocks: false
-  # [SAFE] Experimental scripting support for Java 9
-  #  - https://github.com/boy0001/FastAsyncWorldedit/wiki/JavaScript-API
-  modern-craftscripts: false
   # [SAFE] Experimental freebuild region restrictions
   #  - PERM: fawe.freebuild
   #  - PERM: fawe.freebuild.<plugin>
@@ -116,8 +104,7 @@ experimental:
 # This relates to how FAWE places chunks
 queue:
   # This should equal the number of processors you have
-  #  - Set this to 1 if you need reliable `/timings`
-  parallel-threads: 8
+  parallel-threads: 2
   progress:
     # Display constant titles about the progress of a user's edit
     #  - false = disabled
@@ -133,22 +120,25 @@ queue:
   #  - A larger value will use slightly less CPU time
   #  - A smaller value will reduce memory usage
   #  - A value too small may break some operations (deform?)
-  target-size: 0
+  target-size: 64
   # Force FAWE to start placing chunks regardless of whether an edit is finished processing
   #  - A larger value will use slightly less CPU time
   #  - A smaller value will reduce memory usage
   #  - A value too small may break some operations (deform?)
-  max-wait-ms: 0
+  max-wait-ms: 1000
   # Increase or decrease queue intensity (ms) [-50,50]:
   #     0 = balance of performance / stability
   #     -10 = Allocate 10ms less for chunk placement
-  # Too high will can cause lag spikes (you might be okay with this)
+  # Too high can cause lag spikes (you might be okay with this)
   # Too low will result in slow edits
   extra-time-ms: 0
   # Loading the right amount of chunks beforehand can speed up operations
   #  - Low values may result in FAWE waiting on requests to the main thread
   #  - Higher values use more memory and isn't noticeably faster
   preload-chunks: 1
+  # If pooling is enabled (reduces GC, higher memory usage)
+  #  - Enable to improve performance at the expense of memory
+  pool: true
   # Discard edits which have been idle for a certain amount of time (ms)
   #  - E.g. A plugin creates an EditSession but never does anything with it
   #  - This only applies to plugins improperly using WorldEdit's legacy API
@@ -227,7 +217,7 @@ paths:
   # Multiple servers can use the same clipboards
   #  - Use a shared directory or NFS/Samba
   clipboard: "clipboard"
-  # Each player has their own sub directory for schematics
+  # Each player has his or her own sub directory for schematics
   per-player-schematics: false
   commands: "commands"
 
@@ -269,7 +259,7 @@ limits:
     # Maximum time in milliseconds //calc can execute
     max-expression-ms: 50
     # Cinematic block placement:
-    #  - Adds a delay to block placement (ms/block)
+    #  - Adds a delay to block placement (nanoseconds/block)
     #  - Having an artificial delay will use more CPU/Memory
     speed-reduction: 0
     # Place chunks instead of individual blocks:
diff --git a/plugins/FastAsyncWorldEdit/message.yml b/plugins/FastAsyncWorldEdit/message.yml
deleted file mode 100644
index 9e01f05..0000000
--- a/plugins/FastAsyncWorldEdit/message.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-info:
-  prefix: ''
diff --git a/plugins/Geyser-Bukkit/config.yml b/plugins/Geyser-Bukkit/config.yml
new file mode 100644
index 0000000..a39e23d
--- /dev/null
+++ b/plugins/Geyser-Bukkit/config.yml
@@ -0,0 +1,20 @@
+# --------------------------------
+# Geyser Configuration File
+bedrock:
+  address: 0.0.0.0
+  port: 19132
+  motd1: "Kaboom > Free OP - Anarchy"
+remote:
+  address: 127.0.0.1
+  port: 25565
+  auth-type: offline
+floodgate-key-file: public-key.pem
+ping-passthrough: false
+max-players: 10000
+debug-mode: false
+general-thread-pool: 32
+allow-third-party-capes: true
+default-locale: en_us
+metrics:
+  enabled: false
+  uuid:
diff --git a/plugins/Geyser.jar b/plugins/Geyser.jar
new file mode 100644
index 0000000..2d1b7b2
Binary files /dev/null and b/plugins/Geyser.jar differ
diff --git a/plugins/ProtocolLib.jar b/plugins/ProtocolLib.jar
index 040ba71..b6b564b 100644
Binary files a/plugins/ProtocolLib.jar and b/plugins/ProtocolLib.jar differ
diff --git a/plugins/ProtocolSupport.jar b/plugins/ProtocolSupport.jar
new file mode 100644
index 0000000..a0b7e3d
Binary files /dev/null and b/plugins/ProtocolSupport.jar differ
diff --git a/plugins/ViaBackwards.jar b/plugins/ViaBackwards.jar
deleted file mode 100644
index 284654c..0000000
Binary files a/plugins/ViaBackwards.jar and /dev/null differ
diff --git a/plugins/ViaBackwards/config.yml b/plugins/ViaBackwards/config.yml
deleted file mode 100644
index 945aa1d..0000000
--- a/plugins/ViaBackwards/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# If you need help, you can join our Discord - https://viaversion.com/discord
-# 
-# Writes name and level of custom enchantments into the item's lore.
-# Set this to false if you see the entries doubled/if the custom-enchant plugin already writes these into the lore manually.
-add-custom-enchants-into-lore: true
-# 
-# Adds the color of a scoreboard team after its prefix for 1.12 clients on 1.13+ servers.
-add-teamcolor-to-prefix: true
-# 
-# Converts the 1.13 face look-at packet for 1.12- players. Requires a bit of extra caching.
-fix-1_13-face-player: false
diff --git a/plugins/ViaRewind.jar b/plugins/ViaRewind.jar
deleted file mode 100644
index 1165f56..0000000
Binary files a/plugins/ViaRewind.jar and /dev/null differ
diff --git a/plugins/ViaVersion.jar b/plugins/ViaVersion.jar
deleted file mode 100644
index 39eb18b..0000000
Binary files a/plugins/ViaVersion.jar and /dev/null differ
diff --git a/plugins/ViaVersion/config.yml b/plugins/ViaVersion/config.yml
deleted file mode 100644
index 932bcf3..0000000
--- a/plugins/ViaVersion/config.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-# Thanks for downloading ViaVersion
-# Ensure you look through all these options
-# If you need help:
-# Discord - https://viaversion.com/discord
-# viaversion.com - Discussion tab
-# Docs - https://docs.viaversion.com/display/VIAVERSION/Configuration
-# 
-# ----------------------------------------------------------#
-#                     GLOBAL OPTIONS                       #
-# ----------------------------------------------------------#
-# 
-# Should ViaVersion check for updates?
-checkforupdates: false
-# Send the supported versions with the Status (Ping) response packet
-send-supported-versions: false
-# Block specific Minecraft protocols that ViaVersion allows
-# List of all Minecraft protocol versions: http://wiki.vg/Protocol_version_numbers
-block-protocols: []
-# Change the blocked disconnect message
-block-disconnect-msg: You are using an unsupported Minecraft version!
-# If you use ProtocolLib, we can't reload without kicking the players.
-# (We don't suggest using reload either, use a plugin manager)
-# You can customise the message we kick people with if you use ProtocolLib here.
-reload-disconnect-msg: Server reload, please rejoin!
-# We warn when there's a error converting item and block data over versions, should we suppress these? (Only suggested if spamming)
-suppress-conversion-warnings: true
-# 
-# ----------------------------------------------------------#
-#                  GLOBAL PACKET LIMITER                   #
-# ----------------------------------------------------------#
-# 
-# 
-# Packets Per Second (PPS) limiter (Use -1 on max-pps and tracking-period to disable)
-# Clients by default send around 20-90 packets per second.
-# 
-# What is the maximum per second a client can send (Use %pps to display their pps)
-# Use -1 to disable.
-max-pps: -1
-max-pps-kick-msg: You are sending too many packets!
-# 
-# We can also kick them if over a period they send over a threshold a certain amount of times.
-# 
-# Period to track (in seconds)
-# Use -1 to disable.
-tracking-period: -1
-# How many packets per second counts as a warning
-tracking-warning-pps: 120
-# How many warnings over the interval can we have
-# This can never be higher than "tracking-period"
-tracking-max-warnings: 4
-tracking-max-kick-msg: You are sending too many packets, :(
-# 
-# ----------------------------------------------------------#
-#                 MULTIPLE VERSIONS OPTIONS                #
-# ----------------------------------------------------------#
-# 
-# Should we enable our hologram patch?
-# If they're in the wrong place enable this
-hologram-patch: false
-# This is the offset, should work as default when enabled.
-hologram-y: -0.96
-# Should we disable piston animation for 1.11/1.11.1 clients?
-# In some cases when firing lots of pistons it crashes them.
-piston-animation-patch: false
-# Should we fix nbt for 1.12 and above clients in chat messages (causes invalid item)
-chat-nbt-fix: false
-# Experimental - Should we fix shift quick move action for 1.12 clients (causes shift + double click not to work when moving items) (only works on 1.8-1.11.2 bukkit based servers)
-quick-move-action-fix: false
-# Should we use prefix for team colour on 1.13 and above clients
-team-colour-fix: false
-# 1.13 introduced new auto complete which can trigger "Kicked for spamming" for servers older than 1.13, the following option will disable it completely.
-disable-1_13-auto-complete: false
-# The following option will delay the tab complete request in x ticks if greater than 0, if other tab-complete is received, the previous is cancelled
-1_13-tab-complete-delay: 0
-# For 1.13 clients the smallest (1 layer) snow doesn't have collision, this will send these as 2 snowlayers for 1.13+ clients to prevent them bugging through them
-fix-low-snow-collision: false
-# Infested blocks are instantly breakable for 1.13+ clients, resulting in them being unable to break them on sub 1.13 servers. This remaps them to their normal stone variants
-fix-infested-block-breaking: true
-# In 1.14 the client page limit has been upped to 100 (from 50). Some anti-exploit plugins ban when clients go higher than 50. This option cuts edited books to 50 pages.
-truncate-1_14-books: false
-# This prevents clients using 1.9-1.13 on 1.8 servers from receiving no knockback/having velocity bugs whilst sneaking under a block.
-change-1_9-hitbox: false
-# Similar to the above, but for 1.14+ players on 1.8-1.13 servers.
-# WARNING: This gives 1.14+ players the ability to sneak under blocks, that players under that version cannot (sneaking in places that are only 1.5 blocks high)!
-# Another thing to remember is that those players might be missed by projectiles and other hits directed at the very top of their head whilst sneaking.
-change-1_14-hitbox: true
-# Fixes 1.14+ clients on sub 1.14 servers having a light value of 0 for non full blocks.
-fix-non-full-blocklight: true
-# Fixes walk animation not shown when health is set to Float.NaN
-fix-1_14-health-nan: true
-# Should 1.15+ clients respawn instantly / without showing a death screen?
-use-1_15-instant-respawn: true
-# 
-# Enable serverside block-connections for 1.13+ clients
-serverside-blockconnections: false
-# Sets the method for the block connections (world for highly experimental (USE AT OWN RISK) world-level or packet for packet-level)
-blockconnection-method: packet
-# When activated, only the most important blocks are stored in the blockstorage. (fences, glass panes etc. won't connect to solid blocks)
-reduce-blockstorage-memory: true
-# When activated with serverside-blockconnections, flower parts with blocks above will be sent as stems
-# Useful for lobbyservers where users can't build and those stems are used decoratively
-flowerstem-when-block-above: false
-# Vines that are not connected to blocks will be mapped to air, else 1.13+ would still be able to climb up on them.
-vine-climb-fix: false
-# 
-# ----------------------------------------------------------#
-#             1.9+ CLIENTS ON 1.8 SERVERS OPTIONS          #
-# ----------------------------------------------------------#
-# 
-# No collide options, these allow you to configure how collision works.
-# Do you want us to prevent collision?
-prevent-collision: false
-# If the above is true, should we automatically team players until you do?
-auto-team: false
-# When enabled if certain metadata can't be read we won't tell you about it
-suppress-metadata-errors: false
-# When enabled 1.9+ will be able to block by using shields
-shield-blocking: false
-# Enable player tick simulation, this fixes eating, drinking, nether portals.
-simulate-pt: false
-# Should we use nms player to simulate packets, (may fix anti-cheat issues)
-nms-player-ticking: false
-# Should we patch boss bars so they work? (Default: true, disable if you're having issues)
-bossbar-patch: false
-# If your boss bar flickers on 1.9+, set this to 'true'. It will keep all boss bars on 100% (not recommended)
-bossbar-anti-flicker: false
-# This will show the new effect indicator in the top-right corner for 1.9+ players.
-use-new-effect-indicator: false
-# Show the new death messages for 1.9+ on the death screen
-use-new-deathmessages: false
-# Should we cache our items, this will prevent server from being lagged out, however the cost is a constant task caching items
-item-cache: false
-# Patch the anti xray to work on 1.9+ (If your server is 1.8) This can cost more performance, so disable it if you don't use it.
-anti-xray-patch: false
-# Should we replace extended pistons to fix 1.10.1 (Only on chunk load)
-replace-pistons: false
-# What id should we replace with, default is air. (careful of players getting stuck standing on them)
-replacement-piston-id: 0
-# Force the string -> json transform
-force-json-transform: false
-# Minimize the cooldown animation in 1.8 servers
-minimize-cooldown: false
-# Left handed handling on 1.8 servers
-left-handed-handling: false
diff --git a/server.jar b/server.jar
index 685ebd1..2b1874a 100644
Binary files a/server.jar and b/server.jar differ
diff --git a/spigot.yml b/spigot.yml
index 9e417e5..fab25ae 100644
--- a/spigot.yml
+++ b/spigot.yml
@@ -10,36 +10,11 @@
 # IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ )
 # Forums: http://www.spigotmc.org/
 
-config-version: 11
-settings:
-  save-user-cache-on-stop-only: false
-  sample-count: 12
-  bungeecord: false
-  late-bind: true
-  player-shuffle: 0
-  user-cache-size: 1000
-  moved-wrongly-threshold: 0.0625
-  moved-too-quickly-multiplier: 100.0
-  timeout-time: 60
-  restart-on-crash: true
-  restart-script: script/stop.sh
-  netty-threads: 4
-  debug: false
-  attribute:
-    maxHealth:
-      max: 2048.0
-    movementSpeed:
-      max: 2048.0
-    attackDamage:
-      max: 2048.0
-messages:
-  whitelist: The server is temporarily down for maintenance. Please try again later!
-  unknown-command: Unknown command. Type "/help" for help.
-  server-full: The server is temporarily down for maintenance. Please try again later!
-  outdated-client: Your client is outdated. Please join with Minecraft version 1.15.2!
-  outdated-server: The server is outdated. Please join with Minecraft version 1.15.2!
-  restart: The server is restarting. Please wait...
+config-version: 12
 commands:
+  log: true
+  tab-complete: 0
+  send-namespaced: true
   spam-exclusions:
   - /skill
   silent-commandblock-console: true
@@ -48,24 +23,55 @@ commands:
   - summon
   - testforblock
   - tellraw
-  log: true
-  tab-complete: 0
-  send-namespaced: true
+messages:
+  whitelist: The server is temporarily down for maintenance. Please try again later!
+  unknown-command: Unknown command. Type "/help" for help.
+  server-full: The server is temporarily down for maintenance. Please try again later!
+  outdated-client: Your client is outdated. Please join with Minecraft version 1.15.2!
+  outdated-server: The server is outdated. Please join with Minecraft version 1.15.2!
+  restart: The server is restarting. Please wait...
+settings:
+  timeout-time: 60
+  restart-on-crash: true
+  restart-script: script/stop.sh
+  bungeecord: false
+  netty-threads: 4
+  sample-count: 12
+  player-shuffle: 0
+  user-cache-size: 1000
+  save-user-cache-on-stop-only: true
+  moved-wrongly-threshold: 0.0625
+  moved-too-quickly-multiplier: 100.0
+  debug: false
+  log-villager-deaths: false
+  attribute:
+    maxHealth:
+      max: 2048.0
+    movementSpeed:
+      max: 2048.0
+    attackDamage:
+      max: 2048.0
+stats:
+  disable-saving: true
+  forced-stats: {}
 advancements:
   disable-saving: true
   disabled:
   - '*'
-stats:
-  disable-saving: true
-  forced-stats: {}
 world-settings:
   default:
-    random-light-updates: false
-    view-distance: 5
     verbose: false
+    view-distance: default
     mob-spawn-range: 3
+    item-despawn-rate: 6000
     hopper-amount: 1
+    arrow-despawn-rate: 1200
+    trident-despawn-rate: 1200
+    zombie-aggressive-towards-villager: true
+    nerf-spawner-mobs: false
+    enable-zombie-pigmen-portal-spawns: true
     dragon-death-sound-radius: 0
+    wither-spawn-sound-radius: 0
     seed-village: 10387312
     seed-desert: 14357617
     seed-igloo: 14357618
@@ -75,15 +81,10 @@ world-settings:
     seed-shipwreck: 165745295
     seed-ocean: 14357621
     seed-outpost: 165745296
+    seed-endcity: 10387313
     seed-slime: 987234911
     max-tnt-per-tick: 10
-    enable-zombie-pigmen-portal-spawns: true
-    item-despawn-rate: 6000
-    arrow-despawn-rate: 1200
-    wither-spawn-sound-radius: 0
     hanging-tick-frequency: 100
-    zombie-aggressive-towards-villager: false
-    nerf-spawner-mobs: false
     max-entity-collisions: 1
     growth:
       cactus-modifier: 100
@@ -102,16 +103,16 @@ world-settings:
       bamboo-modifier: 100
       sweetberry-modifier: 100
       kelp-modifier: 100
+    merge-radius:
+      item: 2.5
+      exp: 3.0
     entity-activation-range:
-      water: 16
       animals: 16
       monsters: 24
       raiders: 32
       misc: 4
+      water: 16
       tick-inactive-villagers: false
-    merge-radius:
-      exp: 3.0
-      item: 2.5
     entity-tracking-range:
       players: 48
       animals: 48