diff --git a/.gitignore b/.gitignore
index d11829c..0246e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .project
 .settings/
 target/
+.idea/
+*.iml
diff --git a/README.md b/README.md
index c00a4c2..2eb42bd 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,6 @@ Blacksmith
 
 A blacksmith plugin for Spigot!
 
+Builds available at: http://ci.citizensnpcs.co/job/Blacksmith/
+
 Backed by Citizens2: https://github.com/CitizensDev/Citizens2
diff --git a/lib/HyperConomy.jar b/lib/HyperConomy.jar
index 1197186..1c50aca 100644
Binary files a/lib/HyperConomy.jar and b/lib/HyperConomy.jar differ
diff --git a/pom.xml b/pom.xml
index 5a7f0e4..85e9765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
 
     <groupId>net.apunch</groupId>
     <artifactId>blacksmith</artifactId>
-    <version>1.12-SNAPSHOT</version>
+    <version>1.13-SNAPSHOT</version>
     <name>Blacksmith</name>
     <description>Blacksmith Character for the CitizensAPI</description>
 
     <!-- Properties -->
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.10.2-R0.1-SNAPSHOT</bukkit.version>
-        <citizensapi.version>2.0.20-SNAPSHOT</citizensapi.version>
+        <bukkit.version>1.13.1-R0.1-SNAPSHOT</bukkit.version>
+        <citizensapi.version>2.0.24-SNAPSHOT</citizensapi.version>
         <vault.version>1.5.6</vault.version>
         <hyperconomy.version>0.975.7-SNAPSHOT</hyperconomy.version>
         <build.number>Unknown</build.number>
@@ -34,18 +34,14 @@
 			<id>vault-repo</id>
 			<url>http://nexus.hc.to/content/repositories/pub_releases</url>
 		</repository>
-		<repository>
-			<id>grokswell-repo</id>
-			<url>http://www.grokswell.com:8000/repo/</url>
-		</repository>
     </repositories>
 
     <!-- Dependencies -->
     <dependencies>
     	<dependency>
 			<groupId>net.citizensnpcs</groupId>
-			<artifactId>citizensapi</artifactId>
-			<version>2.0.22-SNAPSHOT</version>
+			<artifactId>citizens</artifactId>
+			<version>${citizensapi.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -65,12 +61,23 @@
 			<groupId>regalowl.hyperconomy</groupId>
 			<artifactId>hyperconomy</artifactId>
 			<version>${hyperconomy.version}</version>
-			<scope>provided</scope>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/HyperConomy.jar</systemPath>
 		</dependency> 
     </dependencies>
 
     <!-- Build information -->
     <build>
+        <defaultGoal>clean package install</defaultGoal>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java b/src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
index 649621c..ad0b949 100644
--- a/src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
+++ b/src/main/java/net/apunch/blacksmith/BlacksmithPlugin.java
@@ -31,7 +31,6 @@ import regalowl.hyperconomy.bukkit.BukkitConnector;
 import regalowl.hyperconomy.inventory.HItemStack;
 import regalowl.hyperconomy.tradeobject.TradeObject;
 
-
 public class BlacksmithPlugin extends JavaPlugin {
 	public BlacksmithPlugin plugin;
 	private Settings config;
@@ -127,28 +126,28 @@ public class BlacksmithPlugin extends JavaPlugin {
 
 	public boolean isTool(ItemStack item) {
 		switch (item.getType()) {
-		case WOOD_PICKAXE:
-		case WOOD_SPADE:
-		case WOOD_HOE:
-		case WOOD_SWORD:
-		case WOOD_AXE:
+		case WOODEN_PICKAXE:
+			case WOODEN_SHOVEL:
+		case WOODEN_HOE:
+		case WOODEN_SWORD:
+		case WOODEN_AXE:
 		case STONE_PICKAXE:
-		case STONE_SPADE:
+		case STONE_SHOVEL:
 		case STONE_HOE:
 		case STONE_SWORD:
 		case STONE_AXE:
-		case GOLD_PICKAXE:
-		case GOLD_SPADE:
-		case GOLD_HOE:
-		case GOLD_SWORD:
-		case GOLD_AXE:
+		case GOLDEN_PICKAXE:
+		case GOLDEN_SHOVEL:
+		case GOLDEN_HOE:
+		case GOLDEN_SWORD:
+		case GOLDEN_AXE:
 		case IRON_PICKAXE:
-		case IRON_SPADE:
+		case IRON_SHOVEL:
 		case IRON_HOE:
 		case IRON_SWORD:
 		case IRON_AXE:
 		case DIAMOND_PICKAXE:
-		case DIAMOND_SPADE:
+		case DIAMOND_SHOVEL:
 		case DIAMOND_HOE:
 		case DIAMOND_SWORD:
 		case DIAMOND_AXE:
@@ -172,10 +171,10 @@ public class BlacksmithPlugin extends JavaPlugin {
 		case CHAINMAIL_CHESTPLATE:
 		case CHAINMAIL_LEGGINGS:
 		case CHAINMAIL_BOOTS:
-		case GOLD_HELMET:
-		case GOLD_CHESTPLATE:
-		case GOLD_LEGGINGS:
-		case GOLD_BOOTS:
+		case GOLDEN_HELMET:
+		case GOLDEN_CHESTPLATE:
+		case GOLDEN_LEGGINGS:
+		case GOLDEN_BOOTS:
 		case IRON_HELMET:
 		case IRON_CHESTPLATE:
 		case IRON_LEGGINGS:
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 93%
rename from plugin.yml
rename to src/main/resources/plugin.yml
index 5f7b60b..1f5185c 100644
--- a/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -5,6 +5,8 @@ main: net.apunch.blacksmith.BlacksmithPlugin
 depend: [Citizens, Vault]
 softdepend: [HyperConomy]
 
+api-version: 1.13
+
 commands:
   blacksmithreload:
     permission: blacksmith.reload