diff --git a/gradle.properties b/gradle.properties
index 3910769..e473117 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20.6-R0.1-SNAPSHOT
 
 mcVersion=1.20.6
-paperRef=0ad09de75bfb1db2a84bb760cdee09b06d609bb3
+paperRef=591521e697a619d5d81323c5488b154e3cd14ba3
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0002-Gale-branding-changes.patch b/patches/api/0002-Gale-branding-changes.patch
index e288ca5..719e06b 100644
--- a/patches/api/0002-Gale-branding-changes.patch
+++ b/patches/api/0002-Gale-branding-changes.patch
@@ -62,3 +62,21 @@ index 327766a53d6c730d06765ee937b9a89b6629008c..8a81cc5a8c4ce0109e8a4965f3c625a0
  }
  
  tasks.withType<Javadoc> {
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..bdc8d830f54e4567ec0b03041221fdcd016ce76c 100644
+--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
++++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
+      */
+     Key BRAND_PAPER_ID = Key.key("papermc", "paper");
+ 
++    // Gale start - branding changes
++    /**
++     * The brand id for Gale.
++     */
++    Key BRAND_GALE_ID = Key.key("galemc", "gale");
++    // Gale end - branding changes
++
+     /**
+      * Gets the {@code ServerBuildInfo}.
+      *
diff --git a/patches/api/0008-Player-canSee-by-entity-UUID.patch b/patches/api/0008-Player-canSee-by-entity-UUID.patch
index 3479f41..72263ea 100644
--- a/patches/api/0008-Player-canSee-by-entity-UUID.patch
+++ b/patches/api/0008-Player-canSee-by-entity-UUID.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..ba3edf4cb1a2fc0529465d6973ec086291bae41c 100644
+index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..2d63d61fcfe87c4f07b1d752facbb1bae6f2b0ca 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2108,6 +2108,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -51,7 +51,7 @@ index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..ba3edf4cb1a2fc0529465d6973ec0862
 +     * @param entityUUID The {@link Entity#getUniqueId()} of the entity to check
 +     * @return True if the entity with the provided UUID is not being hidden from this player
 +     */
-+    boolean canSee(@NotNull UUID entityUUID);
++    boolean canSeePlayer(@NotNull UUID entityUUID);
 +    // Gale end - Purpur - Player#canSee by entity UUID
 +
      /**
diff --git a/patches/api/0011-Last-tick-time-API.patch b/patches/api/0011-Last-tick-time-API.patch
index 730a77f..11133e6 100644
--- a/patches/api/0011-Last-tick-time-API.patch
+++ b/patches/api/0011-Last-tick-time-API.patch
@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d627e3f8ffd37eb79affdce0c06f3d8624e90833..445b422c14af83cb5c88d36590ab2eca895515ac 100644
+index 2cb2b7bb87f91d0500872215bfdb2fefba549d6f..dec4ad04ac3dc2e869ea78f354cdf37d7a305a55 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2956,6 +2956,20 @@ public final class Bukkit {
+@@ -2962,6 +2962,20 @@ public final class Bukkit {
      }
      // Paper end - Folia region threading API
  
@@ -48,10 +48,10 @@ index d627e3f8ffd37eb79affdce0c06f3d8624e90833..445b422c14af83cb5c88d36590ab2eca
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7b31498b03f1ea44d7533cfc8c8afdac9d2898b6..2f02355788d94891d95dd8aecf99009196b262fb 100644
+index fb754abc50e79030497a178c443421da1cb88e7f..6d77d7989e757f18ba5d72b07e3b82016a5e28a2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2595,4 +2595,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2599,4 +2599,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API
diff --git a/patches/server/0005-Gale-branding-changes.patch b/patches/server/0005-Gale-branding-changes.patch
index 7b5aa06..99e5d2c 100644
--- a/patches/server/0005-Gale-branding-changes.patch
+++ b/patches/server/0005-Gale-branding-changes.patch
@@ -431,21 +431,38 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index 790bad0494454ca12ee152e3de6da3da634d9b20..7823cf3cdb11062491deaa0eae5aa5e9f5a3e3ba 100644
+index 790bad0494454ca12ee152e3de6da3da634d9b20..2596e0ee4df5b96f181e28a742ef345981fc97e3 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -42,9 +42,9 @@ public record ServerBuildInfoImpl(
+@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
+     private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
+ 
+     private static final String BRAND_PAPER_NAME = "Paper";
++    private static final String BRAND_GALE_NAME = "Gale"; // Gale - branding changes
+ 
+     private static final String BUILD_DEV = "DEV";
+ 
+@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl(
          this(
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
                  .map(Key::key)
 -                .orElse(BRAND_PAPER_ID),
-+                .orElse(Key.key("galemc", "gale")), // Gale - branding changes
++                .orElse(BRAND_GALE_ID), // Gale - branding changes
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
 -                .orElse(BRAND_PAPER_NAME),
-+                .orElse("Gale"), // Gale - branding changes
++                .orElse(BRAND_GALE_NAME), // Gale - branding changes
              SharedConstants.getCurrentVersion().getId(),
              SharedConstants.getCurrentVersion().getName(),
              getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
+@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl(
+ 
+     @Override
+     public boolean isBrandCompatible(final @NotNull Key brandId) {
+-        return brandId.equals(this.brandId);
++        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Gale - branding changes
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..0b9b55ccf5c719d6683403e2f22aa4c1a67a5f35 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/patches/server/0105-Optimize-player-list-for-sending-player-info.patch b/patches/server/0105-Optimize-player-list-for-sending-player-info.patch
index b958156..0a2aeae 100644
--- a/patches/server/0105-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0105-Optimize-player-list-for-sending-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a4e813aeae443aecf78515d3759b2a65fd14f8ea..e37c9320083334680e7ccdd12e875feb78f29414 100644
+index a4e813aeae443aecf78515d3759b2a65fd14f8ea..4eff57762a83b6e60fd5ad6cd71dcecf786b10d1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1068,14 +1068,18 @@ public abstract class PlayerList {
@@ -55,7 +55,7 @@ index a4e813aeae443aecf78515d3759b2a65fd14f8ea..e37c9320083334680e7ccdd12e875feb
 +                var target = targetPlayer.getBukkitEntity();;
 +                final List<ServerPlayer> list = new java.util.ArrayList<>(this.players.size());
 +                for (ServerPlayer player : this.players) {
-+                    if (target.canSee(player.getUUID())) {
++                    if (target.canSeePlayer(player.getUUID())) {
 +                        list.add(player);
                      }
 -                }).collect(Collectors.toList())));
diff --git a/patches/server/0122-Last-tick-time-API.patch b/patches/server/0122-Last-tick-time-API.patch
index 3de8560..77ca61e 100644
--- a/patches/server/0122-Last-tick-time-API.patch
+++ b/patches/server/0122-Last-tick-time-API.patch
@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 29f85700cd7ff3ccd94e1d81030888a39f28e303..c79dfb84412e9718d19415ac0d6d1cd82f0318d7 100644
+index c95fb35d8cbb08bca32b2fb96b465c2c62e51e89..2d46b81faf0f4fdf73ebe26b561e960c6ef451d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3318,4 +3318,22 @@ public final class CraftServer implements Server {
+@@ -3315,4 +3315,22 @@ public final class CraftServer implements Server {
          return this.potionBrewer;
      }
      // Paper end