diff --git a/pom.xml b/pom.xml
index f269071..8bfd0eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,12 +77,6 @@
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
     </repository>
 
-    <!-- bStats repo -->
-    <repository>
-      <id>bstats-repo</id>
-      <url>http://repo.codemc.org/repository/maven-public/</url>
-    </repository>
-
     <!-- JitPack for Vault -->
     <repository>
       <id>jitpack.io</id>
@@ -111,7 +105,7 @@
     <dependency>
       <groupId>org.bstats</groupId>
       <artifactId>bstats-bukkit</artifactId>
-      <version>1.7</version>
+      <version>2.2.1</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/ArenaCountChart.java b/src/main/java/com/garbagemule/MobArena/metrics/ArenaCountChart.java
index b415cda..feda237 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/ArenaCountChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/ArenaCountChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class ArenaCountChart extends Metrics.SimplePie {
+public class ArenaCountChart extends SimplePie {
 
     public ArenaCountChart(MobArena plugin) {
         super("arena_count", () -> {
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/ClassChestsChart.java b/src/main/java/com/garbagemule/MobArena/metrics/ClassChestsChart.java
index 959c50d..f94493d 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/ClassChestsChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/ClassChestsChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class ClassChestsChart extends Metrics.SimplePie {
+public class ClassChestsChart extends SimplePie {
 
     public ClassChestsChart(MobArena plugin) {
         super("class_chests_pie", () -> usesClassChests(plugin) ? "Yes" : "No");
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/ClassCountChart.java b/src/main/java/com/garbagemule/MobArena/metrics/ClassCountChart.java
index 46f78c8..581243a 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/ClassCountChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/ClassCountChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class ClassCountChart extends Metrics.SimplePie {
+public class ClassCountChart extends SimplePie {
 
     public ClassCountChart(MobArena plugin) {
         super("class_count", () -> {
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/FoodRegenChart.java b/src/main/java/com/garbagemule/MobArena/metrics/FoodRegenChart.java
index 1d2ed8d..86181d2 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/FoodRegenChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/FoodRegenChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class FoodRegenChart extends Metrics.SimplePie {
+public class FoodRegenChart extends SimplePie {
 
     public FoodRegenChart(MobArena plugin) {
         super("food_regen_pie", () -> usesFoodRegen(plugin) ? "Yes" : "No");
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/IsolatedChatChart.java b/src/main/java/com/garbagemule/MobArena/metrics/IsolatedChatChart.java
index b55b10a..3f6fd6c 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/IsolatedChatChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/IsolatedChatChart.java
@@ -2,9 +2,9 @@ package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class IsolatedChatChart extends Metrics.SimplePie {
+public class IsolatedChatChart extends SimplePie {
 
     public IsolatedChatChart(MobArena plugin) {
         super("isolated_chat_pie", () -> usesIsolatedChat(plugin) ? "Yes" : "No");
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/MonsterInfightChart.java b/src/main/java/com/garbagemule/MobArena/metrics/MonsterInfightChart.java
index 9cb463c..94fbcec 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/MonsterInfightChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/MonsterInfightChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class MonsterInfightChart extends Metrics.SimplePie {
+public class MonsterInfightChart extends SimplePie {
 
     public MonsterInfightChart(MobArena plugin) {
         super("monster_infight_pie", () -> usesMonsterInfight(plugin) ? "Yes" : "No");
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/PvpEnabledChart.java b/src/main/java/com/garbagemule/MobArena/metrics/PvpEnabledChart.java
index a409fe1..21f1554 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/PvpEnabledChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/PvpEnabledChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class PvpEnabledChart extends Metrics.SimplePie {
+public class PvpEnabledChart extends SimplePie {
 
     public PvpEnabledChart(MobArena plugin) {
         super("pvp_enabled_pie", () -> hasPvpEnabled(plugin) ? "Yes" : "No");
diff --git a/src/main/java/com/garbagemule/MobArena/metrics/VaultChart.java b/src/main/java/com/garbagemule/MobArena/metrics/VaultChart.java
index 3ad5be3..916b65c 100644
--- a/src/main/java/com/garbagemule/MobArena/metrics/VaultChart.java
+++ b/src/main/java/com/garbagemule/MobArena/metrics/VaultChart.java
@@ -1,9 +1,9 @@
 package com.garbagemule.MobArena.metrics;
 
 import com.garbagemule.MobArena.MobArena;
-import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 
-public class VaultChart extends Metrics.SimplePie {
+public class VaultChart extends SimplePie {
 
     public VaultChart(MobArena plugin) {
         super("uses_vault", () -> plugin.getEconomy() != null ? "Yes" : "No");