diff --git a/lib/multiverse.jar b/lib/multiverse.jar
deleted file mode 100644
index 347b2ec..0000000
Binary files a/lib/multiverse.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index f37cf4c..9e53e8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,19 +4,28 @@
 
     <groupId>net.rymate</groupId>
     <artifactId>bChatManager</artifactId>
-    <version>3.1</version>
+    <version>4.0.0</version>
     <packaging>jar</packaging>
 
     <name>bChatManager</name>
     <url>http://maven.apache.org</url>
     <repositories>
+        <!-- Spigot -->
         <repository>
             <id>Spigot Repo</id>
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>     
+        </repository>
+
+        <!-- Vault -->
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+
+        <!-- Multiverse -->
         <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
+            <id>onarandombox</id>
+            <url>https://repo.onarandombox.com/content/groups/public/</url>
         </repository>
     </repositories>
     
@@ -32,9 +41,10 @@
         </dependency>
         
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.4.1</version>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7.1</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -53,16 +63,12 @@
             <systemPath>${project.basedir}/lib/MassiveCore.jar</systemPath>
         </dependency>
 
-        <!-- Start of Multiverse Core Dependency -->
         <dependency>
-            <groupId>com.onarandombox.multiversecore</groupId>
-            <artifactId>Multiverse-Core</artifactId>
-            <version>2.5</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/multiverse.jar</systemPath>
+            <groupId>org.mvplugins.multiverse.core</groupId> <!-- Replace for other sub-modules -->
+            <artifactId>multiverse-core</artifactId> <!-- Replace for other sub-modules -->
+            <version>5.4.0</version> <!-- Replace with the version you need -->
+            <scope>provided</scope>
         </dependency>
-        <!-- End of Multiverse Core Dependency -->
 
     </dependencies>
     
@@ -86,8 +92,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>8</source>
+                    <target>8</target>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                     <fork>true</fork>
diff --git a/src/main/java/net/rymate/bchatmanager/bChatManager.java b/src/main/java/net/rymate/bchatmanager/bChatManager.java
index 3fdfc70..0d55503 100644
--- a/src/main/java/net/rymate/bchatmanager/bChatManager.java
+++ b/src/main/java/net/rymate/bchatmanager/bChatManager.java
@@ -2,8 +2,8 @@
 
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MPlayer;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.mvplugins.multiverse.core.MultiverseCoreApi;
+import org.mvplugins.multiverse.core.world.*;
 import net.milkbowl.vault.chat.Chat;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -40,7 +40,7 @@ public class bChatManager extends JavaPlugin {
     private YamlConfiguration config;
     private boolean factions;
     private boolean mv;
-    private MultiverseCore core;
+    private MultiverseCoreApi core;
     private PluginCommand meCmd;
 
     public void onEnable() {
@@ -63,7 +63,7 @@ public void onEnable() {
         //check if Multiverse-Core is installed
         if (this.getServer().getPluginManager().isPluginEnabled("Multiverse-Core")) {
             mv = true;
-            core = (MultiverseCore) getServer().getPluginManager().getPlugin("Multiverse-Core");
+            core = MultiverseCoreApi.get();
         }
 
         System.out.println("[bChatManager] Enabled");
@@ -124,10 +124,10 @@ public String replacePlayerPlaceholders(Player player, String format) {
 
         MultiverseWorld mvWorld = null;
         if (mv) {
-            mvWorld = core.getMVWorldManager().getMVWorld(player.getWorld());
+            mvWorld = core.getWorldManager().getWorld(player.getWorld()).getOrElse((MultiverseWorld) null);
         }
         if (mvWorld != null) {
-            format = format.replaceAll("%mvworld", mvWorld.getColoredWorldString());
+            format = format.replaceAll("%mvworld", mvWorld.getAliasOrName());
         } else {
             format = format.replaceAll("%mvworld", "");
         }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index a712eab..d12bd85 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: bChatManager
 main: net.rymate.bchatmanager.bChatManager
 depend: [ Vault ]
 softdepend: [ Factions, Multiverse-Core]
-version: 3.1.6
+version: 4.0.0
 author: rymate1234
 website: www.rymate.co.uk
 description: Chat management plugin for bPermissions based of PEX ChatManager