From 43daf653860b1d91c6098b66d7cecd2ac26bbc15 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sun, 28 Apr 2019 00:17:08 -0600
Subject: [PATCH] Most 1.14 support, code cleanup

---
 .gitignore                                    |   4 +-
 PlayerParticles.iml                           |  27 +
 changelog.txt                                 |   3 +
 pom.xml                                       | 122 +---
 .../playerparticles/PlayerParticles.java      |  61 +-
 .../command/AddCommandModule.java             |  18 +-
 .../command/CommandModule.java                |  16 +-
 .../command/CommandModuleSecondary.java       |   4 +-
 .../command/DataCommandModule.java            |   2 +-
 .../command/EditCommandModule.java            |  32 +-
 .../command/EffectsCommandModule.java         |  12 +-
 .../command/FixedCommandModule.java           | 628 +++++++++---------
 .../command/GUICommandModule.java             |   2 +-
 .../command/GroupCommandModule.java           |  48 +-
 .../command/HelpCommandModule.java            |   2 +-
 .../command/ListCommandModule.java            |   2 +-
 .../command/OtherCommandModule.java           |   4 +-
 .../command/ParticleCommandHandler.java       |  12 +-
 .../command/ReloadCommandModule.java          |   2 +-
 .../command/RemoveCommandModule.java          |   8 +-
 .../command/ResetCommandModule.java           |   2 +-
 .../command/StylesCommandModule.java          |  12 +-
 .../command/ToggleCommandModule.java          |   2 +-
 .../command/VersionCommandModule.java         |   2 +-
 .../command/WorldsCommandModule.java          |   8 +-
 .../database/DatabaseConnector.java           |  10 +-
 .../database/MySqlDatabaseConnector.java      |   7 +-
 .../playerparticles/gui/GuiActionButton.java  |  22 +-
 .../playerparticles/gui/GuiHandler.java       |   4 +-
 .../playerparticles/gui/GuiInventory.java     |  31 +-
 .../gui/GuiInventoryDefault.java              | 291 ++++----
 .../gui/GuiInventoryEditData.java             | 397 +++++------
 .../gui/GuiInventoryEditEffect.java           |  40 +-
 .../gui/GuiInventoryEditParticle.java         | 194 +++---
 .../gui/GuiInventoryEditStyle.java            |  39 +-
 .../gui/GuiInventoryLoadPresetGroups.java     |  54 +-
 .../gui/GuiInventoryManageFixedEffects.java   | 165 +++++
 .../gui/GuiInventoryManageGroups.java         | 200 +++---
 .../gui/GuiInventoryManageParticles.java      | 186 +++---
 .../gui/hook/PlayerChatHook.java              |   7 +-
 .../gui/hook/PlayerChatHookData.java          |   4 +-
 .../playerparticles/manager/DataManager.java  | 443 ++++++------
 .../playerparticles/manager/LangManager.java  |   2 +-
 .../manager/ParticleGroupPresetManager.java   |  12 +-
 .../manager/ParticleManager.java              |  10 +-
 .../manager/PermissionManager.java            |  18 +-
 .../manager/SettingManager.java               |   9 +-
 .../playerparticles/particles/PPlayer.java    |   4 +-
 .../particles/PPlayerMovementListener.java    |  48 +-
 .../particles/ParticleEffect.java             |  88 +--
 .../particles/ParticleGroup.java              |   2 +-
 .../particles/ParticlePair.java               |   4 +-
 .../styles/ParticleStyleCelebration.java      |   4 +-
 .../styles/api/ParticleStyle.java             |  14 +-
 .../styles/api/ParticleStyleManager.java      |   4 +-
 .../{ => updater}/DataUpdater.java            |   8 +-
 .../updater/PluginUpdateListener.java         |  15 +-
 .../playerparticles/util/ParticleUtils.java   |   9 +-
 src/config.yml                                |  19 +
 src/plugin.yml                                |   3 +-
 60 files changed, 1763 insertions(+), 1639 deletions(-)
 create mode 100644 PlayerParticles.iml
 create mode 100644 src/com/esophose/playerparticles/gui/GuiInventoryManageFixedEffects.java
 rename src/com/esophose/playerparticles/{ => updater}/DataUpdater.java (94%)

diff --git a/.gitignore b/.gitignore
index 7330de8..99c12c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,9 @@ Icon
 /.settings
 /doc
 /target
-/images
+/images
+/build
+/.idea
 
 # Files that might appear on external disk
 .Spotlight-V100
diff --git a/PlayerParticles.iml b/PlayerParticles.iml
new file mode 100644
index 0000000..559622e
--- /dev/null
+++ b/PlayerParticles.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="ExternalSystem" linkedProjectPath="$MODULE_DIR$/../UltimateTimber" rootProjectPath="$MODULE_DIR$/../UltimateTimber" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.14-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 623d3cf..881afd5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,9 +1,12 @@
 == UPDATING WILL DELETE YOUR CONFIG.YML ==
 * Create a backup of your config.yml if you wish to import all your old settings!
 === v6.4 (In progress) ===
++ Added support for Minecraft 1.14
++ Added effects: '', '', '', '', '', ''
 + Added setting 'gui-close-after-group-selected' to the config.yml
 + Added setting 'gui-presets-only' to the config.yml
 + Added Vietnamese translation file (vi_VN.lang)
+* Fixed '/pp add' item data parameter being ignored
 === v6.3 ===
 + Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
 + Added new styles 'popper', 'pulse', 'twins', 'whirl', and 'whirlwind'
diff --git a/pom.xml b/pom.xml
index 55ed5f7..7a48c4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <version>6.4</version>
   <name>PlayerParticles</name>
   <url>https://github.com/Esophose/PlayerParticles</url>
-  <description>Display particles around your player using customized styles and data!</description>
+  <description>Display particles around your player and blocks using customized styles and data!</description>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -31,7 +31,7 @@
         <version>3.1.0</version>
         <executions>
           <execution>
-          	<id>1.13</id>
+          	<id>shaded</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>
@@ -42,6 +42,7 @@
                   <include>com.zaxxer:HikariCP</include>
                   <include>org.slf4j:slf4j-api</include>
                   <include>org.slf4j:slf4j-nop</include>
+                  <include>com.googlecode.json-simple:json-simple</include>
                 </includes>
               </artifactSet>
               <filters>
@@ -54,115 +55,7 @@
                   </excludes>
                 </filter>
               </filters>
-              <outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.13\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
-            </configuration>
-          </execution>
-          <execution>
-          	<id>1.12</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.zaxxer:HikariCP</include>
-                  <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-nop</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.12\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
-            </configuration>
-          </execution>
-          <execution>
-          	<id>1.11</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.zaxxer:HikariCP</include>
-                  <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-nop</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.11\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
-            </configuration>
-          </execution>
-          <execution>
-          	<id>1.10</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.zaxxer:HikariCP</include>
-                  <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-nop</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.10\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
-            </configuration>
-          </execution>
-          <execution>
-          	<id>1.9</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.zaxxer:HikariCP</include>
-                  <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-nop</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <outputFile>C:\Users\Esophose\Desktop\Spigot Dev Servers\1.9\plugins\update\PlayerParticles v${project.version}.jar</outputFile>
+              <outputFile>./target/PlayerParticles_v${project.version}.jar</outputFile>
             </configuration>
           </execution>
         </executions>
@@ -200,10 +93,15 @@
       <artifactId>sqlite-jdbc</artifactId>
       <version>3.23.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1.1</version>
+    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.13.2-R0.1-SNAPSHOT</version>
+      <version>1.14-R0.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index b722790..4b72473 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -38,6 +38,7 @@ import com.esophose.playerparticles.manager.SettingManager;
 import com.esophose.playerparticles.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayerMovementListener;
 import com.esophose.playerparticles.styles.DefaultStyles;
+import com.esophose.playerparticles.updater.DataUpdater;
 import com.esophose.playerparticles.updater.PluginUpdateListener;
 import com.esophose.playerparticles.updater.Updater;
 import com.esophose.playerparticles.util.Metrics;
@@ -69,7 +70,7 @@ public class PlayerParticles extends JavaPlugin {
      * Executes essential tasks for starting up the plugin
      */
     public void onEnable() {
-        pluginInstance = (PlayerParticles)Bukkit.getServer().getPluginManager().getPlugin("PlayerParticles");
+        pluginInstance = (PlayerParticles) Bukkit.getServer().getPluginManager().getPlugin("PlayerParticles");
         
         this.registerCommands();
 
@@ -80,23 +81,23 @@ public class PlayerParticles extends JavaPlugin {
         pm.registerEvents(new PPlayerMovementListener(), this);
         pm.registerEvents(new PlayerChatHook(), this);
 
-        saveDefaultConfig();
+        this.saveDefaultConfig();
         double configVersion = PSetting.VERSION.getDouble();
-        double currentVersion = Double.parseDouble(getDescription().getVersion());
+        double currentVersion = Double.parseDouble(this.getDescription().getVersion());
         boolean updatePluginSettings = configVersion < currentVersion;
         if (updatePluginSettings) {
-            configureDatabase(PSetting.DATABASE_ENABLE.getBoolean());
+            this.configureDatabase(PSetting.DATABASE_ENABLE.getBoolean());
             DataUpdater.updateData(configVersion, currentVersion);
-            databaseConnector.closeConnection();
-            databaseConnector = null;
+            this.databaseConnector.closeConnection();
+            this.databaseConnector = null;
             
-            File configFile = new File(getDataFolder(), "config.yml");
+            File configFile = new File(this.getDataFolder(), "config.yml");
             if (configFile.exists()) {
                 configFile.delete();
             }
-            saveDefaultConfig();
-            reloadConfig();
-            getLogger().warning("The config.yml has been updated to v" + getDescription().getVersion() + "!");
+            this.saveDefaultConfig();
+            this.reloadConfig();
+            this.getLogger().warning("The config.yml has been updated to v" + this.getDescription().getVersion() + "!");
         }
 
         if (PSetting.CHECK_UPDATES.getBoolean()) {
@@ -127,7 +128,7 @@ public class PlayerParticles extends JavaPlugin {
      * Close all users with an open PlayerParticles GUI
      */
     public void onDisable() {
-        databaseConnector.closeConnection();
+        this.databaseConnector.closeConnection();
         GuiHandler.forceCloseAllOpenGUIs();
     }
     
@@ -154,18 +155,18 @@ public class PlayerParticles extends JavaPlugin {
         this.reloadConfig();
         
         // If not null, plugin is already loaded
-        if (particleTask != null) {
-            particleTask.cancel();
-            particleTask = null;
-            databaseConnector.closeConnection();
-            databaseConnector = null;
+        if (this.particleTask != null) {
+            this.particleTask.cancel();
+            this.particleTask = null;
+            this.databaseConnector.closeConnection();
+            this.databaseConnector = null;
             GuiHandler.forceCloseAllOpenGUIs();
         } else {
             DefaultStyles.registerStyles(); // Only ever load styles once
         }
         
         // This runs before the SettingManager is reloaded, the credentials will not be stored in memory for more than a few milliseconds
-        configureDatabase(PSetting.DATABASE_ENABLE.getBoolean());
+        this.configureDatabase(PSetting.DATABASE_ENABLE.getBoolean());
         DataUpdater.tryCreateTables();
         
         SettingManager.reload();
@@ -176,7 +177,7 @@ public class PlayerParticles extends JavaPlugin {
         PlayerChatHook.setup();
         
         ParticleManager.refreshData();
-        startParticleTask();
+        this.startParticleTask();
     }
 
     /**
@@ -194,7 +195,7 @@ public class PlayerParticles extends JavaPlugin {
      * @return The DatabaseConnector
      */
     public DatabaseConnector getDBConnector() {
-        return databaseConnector;
+        return this.databaseConnector;
     }
     
     /**
@@ -214,20 +215,19 @@ public class PlayerParticles extends JavaPlugin {
      */
     private void configureDatabase(boolean useMySql) {
         if (useMySql) {
-            databaseConnector = new MySqlDatabaseConnector();
+            this.databaseConnector = new MySqlDatabaseConnector();
         } else {
             try {
                 Class.forName("org.sqlite.JDBC"); // This is required to put here for Spigot 1.9 and 1.10 for some reason
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
             }
-            databaseConnector = new SqliteDatabaseConnector(this.getDataFolder().getAbsolutePath());
+            this.databaseConnector = new SqliteDatabaseConnector(this.getDataFolder().getAbsolutePath());
         }
 
-        if (!databaseConnector.isInitialized()) {
-            getLogger().severe("Unable to connect to the MySQL database! Is your login information correct? Falling back to SQLite database instead.");
-            configureDatabase(false);
-            return;
+        if (!this.databaseConnector.isInitialized()) {
+            this.getLogger().severe("Unable to connect to the MySQL database! Is your login information correct? Falling back to SQLite database instead.");
+            this.configureDatabase(false);
         }
     }
 
@@ -236,13 +236,10 @@ public class PlayerParticles extends JavaPlugin {
      * Run in the synchronous task so it starts after all plugins have loaded, including extensions
      */
     private void startParticleTask() {
-        final Plugin playerParticles = this;
-        new BukkitRunnable() {
-            public void run() {
-                long ticks = PSetting.TICKS_PER_PARTICLE.getLong();
-                particleTask = new ParticleManager().runTaskTimer(playerParticles, 5, ticks);
-            }
-        }.runTaskLater(playerParticles, 1);
+        Bukkit.getScheduler().runTaskLater(pluginInstance, () -> {
+            long ticks = PSetting.TICKS_PER_PARTICLE.getLong();
+            this.particleTask = new ParticleManager().runTaskTimer(pluginInstance, 5, ticks);
+        }, 1);
     }
 
 }
diff --git a/src/com/esophose/playerparticles/command/AddCommandModule.java b/src/com/esophose/playerparticles/command/AddCommandModule.java
index 88703ce..7426411 100644
--- a/src/com/esophose/playerparticles/command/AddCommandModule.java
+++ b/src/com/esophose/playerparticles/command/AddCommandModule.java
@@ -67,7 +67,7 @@ public class AddCommandModule implements CommandModule {
                     } else if (args[2].equalsIgnoreCase("random")) {
                         noteColorData = new NoteColor(98);
                     } else {
-                        int note = -1;
+                        int note;
                         try {
                             note = Integer.parseInt(args[2]);
                         } catch (Exception e) {
@@ -88,9 +88,7 @@ public class AddCommandModule implements CommandModule {
                     } else if (args[2].equalsIgnoreCase("random")) {
                         colorData = new OrdinaryColor(998, 998, 998);
                     } else {
-                        int r = -1;
-                        int g = -1;
-                        int b = -1;
+                        int r, g, b;
 
                         try {
                             r = Integer.parseInt(args[2]);
@@ -131,7 +129,7 @@ public class AddCommandModule implements CommandModule {
         }
         
         ParticleGroup group = pplayer.getActiveParticleGroup();
-        ParticlePair newParticle = new ParticlePair(pplayer.getUniqueId(), pplayer.getNextActiveParticleId(), effect, style, blockData, blockData, colorData, noteColorData);
+        ParticlePair newParticle = new ParticlePair(pplayer.getUniqueId(), pplayer.getNextActiveParticleId(), effect, style, itemData, blockData, colorData, noteColorData);
         group.getParticles().add(newParticle);
         DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
         
@@ -144,18 +142,18 @@ public class AddCommandModule implements CommandModule {
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
         Player p = pplayer.getPlayer();
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
 
         if (args.length <= 1) { // Effect name
             if (args.length == 0) matches = PermissionManager.getEffectNamesUserHasPermissionFor(p);
             else StringUtil.copyPartialMatches(args[0], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
         } else if (args.length == 2) { // Style name
             StringUtil.copyPartialMatches(args[1], PermissionManager.getStyleNamesUserHasPermissionFor(p), matches);
-        } else if (args.length >= 3) { // Data
+        } else { // Data
             ParticleEffect effect = ParticleEffect.fromName(args[0]);
             if (effect != null) {
                 if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                    List<String> possibleValues = new ArrayList<String>();
+                    List<String> possibleValues = new ArrayList<>();
                     if (effect == ParticleEffect.NOTE) { // Note data
                         if (args.length == 3) {
                             possibleValues.add("<0-24>");
@@ -178,9 +176,9 @@ public class AddCommandModule implements CommandModule {
                     StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
                 } else if (args.length == 3 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
                     if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) { // Block material
-                        matches = StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllBlockMaterials(), matches);
+                        StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllBlockMaterials(), matches);
                     } else if (effect == ParticleEffect.ITEM) { // Item material
-                        matches = StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllItemMaterials(), matches);
+                        StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllItemMaterials(), matches);
                     }
                 }
             }
diff --git a/src/com/esophose/playerparticles/command/CommandModule.java b/src/com/esophose/playerparticles/command/CommandModule.java
index cd0d57a..44be4b2 100644
--- a/src/com/esophose/playerparticles/command/CommandModule.java
+++ b/src/com/esophose/playerparticles/command/CommandModule.java
@@ -14,7 +14,7 @@ public interface CommandModule {
      * @param pplayer The PPlayer who executed this command
      * @param args The arguments to this command
      */
-    public void onCommandExecute(PPlayer pplayer, String[] args);
+    void onCommandExecute(PPlayer pplayer, String[] args);
 
     /**
      * Called when a player tries to tab complete this command
@@ -23,35 +23,35 @@ public interface CommandModule {
      * @param args Arguments typed so far
      * @return A list of possible argument values
      */
-    public List<String> onTabComplete(PPlayer pplayer, String[] args);
+    List<String> onTabComplete(PPlayer pplayer, String[] args);
 
     /**
      * Gets the name of this command
      * 
      * @return The name of this command
      */
-    public String getName();
+    String getName();
 
     /**
      * Gets the Lang description of this command
      * 
      * @return The description of this command
      */
-    public Lang getDescription();
+    Lang getDescription();
 
     /**
      * Gets any arguments this command has
      * 
      * @return The arguments this command has
      */
-    public String getArguments();
+    String getArguments();
 
     /**
      * True if this command requires the player to have any effects
      * 
      * @return If the player must have effects to use this command
      */
-    public boolean requiresEffects();
+    boolean requiresEffects();
     
     /**
      * Displays a command's usage to the player
@@ -59,7 +59,7 @@ public interface CommandModule {
      * @param pplayer The PPlayer to display the command usage to
      * @param command The command to display usage for
      */
-    public static void printUsage(PPlayer pplayer, CommandModule command) {
+    static void printUsage(PPlayer pplayer, CommandModule command) {
         LangManager.sendMessage(pplayer, Lang.COMMAND_DESCRIPTIONS_USAGE, command.getName(), command.getArguments());
     }
     
@@ -69,7 +69,7 @@ public interface CommandModule {
      * @param pplayer The PPlayer to display the command usage to
      * @param command The command to display usage for
      */
-    public static void printUsageWithDescription(PPlayer pplayer, CommandModule command) {
+    static void printUsageWithDescription(PPlayer pplayer, CommandModule command) {
         if (command.getArguments().length() == 0) {
             LangManager.sendSimpleMessage(pplayer, Lang.COMMAND_DESCRIPTIONS_HELP_1, command.getName(), LangManager.getText(command.getDescription()));
         } else {
diff --git a/src/com/esophose/playerparticles/command/CommandModuleSecondary.java b/src/com/esophose/playerparticles/command/CommandModuleSecondary.java
index 1f5040b..871c5a3 100644
--- a/src/com/esophose/playerparticles/command/CommandModuleSecondary.java
+++ b/src/com/esophose/playerparticles/command/CommandModuleSecondary.java
@@ -12,7 +12,7 @@ public interface CommandModuleSecondary {
      * @param sender The CommandSender who executed this command
      * @param args The arguments to this command
      */
-    public void onCommandExecute(CommandSender sender, String[] args);
+    void onCommandExecute(CommandSender sender, String[] args);
 
     /**
      * Called when a player tries to tab complete this command
@@ -21,6 +21,6 @@ public interface CommandModuleSecondary {
      * @param args Arguments typed so far
      * @return A list of possible argument values
      */
-    public List<String> onTabComplete(CommandSender sender, String[] args);
+    List<String> onTabComplete(CommandSender sender, String[] args);
 
 }
diff --git a/src/com/esophose/playerparticles/command/DataCommandModule.java b/src/com/esophose/playerparticles/command/DataCommandModule.java
index adf5c39..ef64757 100644
--- a/src/com/esophose/playerparticles/command/DataCommandModule.java
+++ b/src/com/esophose/playerparticles/command/DataCommandModule.java
@@ -43,7 +43,7 @@ public class DataCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
         if (args.length <= 1) {
             if (args.length == 0) matches = PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer());
             else StringUtil.copyPartialMatches(args[0], PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()), matches);
diff --git a/src/com/esophose/playerparticles/command/EditCommandModule.java b/src/com/esophose/playerparticles/command/EditCommandModule.java
index 19f9cea..17197c9 100644
--- a/src/com/esophose/playerparticles/command/EditCommandModule.java
+++ b/src/com/esophose/playerparticles/command/EditCommandModule.java
@@ -29,7 +29,7 @@ public class EditCommandModule implements CommandModule {
             return;
         }
         
-        int id = -1;
+        int id;
         try {
             id = Integer.parseInt(args[0]);
         } catch (Exception e) {
@@ -48,19 +48,17 @@ public class EditCommandModule implements CommandModule {
         }
         
         String[] cmdArgs = new String[args.length - 2];
-        for (int i = 2; i < args.length; i++) {
-            cmdArgs[i - 2] = args[i];
-        }
+        System.arraycopy(args, 2, cmdArgs, 0, args.length - 2);
         
         switch (args[1].toLowerCase()) {
         case "effect":
-            editEffect(pplayer, id, cmdArgs);
+            this.editEffect(pplayer, id, cmdArgs);
             break;
         case "style":
-            editStyle(pplayer, id, cmdArgs);
+            this.editStyle(pplayer, id, cmdArgs);
             break;
         case "data":
-            editData(pplayer, id, cmdArgs);
+            this.editData(pplayer, id, cmdArgs);
             break;
         default:
             LangManager.sendMessage(pplayer, Lang.EDIT_INVALID_PROPERTY, args[1]);
@@ -148,7 +146,7 @@ public class EditCommandModule implements CommandModule {
                 } else if (args[0].equalsIgnoreCase("random")) {
                     noteColorData = new NoteColor(98);
                 } else {
-                    int note = -1;
+                    int note;
                     try {
                         note = Integer.parseInt(args[0]);
                     } catch (Exception e) {
@@ -169,9 +167,7 @@ public class EditCommandModule implements CommandModule {
                 } else if (args[0].equalsIgnoreCase("random")) {
                     colorData = new OrdinaryColor(998, 998, 998);
                 } else {
-                    int r = -1;
-                    int g = -1;
-                    int b = -1;
+                    int r, g, b;
 
                     try {
                         r = Integer.parseInt(args[0]);
@@ -229,8 +225,8 @@ public class EditCommandModule implements CommandModule {
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
         Player p = pplayer.getPlayer();
-        List<String> matches = new ArrayList<String>();
-        List<String> ids = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
+        List<String> ids = new ArrayList<>();
         
         for (ParticlePair particles : pplayer.getActiveParticles())
             ids.add(String.valueOf(particles.getId()));
@@ -244,11 +240,11 @@ public class EditCommandModule implements CommandModule {
         int id = -1;
         try {
             id = Integer.parseInt(args[0]);
-        } catch (Exception e) { }
+        } catch (Exception ignored) { }
         
         if (pplayer.getActiveParticle(id) != null) {
             if (args.length == 2) {
-                List<String> possibleValues = new ArrayList<String>();
+                List<String> possibleValues = new ArrayList<>();
                 possibleValues.add("effect");
                 possibleValues.add("style");
                 possibleValues.add("data");
@@ -266,7 +262,7 @@ public class EditCommandModule implements CommandModule {
                 case "data":
                     ParticleEffect effect = pplayer.getActiveParticle(id).getEffect();
                     if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                        List<String> possibleValues = new ArrayList<String>();
+                        List<String> possibleValues = new ArrayList<>();
                         if (effect == ParticleEffect.NOTE) { // Note data
                             if (args.length == 3) {
                                 possibleValues.add("<0-24>");
@@ -289,9 +285,9 @@ public class EditCommandModule implements CommandModule {
                         StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
                     } else if (args.length == 3 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
                         if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) { // Block material
-                            matches = StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllBlockMaterials(), matches);
+                            StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllBlockMaterials(), matches);
                         } else if (effect == ParticleEffect.ITEM) { // Item material
-                            matches = StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllItemMaterials(), matches);
+                            StringUtil.copyPartialMatches(args[2], ParticleUtils.getAllItemMaterials(), matches);
                         }
                     }
                     break;
diff --git a/src/com/esophose/playerparticles/command/EffectsCommandModule.java b/src/com/esophose/playerparticles/command/EffectsCommandModule.java
index f682811..9f72d0d 100644
--- a/src/com/esophose/playerparticles/command/EffectsCommandModule.java
+++ b/src/com/esophose/playerparticles/command/EffectsCommandModule.java
@@ -21,20 +21,20 @@ public class EffectsCommandModule implements CommandModule {
             return;
         }
 
-        String toSend = "";
+        StringBuilder toSend = new StringBuilder();
         for (String name : effectList) {
-            toSend += name + ", ";
+            toSend.append(name).append(", ");
         }
         
-        if (toSend.endsWith(", ")) {
-            toSend = toSend.substring(0, toSend.length() - 2);
+        if (toSend.toString().endsWith(", ")) {
+            toSend = new StringBuilder(toSend.substring(0, toSend.length() - 2));
         }
 
-        LangManager.sendMessage(pplayer, Lang.EFFECT_LIST, toSend);
+        LangManager.sendMessage(pplayer, Lang.EFFECT_LIST, toSend.toString());
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/FixedCommandModule.java b/src/com/esophose/playerparticles/command/FixedCommandModule.java
index c432a1b..da07c93 100644
--- a/src/com/esophose/playerparticles/command/FixedCommandModule.java
+++ b/src/com/esophose/playerparticles/command/FixedCommandModule.java
@@ -52,28 +52,26 @@ public class FixedCommandModule implements CommandModule {
         String cmd = args[0];
 
         String[] cmdArgs = new String[args.length - 1];
-        for (int i = 1; i < args.length; i++) {
-            cmdArgs[i - 1] = args[i];
-        }
-        
+        System.arraycopy(args, 1, cmdArgs, 0, args.length - 1);
+
         switch (cmd.toLowerCase()) {
         case "create":
-            handleCreate(pplayer, p, cmdArgs);
+            this.handleCreate(pplayer, p, cmdArgs);
             return;
         case "edit":
-            handleEdit(pplayer, p, cmdArgs);
+            this.handleEdit(pplayer, p, cmdArgs);
             return;
         case "remove":
-            handleRemove(pplayer, p, cmdArgs);
+            this.handleRemove(pplayer, p, cmdArgs);
             return;
         case "list":
-            handleList(pplayer, p, cmdArgs);
+            this.handleList(pplayer, p, cmdArgs);
             return;
         case "info":
-            handleInfo(pplayer, p, cmdArgs);
+            this.handleInfo(pplayer, p, cmdArgs);
             return;
         case "clear":
-            handleClear(pplayer, p, cmdArgs);
+            this.handleClear(pplayer, p, cmdArgs);
             return;
         default:
             LangManager.sendMessage(pplayer, Lang.FIXED_INVALID_COMMAND);
@@ -85,10 +83,10 @@ public class FixedCommandModule implements CommandModule {
             LangManager.sendMessage(pplayer, Lang.COMMAND_DESCRIPTION_FIXED_CLEAR);
         }
     }
-    
+
     /**
      * Handles the command /pp fixed create
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -105,29 +103,28 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        double xPos = -1, yPos = -1, zPos = -1;
-        
+        double xPos, yPos, zPos;
+
         if (args[0].equalsIgnoreCase("looking")) {
-            Block targetBlock = p.getTargetBlock((Set<Material>)null, 8);
+            Block targetBlock = p.getTargetBlock(null, 8);
             int maxDistanceSqrd = 6 * 6;
             if (targetBlock.getLocation().distanceSquared(p.getLocation()) > maxDistanceSqrd) {
                 LangManager.sendMessage(pplayer, Lang.FIXED_CREATE_LOOKING_TOO_FAR);
                 return;
             }
-            
+
             Location blockLocation = targetBlock.getLocation().clone().add(0.5, 0.5, 0.5); // Center of block
-            
+
             xPos = blockLocation.getX();
             yPos = blockLocation.getY();
             zPos = blockLocation.getZ();
-            
+
             // Pad the args with the coordinates so we don't have to adjust all the indices
             String[] paddedArgs = new String[args.length + 2];
             paddedArgs[0] = String.valueOf(xPos);
             paddedArgs[1] = String.valueOf(yPos);
             paddedArgs[2] = String.valueOf(zPos);
-            for (int i = 1; i < args.length; i++)
-                paddedArgs[i + 2] = args[i];
+            System.arraycopy(args, 1, paddedArgs, 3, args.length - 1);
             args = paddedArgs;
         } else {
             try {
@@ -200,7 +197,7 @@ public class FixedCommandModule implements CommandModule {
                     } else if (args[5].equalsIgnoreCase("random")) {
                         noteColorData = new NoteColor(98);
                     } else {
-                        int note = -1;
+                        int note;
                         try {
                             note = Integer.parseInt(args[5]);
                         } catch (Exception e) {
@@ -221,9 +218,7 @@ public class FixedCommandModule implements CommandModule {
                     } else if (args[5].equalsIgnoreCase("random")) {
                         colorData = new OrdinaryColor(998, 998, 998);
                     } else {
-                        int r = -1;
-                        int g = -1;
-                        int b = -1;
+                        int r, g, b;
 
                         try {
                             r = Integer.parseInt(args[5]);
@@ -244,7 +239,7 @@ public class FixedCommandModule implements CommandModule {
                 }
             } else if (effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
                 if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
-                    Material material = null;
+                    Material material;
                     try {
                         material = ParticleUtils.closestMatch(args[5]);
                         if (material == null) material = Material.matchMaterial(args[5]);
@@ -256,7 +251,7 @@ public class FixedCommandModule implements CommandModule {
 
                     blockData = material;
                 } else if (effect == ParticleEffect.ITEM) {
-                    Material material = null;
+                    Material material;
                     try {
                         material = ParticleUtils.closestMatch(args[5]);
                         if (material == null) material = Material.matchMaterial(args[5]);
@@ -278,10 +273,10 @@ public class FixedCommandModule implements CommandModule {
         LangManager.sendMessage(pplayer, Lang.FIXED_CREATE_SUCCESS);
         DataManager.saveFixedEffect(fixedEffect);
     }
-    
+
     /**
      * Handles the command /pp fixed edit
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -291,202 +286,207 @@ public class FixedCommandModule implements CommandModule {
             LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_MISSING_ARGS);
             return;
         }
-        
-        int id = -1;
+
+        int id;
         try {
             id = Integer.parseInt(args[0]);
         } catch (Exception ex) {
             LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_ID);
             return;
         }
-        
+
         FixedParticleEffect fixedEffect = pplayer.getFixedEffectById(id);
         if (fixedEffect == null) {
             LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_ID);
             return;
         }
-        
+
         String editType = args[1].toLowerCase();
-        if (editType.equals("location")) {
-            double xPos = -1, yPos = -1, zPos = -1;
-            
-            if (args[2].equalsIgnoreCase("looking")) {
-                Block targetBlock = p.getTargetBlock((Set<Material>)null, 8);
-                int maxDistanceSqrd = 6 * 6;
-                if (targetBlock.getLocation().distanceSquared(p.getLocation()) > maxDistanceSqrd) {
-                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_LOOKING_TOO_FAR);
+        switch (editType) {
+            case "location":
+                double xPos, yPos, zPos;
+
+                if (args[2].equalsIgnoreCase("looking")) {
+                    Block targetBlock = p.getTargetBlock(null, 8);
+                    int maxDistanceSqrd = 6 * 6;
+                    if (targetBlock.getLocation().distanceSquared(p.getLocation()) > maxDistanceSqrd) {
+                        LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_LOOKING_TOO_FAR);
+                        return;
+                    }
+
+                    Location blockLocation = targetBlock.getLocation().clone().add(0.5, 0.5, 0.5); // Center of block
+
+                    xPos = blockLocation.getX();
+                    yPos = blockLocation.getY();
+                    zPos = blockLocation.getZ();
+                } else {
+                    try {
+                        if (args[2].startsWith("~")) {
+                            if (args[2].equals("~")) xPos = p.getLocation().getX();
+                            else xPos = p.getLocation().getX() + Double.parseDouble(args[2].substring(1));
+                        } else {
+                            xPos = Double.parseDouble(args[2]);
+                        }
+
+                        if (args[3].startsWith("~")) {
+                            if (args[3].equals("~")) yPos = p.getLocation().getY() + 1;
+                            else yPos = p.getLocation().getY() + 1 + Double.parseDouble(args[3].substring(1));
+                        } else {
+                            yPos = Double.parseDouble(args[3]);
+                        }
+
+                        if (args[4].startsWith("~")) {
+                            if (args[4].equals("~")) zPos = p.getLocation().getZ();
+                            else zPos = p.getLocation().getZ() + Double.parseDouble(args[4].substring(1));
+                        } else {
+                            zPos = Double.parseDouble(args[4]);
+                        }
+                    } catch (Exception e) {
+                        LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_COORDS);
+                        return;
+                    }
+                }
+
+                double distanceFromEffect = p.getLocation().distance(new Location(p.getWorld(), xPos, yPos, zPos));
+                int maxCreationDistance = PermissionManager.getMaxFixedEffectCreationDistance();
+                if (maxCreationDistance != 0 && distanceFromEffect > maxCreationDistance) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_OUT_OF_RANGE, maxCreationDistance);
                     return;
                 }
-                
-                Location blockLocation = targetBlock.getLocation().clone().add(0.5, 0.5, 0.5); // Center of block
-                
-                xPos = blockLocation.getX();
-                yPos = blockLocation.getY();
-                zPos = blockLocation.getZ();
-            } else {
-                try {
-                    if (args[2].startsWith("~")) {
-                        if (args[2].equals("~")) xPos = p.getLocation().getX();
-                        else xPos = p.getLocation().getX() + Double.parseDouble(args[2].substring(1));
-                    } else {
-                        xPos = Double.parseDouble(args[2]);
-                    }
 
-                    if (args[3].startsWith("~")) {
-                        if (args[3].equals("~")) yPos = p.getLocation().getY() + 1;
-                        else yPos = p.getLocation().getY() + 1 + Double.parseDouble(args[3].substring(1));
-                    } else {
-                        yPos = Double.parseDouble(args[3]);
-                    }
-
-                    if (args[4].startsWith("~")) {
-                        if (args[4].equals("~")) zPos = p.getLocation().getZ();
-                        else zPos = p.getLocation().getZ() + Double.parseDouble(args[4].substring(1));
-                    } else {
-                        zPos = Double.parseDouble(args[4]);
-                    }
-                } catch (Exception e) {
-                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_COORDS);
+                fixedEffect.setCoordinates(xPos, yPos, zPos);
+                break;
+            case "effect": {
+                ParticleEffect effect = ParticleEffect.fromName(args[2]);
+                if (effect == null) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_EFFECT_INVALID, args[2]);
+                    return;
+                } else if (!PermissionManager.hasEffectPermission(pplayer.getPlayer(), effect)) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_EFFECT_NO_PERMISSION, effect.getName());
                     return;
                 }
-            }
 
-            double distanceFromEffect = p.getLocation().distance(new Location(p.getWorld(), xPos, yPos, zPos));
-            int maxCreationDistance = PermissionManager.getMaxFixedEffectCreationDistance();
-            if (maxCreationDistance != 0 && distanceFromEffect > maxCreationDistance) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_OUT_OF_RANGE, maxCreationDistance);
-                return;
+                fixedEffect.getParticlePair().setEffect(effect);
+                break;
             }
-            
-            fixedEffect.setCoordinates(xPos, yPos, zPos);
-        } else if (editType.equals("effect")) {
-            ParticleEffect effect = ParticleEffect.fromName(args[2]);
-            if (effect == null) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_EFFECT_INVALID, args[2]);
-                return;
-            } else if (!PermissionManager.hasEffectPermission(pplayer.getPlayer(), effect)) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_EFFECT_NO_PERMISSION, effect.getName());
-                return;
-            }
-            
-            fixedEffect.getParticlePair().setEffect(effect);
-        } else if (editType.equals("style")) {
-            ParticleStyle style = ParticleStyle.fromName(args[2]);
-            if (style == null) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_INVALID, args[2]);
-                return;
-            } else if (!PermissionManager.hasStylePermission(pplayer.getPlayer(), style)) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_NO_PERMISSION, style.getName());
-                return;
-            } else if (!style.canBeFixed()) {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_NON_FIXABLE, style.getName());
-                return;
-            }
-            
-            fixedEffect.getParticlePair().setStyle(style);
-        } else if (editType.equals("data")) {
-            Material itemData = null;
-            Material blockData = null;
-            OrdinaryColor colorData = null;
-            NoteColor noteColorData = null;
-            
-            ParticleEffect effect = fixedEffect.getParticlePair().getEffect();
-            if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                if (effect == ParticleEffect.NOTE) {
-                    if (args[2].equalsIgnoreCase("rainbow")) {
-                        noteColorData = new NoteColor(99);
-                    } else if (args[2].equalsIgnoreCase("random")) {
-                        noteColorData = new NoteColor(98);
+            case "style":
+                ParticleStyle style = ParticleStyle.fromName(args[2]);
+                if (style == null) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_INVALID, args[2]);
+                    return;
+                } else if (!PermissionManager.hasStylePermission(pplayer.getPlayer(), style)) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_NO_PERMISSION, style.getName());
+                    return;
+                } else if (!style.canBeFixed()) {
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_STYLE_NON_FIXABLE, style.getName());
+                    return;
+                }
+
+                fixedEffect.getParticlePair().setStyle(style);
+                break;
+            case "data": {
+                Material itemData = null;
+                Material blockData = null;
+                OrdinaryColor colorData = null;
+                NoteColor noteColorData = null;
+
+                ParticleEffect effect = fixedEffect.getParticlePair().getEffect();
+                if (effect.hasProperty(ParticleProperty.COLORABLE)) {
+                    if (effect == ParticleEffect.NOTE) {
+                        if (args[2].equalsIgnoreCase("rainbow")) {
+                            noteColorData = new NoteColor(99);
+                        } else if (args[2].equalsIgnoreCase("random")) {
+                            noteColorData = new NoteColor(98);
+                        } else {
+                            int note;
+                            try {
+                                note = Integer.parseInt(args[2]);
+                            } catch (Exception e) {
+                                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
+                                return;
+                            }
+
+                            if (note < 0 || note > 24) {
+                                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
+                                return;
+                            }
+
+                            noteColorData = new NoteColor(note);
+                        }
                     } else {
-                        int note = -1;
+                        if (args[2].equalsIgnoreCase("rainbow")) {
+                            colorData = new OrdinaryColor(999, 999, 999);
+                        } else if (args[2].equalsIgnoreCase("random")) {
+                            colorData = new OrdinaryColor(998, 998, 998);
+                        } else {
+                            int r, g, b;
+
+                            try {
+                                r = Integer.parseInt(args[2]);
+                                g = Integer.parseInt(args[3]);
+                                b = Integer.parseInt(args[4]);
+                            } catch (Exception e) {
+                                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
+                                return;
+                            }
+
+                            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
+                                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
+                                return;
+                            }
+
+                            colorData = new OrdinaryColor(r, g, b);
+                        }
+                    }
+                } else if (effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+                    if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
+                        Material material;
                         try {
-                            note = Integer.parseInt(args[2]);
+                            material = ParticleUtils.closestMatch(args[2]);
+                            if (material == null) material = Material.matchMaterial(args[2]);
+                            if (material == null || !material.isBlock()) throw new Exception();
                         } catch (Exception e) {
                             LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
                             return;
                         }
 
-                        if (note < 0 || note > 24) {
+                        blockData = material;
+                    } else if (effect == ParticleEffect.ITEM) {
+                        Material material;
+                        try {
+                            material = ParticleUtils.closestMatch(args[2]);
+                            if (material == null) material = Material.matchMaterial(args[2]);
+                            if (material == null || material.isBlock()) throw new Exception();
+                        } catch (Exception e) {
                             LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
                             return;
                         }
 
-                        noteColorData = new NoteColor(note);
+                        itemData = material;
                     }
                 } else {
-                    if (args[2].equalsIgnoreCase("rainbow")) {
-                        colorData = new OrdinaryColor(999, 999, 999);
-                    } else if (args[2].equalsIgnoreCase("random")) {
-                        colorData = new OrdinaryColor(998, 998, 998);
-                    } else {
-                        int r = -1;
-                        int g = -1;
-                        int b = -1;
-
-                        try {
-                            r = Integer.parseInt(args[2]);
-                            g = Integer.parseInt(args[3]);
-                            b = Integer.parseInt(args[4]);
-                        } catch (Exception e) {
-                            LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
-                            return;
-                        }
-
-                        if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
-                            LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
-                            return;
-                        }
-
-                        colorData = new OrdinaryColor(r, g, b);
-                    }
+                    LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_NONE);
+                    return;
                 }
-            } else if (effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
-                if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
-                    Material material = null;
-                    try {
-                        material = ParticleUtils.closestMatch(args[2]);
-                        if (material == null) material = Material.matchMaterial(args[2]);
-                        if (material == null || !material.isBlock()) throw new Exception();
-                    } catch (Exception e) {
-                        LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
-                        return;
-                    }
 
-                    blockData = material;
-                } else if (effect == ParticleEffect.ITEM) {
-                    Material material = null;
-                    try {
-                        material = ParticleUtils.closestMatch(args[2]);
-                        if (material == null) material = Material.matchMaterial(args[2]);
-                        if (material == null || material.isBlock()) throw new Exception();
-                    } catch (Exception e) {
-                        LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_ERROR);
-                        return;
-                    }
-
-                    itemData = material;
-                }
-            } else {
-                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_DATA_NONE);
-                return;
+                fixedEffect.getParticlePair().setColor(colorData);
+                fixedEffect.getParticlePair().setNoteColor(noteColorData);
+                fixedEffect.getParticlePair().setItemMaterial(itemData);
+                fixedEffect.getParticlePair().setBlockMaterial(blockData);
+                break;
             }
-            
-            fixedEffect.getParticlePair().setColor(colorData);
-            fixedEffect.getParticlePair().setNoteColor(noteColorData);
-            fixedEffect.getParticlePair().setItemMaterial(itemData);
-            fixedEffect.getParticlePair().setBlockMaterial(blockData);
-        } else {
-            LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_PROPERTY);
-            return;
+            default:
+                LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_INVALID_PROPERTY);
+                return;
         }
-        
+
         DataManager.updateFixedEffect(fixedEffect);
         LangManager.sendMessage(pplayer, Lang.FIXED_EDIT_SUCCESS, editType, id);
     }
-    
+
     /**
      * Handles the command /pp fixed remove
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -497,7 +497,7 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        int id = -1;
+        int id;
         try {
             id = Integer.parseInt(args[0]);
         } catch (Exception e) {
@@ -512,10 +512,10 @@ public class FixedCommandModule implements CommandModule {
             LangManager.sendMessage(pplayer, Lang.FIXED_REMOVE_INVALID, id);
         }
     }
-    
+
     /**
      * Handles the command /pp fixed list
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -529,20 +529,20 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        String msg = "";
+        StringBuilder msg = new StringBuilder();
         boolean first = true;
         for (int id : ids) {
-            if (!first) msg += ", ";
+            if (!first) msg.append(", ");
             else first = false;
-            msg += id;
+            msg.append(id);
         }
 
-        LangManager.sendMessage(pplayer, Lang.FIXED_LIST_SUCCESS, msg);
+        LangManager.sendMessage(pplayer, Lang.FIXED_LIST_SUCCESS, msg.toString());
     }
-    
+
     /**
      * Handles the command /pp fixed info
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -553,7 +553,7 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        int id = -1;
+        int id;
         try {
             id = Integer.parseInt(args[0]);
         } catch (Exception e) {
@@ -570,7 +570,7 @@ public class FixedCommandModule implements CommandModule {
         ParticlePair particle = fixedEffect.getParticlePair();
 
         DecimalFormat df = new DecimalFormat("0.##"); // Decimal formatter so the coords aren't super long
-        LangManager.sendMessage(pplayer, // @formatter:off
+        LangManager.sendMessage(pplayer,
                                 Lang.FIXED_INFO_SUCCESS,
                                 fixedEffect.getId(),
                                 fixedEffect.getLocation().getWorld().getName(),
@@ -580,12 +580,12 @@ public class FixedCommandModule implements CommandModule {
                                 particle.getEffect().getName(),
                                 particle.getStyle().getName(),
                                 particle.getDataString()
-                               ); // @formatter:on
+                               );
     }
-    
+
     /**
      * Handles the command /pp fixed clear
-     * 
+     *
      * @param pplayer The PPlayer
      * @param p The Player
      * @param args The command arguments
@@ -601,7 +601,7 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        int radius = -1;
+        int radius;
         try {
             radius = Math.abs(Integer.parseInt(args[0]));
         } catch (Exception e) {
@@ -609,11 +609,11 @@ public class FixedCommandModule implements CommandModule {
             return;
         }
 
-        ArrayList<FixedParticleEffect> fixedEffectsToRemove = new ArrayList<FixedParticleEffect>();
+        ArrayList<FixedParticleEffect> fixedEffectsToRemove = new ArrayList<>();
 
         for (PPlayer ppl : ParticleManager.getPPlayers())
             for (FixedParticleEffect fixedEffect : ppl.getFixedParticles())
-                if (fixedEffect.getLocation().getWorld().equals(p.getLocation().getWorld()) && fixedEffect.getLocation().distance(p.getLocation()) <= radius) 
+                if (fixedEffect.getLocation().getWorld().equals(p.getLocation().getWorld()) && fixedEffect.getLocation().distance(p.getLocation()) <= radius)
                     fixedEffectsToRemove.add(fixedEffect);
 
         for (FixedParticleEffect fixedEffect : fixedEffectsToRemove)
@@ -624,160 +624,156 @@ public class FixedCommandModule implements CommandModule {
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
         Player p = pplayer.getPlayer();
-        List<String> matches = new ArrayList<String>();
-        String[] subCommands = new String[] { "create", "edit", "remove", "list", "info", "clear" };
-        
+        List<String> matches = new ArrayList<>();
+
         if (args.length <= 1) {
-            List<String> possibleCmds = new ArrayList<String>(Arrays.asList(subCommands));
+            List<String> possibleCmds = new ArrayList<>(Arrays.asList("create", "edit", "remove", "list", "info", "clear"));
             if (args.length == 0) matches = possibleCmds;
             else StringUtil.copyPartialMatches(args[0], possibleCmds, matches);
         } else {
             switch (args[0].toLowerCase()) {
-            case "create":
-                if (args.length >= 2 && args.length <= 4) {
-                    List<String> possibleValues = new ArrayList<String>();
-                    if (args.length == 4) {
-                        possibleValues.add("~");
-                    }
-                    if (args.length == 3) {
-                        possibleValues.add("~ ~");
-                    }
-                    if (args.length == 2) {
-                        possibleValues.add("~ ~ ~");
-                        possibleValues.add("looking");
-                    }
-                    StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
-                }
-
-                // Pad arguments if the first coordinate is "looking"
-                if (args.length > 1 && args[1].equalsIgnoreCase("looking")) {
-                    String[] paddedArgs = new String[args.length + 2];
-                    paddedArgs[0] = paddedArgs[1] = paddedArgs[2] = paddedArgs[3] = "";
-                    for (int i = 2; i < args.length; i++)
-                        paddedArgs[i + 2] = args[i];
-                    args = paddedArgs;
-                }
-                
-                if (args.length == 5) {
-                    StringUtil.copyPartialMatches(args[4], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
-                } else if (args.length == 6) {
-                    StringUtil.copyPartialMatches(args[5], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
-                } else if (args.length >= 7) {
-                    ParticleEffect effect = ParticleEffect.fromName(args[4]);
-                    if (effect != null) {
-                        if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                            List<String> possibleValues = new ArrayList<String>();
-                            if (effect == ParticleEffect.NOTE) { // Note data
-                                if (args.length == 7) {
-                                    possibleValues.add("<0-24>");
-                                    possibleValues.add("rainbow");
-                                    possibleValues.add("random");
-                                }
-                            } else { // Color data
-                                if (args.length <= 9 && !args[2].equalsIgnoreCase("rainbow") && !args[2].equalsIgnoreCase("random")) {
-                                    possibleValues.add("<0-255>");
-                                }
-                                if (args.length <= 8 && !args[2].equalsIgnoreCase("rainbow") && !args[2].equalsIgnoreCase("random")) {
-                                    possibleValues.add("<0-255> <0-255>");
-                                }
-                                if (args.length <= 7) {
-                                    possibleValues.add("<0-255> <0-255> <0-255>");
-                                    possibleValues.add("rainbow");
-                                    possibleValues.add("random");
-                                }
-                            }
-                            StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
-                        } else if (args.length == 7 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
-                            if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) { // Block material
-                                matches = StringUtil.copyPartialMatches(args[6], ParticleUtils.getAllBlockMaterials(), matches);
-                            } else if (effect == ParticleEffect.ITEM) { // Item material
-                                matches = StringUtil.copyPartialMatches(args[6], ParticleUtils.getAllItemMaterials(), matches);
-                            }
-                        }
-                    }
-                }
-                break;
-            case "edit":
-                if (args.length == 2) {
-                    StringUtil.copyPartialMatches(args[1], pplayer.getFixedEffectIds().stream().map((x) -> String.valueOf(x)).collect(Collectors.toList()), matches);
-                } else if (args.length == 3) {
-                    String[] validProperties = new String[] { "location", "effect", "style", "data" };
-                    StringUtil.copyPartialMatches(args[2], Arrays.asList(validProperties), matches);
-                } else if (args.length > 3) {
-                    String property = args[2].toLowerCase();
-                    if (property.equals("location")) {
-                        List<String> possibleValues = new ArrayList<String>();
-                        if (args.length == 6 && !args[3].equalsIgnoreCase("looking")) {
+                case "create":
+                    if (args.length <= 4) {
+                        List<String> possibleValues = new ArrayList<>();
+                        if (args.length == 4) {
                             possibleValues.add("~");
                         }
-                        if (args.length == 5 && !args[3].equalsIgnoreCase("looking")) {
+                        if (args.length == 3) {
                             possibleValues.add("~ ~");
                         }
-                        if (args.length == 4) {
+                        if (args.length == 2) {
                             possibleValues.add("~ ~ ~");
                             possibleValues.add("looking");
                         }
                         StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
-                    } else if (property.equals("effect") && args.length == 4) {
-                        StringUtil.copyPartialMatches(args[3], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
-                    } else if (property.equals("style") && args.length == 4) {
-                        StringUtil.copyPartialMatches(args[3], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
-                    } else if (property.equals("data")) {
-                        int id = -1;
-                        try {
-                            id = Integer.parseInt(args[1]);
-                        } catch (Exception e) { }
-                        
-                        FixedParticleEffect fixedEffect = pplayer.getFixedEffectById(id);
-                        if (fixedEffect != null) {
-                            ParticleEffect effect = fixedEffect.getParticlePair().getEffect();
+                    }
+
+                    // Pad arguments if the first coordinate is "looking"
+                    if (args[1].equalsIgnoreCase("looking")) {
+                        String[] paddedArgs = new String[args.length + 2];
+                        paddedArgs[0] = paddedArgs[1] = paddedArgs[2] = paddedArgs[3] = "";
+                        System.arraycopy(args, 2, paddedArgs, 4, args.length - 2);
+                        args = paddedArgs;
+                    }
+
+                    if (args.length == 5) {
+                        StringUtil.copyPartialMatches(args[4], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
+                    } else if (args.length == 6) {
+                        StringUtil.copyPartialMatches(args[5], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
+                    } else if (args.length >= 7) {
+                        ParticleEffect effect = ParticleEffect.fromName(args[4]);
+                        if (effect != null) {
                             if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                                List<String> possibleValues = new ArrayList<String>();
+                                List<String> possibleValues = new ArrayList<>();
                                 if (effect == ParticleEffect.NOTE) { // Note data
-                                    if (args.length == 4) {
+                                    if (args.length == 7) {
                                         possibleValues.add("<0-24>");
                                         possibleValues.add("rainbow");
                                         possibleValues.add("random");
                                     }
                                 } else { // Color data
-                                    if (args.length == 6 && !args[3].equalsIgnoreCase("rainbow") && !args[3].equalsIgnoreCase("random")) {
+                                    if (args.length <= 9 && !args[2].equalsIgnoreCase("rainbow") && !args[2].equalsIgnoreCase("random")) {
                                         possibleValues.add("<0-255>");
                                     }
-                                    if (args.length == 5 && !args[3].equalsIgnoreCase("rainbow") && !args[3].equalsIgnoreCase("random")) {
+                                    if (args.length <= 8 && !args[2].equalsIgnoreCase("rainbow") && !args[2].equalsIgnoreCase("random")) {
                                         possibleValues.add("<0-255> <0-255>");
                                     }
-                                    if (args.length == 4) {
+                                    if (args.length <= 7) {
                                         possibleValues.add("<0-255> <0-255> <0-255>");
                                         possibleValues.add("rainbow");
                                         possibleValues.add("random");
                                     }
                                 }
                                 StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
-                            } else if (args.length == 4 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+                            } else if (args.length == 7 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
                                 if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) { // Block material
-                                    matches = StringUtil.copyPartialMatches(args[3], ParticleUtils.getAllBlockMaterials(), matches);
+                                    StringUtil.copyPartialMatches(args[6], ParticleUtils.getAllBlockMaterials(), matches);
                                 } else if (effect == ParticleEffect.ITEM) { // Item material
-                                    matches = StringUtil.copyPartialMatches(args[3], ParticleUtils.getAllItemMaterials(), matches);
+                                    StringUtil.copyPartialMatches(args[6], ParticleUtils.getAllItemMaterials(), matches);
                                 }
                             }
                         }
                     }
-                }
-                break;
-            case "remove":
-                StringUtil.copyPartialMatches(args[1], pplayer.getFixedEffectIds().stream().map((x) -> String.valueOf(x)).collect(Collectors.toList()), matches);
-                break;
-            case "list":
-                break;
-            case "info":
-                StringUtil.copyPartialMatches(args[1], pplayer.getFixedEffectIds().stream().map((x) -> String.valueOf(x)).collect(Collectors.toList()), matches);
-                break;
-            case "clear":
-                matches.add("<radius>");
-                break;
+                    break;
+                case "edit":
+                    if (args.length == 2) {
+                        StringUtil.copyPartialMatches(args[1], pplayer.getFixedEffectIds().stream().map(String::valueOf).collect(Collectors.toList()), matches);
+                    } else if (args.length == 3) {
+                        String[] validProperties = new String[] { "location", "effect", "style", "data" };
+                        StringUtil.copyPartialMatches(args[2], Arrays.asList(validProperties), matches);
+                    } else {
+                        String property = args[2].toLowerCase();
+                        if (property.equals("location")) {
+                            List<String> possibleValues = new ArrayList<String>();
+                            if (args.length == 6 && !args[3].equalsIgnoreCase("looking")) {
+                                possibleValues.add("~");
+                            }
+                            if (args.length == 5 && !args[3].equalsIgnoreCase("looking")) {
+                                possibleValues.add("~ ~");
+                            }
+                            if (args.length == 4) {
+                                possibleValues.add("~ ~ ~");
+                                possibleValues.add("looking");
+                            }
+                            StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
+                        } else if (property.equals("effect") && args.length == 4) {
+                            StringUtil.copyPartialMatches(args[3], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
+                        } else if (property.equals("style") && args.length == 4) {
+                            StringUtil.copyPartialMatches(args[3], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
+                        } else if (property.equals("data")) {
+                            int id = -1;
+                            try {
+                                id = Integer.parseInt(args[1]);
+                            } catch (Exception e) { }
+
+                            FixedParticleEffect fixedEffect = pplayer.getFixedEffectById(id);
+                            if (fixedEffect != null) {
+                                ParticleEffect effect = fixedEffect.getParticlePair().getEffect();
+                                if (effect.hasProperty(ParticleProperty.COLORABLE)) {
+                                    List<String> possibleValues = new ArrayList<>();
+                                    if (effect == ParticleEffect.NOTE) { // Note data
+                                        if (args.length == 4) {
+                                            possibleValues.add("<0-24>");
+                                            possibleValues.add("rainbow");
+                                            possibleValues.add("random");
+                                        }
+                                    } else { // Color data
+                                        if (args.length == 6 && !args[3].equalsIgnoreCase("rainbow") && !args[3].equalsIgnoreCase("random")) {
+                                            possibleValues.add("<0-255>");
+                                        }
+                                        if (args.length == 5 && !args[3].equalsIgnoreCase("rainbow") && !args[3].equalsIgnoreCase("random")) {
+                                            possibleValues.add("<0-255> <0-255>");
+                                        }
+                                        if (args.length == 4) {
+                                            possibleValues.add("<0-255> <0-255> <0-255>");
+                                            possibleValues.add("rainbow");
+                                            possibleValues.add("random");
+                                        }
+                                    }
+                                    StringUtil.copyPartialMatches(args[args.length - 1], possibleValues, matches);
+                                } else if (args.length == 4 && effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+                                    if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) { // Block material
+                                        StringUtil.copyPartialMatches(args[3], ParticleUtils.getAllBlockMaterials(), matches);
+                                    } else if (effect == ParticleEffect.ITEM) { // Item material
+                                        StringUtil.copyPartialMatches(args[3], ParticleUtils.getAllItemMaterials(), matches);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case "remove":
+                case "info":
+                    StringUtil.copyPartialMatches(args[1], pplayer.getFixedEffectIds().stream().map(String::valueOf).collect(Collectors.toList()), matches);
+                    break;
+                case "clear":
+                    matches.add("<radius>");
+                    break;
+                case "list":
+                    break;
             }
         }
-        
+
         return matches;
     }
 
diff --git a/src/com/esophose/playerparticles/command/GUICommandModule.java b/src/com/esophose/playerparticles/command/GUICommandModule.java
index 6560a28..0997672 100644
--- a/src/com/esophose/playerparticles/command/GUICommandModule.java
+++ b/src/com/esophose/playerparticles/command/GUICommandModule.java
@@ -43,7 +43,7 @@ public class GUICommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/GroupCommandModule.java b/src/com/esophose/playerparticles/command/GroupCommandModule.java
index 1c6251e..0a3b8a7 100644
--- a/src/com/esophose/playerparticles/command/GroupCommandModule.java
+++ b/src/com/esophose/playerparticles/command/GroupCommandModule.java
@@ -20,7 +20,7 @@ import com.esophose.playerparticles.particles.ParticlePair;
 public class GroupCommandModule implements CommandModule {
 
     public void onCommandExecute(PPlayer pplayer, String[] args) {
-        List<String> validCommands = Arrays.asList(new String[] { "save", "load", "remove", "info", "list" });
+        List<String> validCommands = Arrays.asList("save", "load", "remove", "info", "list");
         if (args.length == 0 || !validCommands.contains(args[0])) {
             LangManager.sendMessage(pplayer, Lang.COMMAND_DESCRIPTION_GROUP_SAVE);
             LangManager.sendMessage(pplayer, Lang.COMMAND_DESCRIPTION_GROUP_LOAD);
@@ -37,19 +37,19 @@ public class GroupCommandModule implements CommandModule {
 
         switch (args[0].toLowerCase()) {
         case "save":
-            onSave(pplayer, args[1].toLowerCase());
+            this.onSave(pplayer, args[1].toLowerCase());
             break;
         case "load":
-            onLoad(pplayer, args[1].toLowerCase());
+            this.onLoad(pplayer, args[1].toLowerCase());
             break;
         case "remove":
-            onRemove(pplayer, args[1].toLowerCase());
+            this.onRemove(pplayer, args[1].toLowerCase());
             break;
         case "info":
-            onInfo(pplayer, args[1].toLowerCase());
+            this.onInfo(pplayer, args[1].toLowerCase());
             break;
         case "list":
-            onList(pplayer);
+            this.onList(pplayer);
             break;
         default:
             LangManager.sendMessage(pplayer, Lang.COMMAND_DESCRIPTION_GROUP_SAVE);
@@ -95,7 +95,7 @@ public class GroupCommandModule implements CommandModule {
         ParticleGroup group = pplayer.getParticleGroupByName(groupName);
         boolean groupUpdated = false;
         if (group == null) {
-            List<ParticlePair> particles = new ArrayList<ParticlePair>();
+            List<ParticlePair> particles = new ArrayList<>();
             for (ParticlePair particle : pplayer.getActiveParticles())
                 particles.add(particle.clone()); // Make sure the ParticlePairs aren't the same references in both the active and saved group
             group = new ParticleGroup(groupName, particles);
@@ -238,38 +238,38 @@ public class GroupCommandModule implements CommandModule {
         List<ParticleGroup> groups = pplayer.getParticleGroups();
         groups.sort(Comparator.comparing(ParticleGroup::getName));
         
-        String groupsList = "";
+        StringBuilder groupsList = new StringBuilder();
         for (ParticleGroup group : groups)
             if (!group.getName().equals(ParticleGroup.DEFAULT_NAME))
-                groupsList += group.getName() + ", ";
+                groupsList.append(group.getName()).append(", ");
         
-        if (groupsList.endsWith(", ")) 
-            groupsList = groupsList.substring(0, groupsList.length() - 2);
+        if (groupsList.toString().endsWith(", "))
+            groupsList = new StringBuilder(groupsList.substring(0, groupsList.length() - 2));
         
-        String presetsList = "";
+        StringBuilder presetsList = new StringBuilder();
         for (ParticleGroupPreset group : ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()))
-            presetsList += group.getGroup().getName() + ", ";
+            presetsList.append(group.getGroup().getName()).append(", ");
         
-        if (presetsList.endsWith(", "))
-            presetsList = presetsList.substring(0, presetsList.length() - 2);
+        if (presetsList.toString().endsWith(", "))
+            presetsList = new StringBuilder(presetsList.substring(0, presetsList.length() - 2));
         
-        if (groupsList.isEmpty() && presetsList.isEmpty()) {
+        if ((groupsList.length() == 0) && (presetsList.length() == 0)) {
             LangManager.sendMessage(pplayer, Lang.GROUP_LIST_NONE);
             return;
         }
         
-        if (!groupsList.isEmpty()) {
-            LangManager.sendMessage(pplayer, Lang.GROUP_LIST_OUTPUT, groupsList);
+        if (groupsList.length() > 0) {
+            LangManager.sendMessage(pplayer, Lang.GROUP_LIST_OUTPUT, groupsList.toString());
         }
         
-        if (!presetsList.isEmpty()) {
-            LangManager.sendMessage(pplayer, Lang.GROUP_LIST_PRESETS, presetsList);
+        if (presetsList.length() > 0) {
+            LangManager.sendMessage(pplayer, Lang.GROUP_LIST_PRESETS, presetsList.toString());
         }
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        List<String> matches = new ArrayList<String>();
-        List<String> subCommands = Arrays.asList(new String[] { "save", "load", "remove", "info", "list" });
+        List<String> matches = new ArrayList<>();
+        List<String> subCommands = Arrays.asList("save", "load", "remove", "info", "list");
         
         if (args.length <= 1) {
             if (args.length == 0) matches = subCommands;
@@ -278,7 +278,7 @@ public class GroupCommandModule implements CommandModule {
             if (args[0].equalsIgnoreCase("save")) {
                 matches.add("<groupName>");
             } else {
-                List<String> groupNames = new ArrayList<String>();
+                List<String> groupNames = new ArrayList<>();
                 for (ParticleGroup group : pplayer.getParticleGroups())
                     if (!group.getName().equals(ParticleGroup.DEFAULT_NAME))
                         groupNames.add(group.getName());
@@ -305,7 +305,7 @@ public class GroupCommandModule implements CommandModule {
     }
 
     public boolean requiresEffects() {
-        return true;
+        return false;
     }
 
 }
diff --git a/src/com/esophose/playerparticles/command/HelpCommandModule.java b/src/com/esophose/playerparticles/command/HelpCommandModule.java
index b5b2705..001ea9f 100644
--- a/src/com/esophose/playerparticles/command/HelpCommandModule.java
+++ b/src/com/esophose/playerparticles/command/HelpCommandModule.java
@@ -19,7 +19,7 @@ public class HelpCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/ListCommandModule.java b/src/com/esophose/playerparticles/command/ListCommandModule.java
index 93b1a73..c202c11 100644
--- a/src/com/esophose/playerparticles/command/ListCommandModule.java
+++ b/src/com/esophose/playerparticles/command/ListCommandModule.java
@@ -31,7 +31,7 @@ public class ListCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/OtherCommandModule.java b/src/com/esophose/playerparticles/command/OtherCommandModule.java
index 132351e..b30d1a2 100644
--- a/src/com/esophose/playerparticles/command/OtherCommandModule.java
+++ b/src/com/esophose/playerparticles/command/OtherCommandModule.java
@@ -58,10 +58,10 @@ public class OtherCommandModule implements CommandModuleSecondary {
     }
 
     public List<String> onTabComplete(CommandSender sender, String[] args) {
-        List<String> completions = new ArrayList<String>();
+        List<String> completions = new ArrayList<>();
         
         if (args.length < 2) {
-            List<String> playerNames = new ArrayList<String>();
+            List<String> playerNames = new ArrayList<>();
             for (Player player : Bukkit.getOnlinePlayers()) 
                 playerNames.add(player.getName());
             
diff --git a/src/com/esophose/playerparticles/command/ParticleCommandHandler.java b/src/com/esophose/playerparticles/command/ParticleCommandHandler.java
index 5fd2282..bae2528 100644
--- a/src/com/esophose/playerparticles/command/ParticleCommandHandler.java
+++ b/src/com/esophose/playerparticles/command/ParticleCommandHandler.java
@@ -27,7 +27,7 @@ public class ParticleCommandHandler implements CommandExecutor, TabCompleter {
     private static CommandModuleSecondary ppoCommand;
 
     static {
-        commands = new ArrayList<CommandModule>();
+        commands = new ArrayList<>();
 
         commands.add(new AddCommandModule());
         commands.add(new DataCommandModule());
@@ -78,7 +78,7 @@ public class ParticleCommandHandler implements CommandExecutor, TabCompleter {
      * @return All available command names
      */
     public static List<String> getCommandNames() {
-        List<String> commandNames = new ArrayList<String>();
+        List<String> commandNames = new ArrayList<>();
         for (CommandModule cmd : commands)
             commandNames.add(cmd.getName());
         return commandNames;
@@ -137,15 +137,15 @@ public class ParticleCommandHandler implements CommandExecutor, TabCompleter {
      */
     public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {
         if (cmd.getName().equalsIgnoreCase("pp")) {
-            if (!(sender instanceof Player)) return new ArrayList<String>();
+            if (!(sender instanceof Player)) return new ArrayList<>();
             
             PPlayer pplayer = DataManager.getPPlayer(((Player) sender).getUniqueId());
-            if (pplayer == null) return new ArrayList<String>();
+            if (pplayer == null) return new ArrayList<>();
             
             if (args.length <= 1) {
                 CommandModule commandModule = findMatchingCommand(""); // Get the default command module
                 return commandModule.onTabComplete(pplayer, args);
-            } else if (args.length >= 2) {
+            } else {
                 CommandModule commandModule = findMatchingCommand(args[0]);
                 if (commandModule != null) {
                     String[] cmdArgs = Arrays.copyOfRange(args, 1, args.length);
@@ -156,7 +156,7 @@ public class ParticleCommandHandler implements CommandExecutor, TabCompleter {
             return ppoCommand.onTabComplete(sender, args);
         }
         
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
 }
diff --git a/src/com/esophose/playerparticles/command/ReloadCommandModule.java b/src/com/esophose/playerparticles/command/ReloadCommandModule.java
index 51e7080..3e50859 100644
--- a/src/com/esophose/playerparticles/command/ReloadCommandModule.java
+++ b/src/com/esophose/playerparticles/command/ReloadCommandModule.java
@@ -22,7 +22,7 @@ public class ReloadCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/RemoveCommandModule.java b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
index c7aced1..37711cb 100644
--- a/src/com/esophose/playerparticles/command/RemoveCommandModule.java
+++ b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
@@ -26,7 +26,7 @@ public class RemoveCommandModule implements CommandModule {
         }
         
         if (StringUtils.isNumeric(args[0])) { // Removing by ID
-            int id = -1;
+            int id;
             try {
                 id = Integer.parseInt(args[0]);
             } catch (Exception ex) {
@@ -99,8 +99,8 @@ public class RemoveCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        List<String> matches = new ArrayList<String>();
-        Set<String> removeBy = new HashSet<String>();
+        List<String> matches = new ArrayList<>();
+        Set<String> removeBy = new HashSet<>();
 
         for (ParticlePair particle : pplayer.getActiveParticles()) {
             removeBy.add(String.valueOf(particle.getId()));
@@ -108,7 +108,7 @@ public class RemoveCommandModule implements CommandModule {
             removeBy.add(particle.getStyle().getName());
         }
 
-        if (args.length == 0) return new ArrayList<String>(removeBy);
+        if (args.length == 0) return new ArrayList<>(removeBy);
 
         StringUtil.copyPartialMatches(args[0], removeBy, matches);
         return matches;
diff --git a/src/com/esophose/playerparticles/command/ResetCommandModule.java b/src/com/esophose/playerparticles/command/ResetCommandModule.java
index 68bca6f..bc9137c 100644
--- a/src/com/esophose/playerparticles/command/ResetCommandModule.java
+++ b/src/com/esophose/playerparticles/command/ResetCommandModule.java
@@ -18,7 +18,7 @@ public class ResetCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/StylesCommandModule.java b/src/com/esophose/playerparticles/command/StylesCommandModule.java
index 1eec52f..8c23803 100644
--- a/src/com/esophose/playerparticles/command/StylesCommandModule.java
+++ b/src/com/esophose/playerparticles/command/StylesCommandModule.java
@@ -16,20 +16,20 @@ public class StylesCommandModule implements CommandModule {
         Player p = pplayer.getPlayer();
 
         List<String> styleNames = PermissionManager.getStyleNamesUserHasPermissionFor(p);
-        String toSend = "";
+        StringBuilder toSend = new StringBuilder();
         for (String name : styleNames) {
-            toSend += name + ", ";
+            toSend.append(name).append(", ");
         }
         
-        if (toSend.endsWith(", ")) {
-            toSend = toSend.substring(0, toSend.length() - 2);
+        if (toSend.toString().endsWith(", ")) {
+            toSend = new StringBuilder(toSend.substring(0, toSend.length() - 2));
         }
 
-        LangManager.sendMessage(pplayer, Lang.STYLE_LIST, toSend);
+        LangManager.sendMessage(pplayer, Lang.STYLE_LIST, toSend.toString());
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/ToggleCommandModule.java b/src/com/esophose/playerparticles/command/ToggleCommandModule.java
index 9070d8c..8693ded 100644
--- a/src/com/esophose/playerparticles/command/ToggleCommandModule.java
+++ b/src/com/esophose/playerparticles/command/ToggleCommandModule.java
@@ -22,7 +22,7 @@ public class ToggleCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/VersionCommandModule.java b/src/com/esophose/playerparticles/command/VersionCommandModule.java
index 6b75be2..a2851c2 100644
--- a/src/com/esophose/playerparticles/command/VersionCommandModule.java
+++ b/src/com/esophose/playerparticles/command/VersionCommandModule.java
@@ -18,7 +18,7 @@ public class VersionCommandModule implements CommandModule {
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/command/WorldsCommandModule.java b/src/com/esophose/playerparticles/command/WorldsCommandModule.java
index 7916da4..d225cde 100644
--- a/src/com/esophose/playerparticles/command/WorldsCommandModule.java
+++ b/src/com/esophose/playerparticles/command/WorldsCommandModule.java
@@ -16,17 +16,17 @@ public class WorldsCommandModule implements CommandModule {
             return;
         }
 
-        String worlds = "";
+        StringBuilder worlds = new StringBuilder();
         for (String s : PermissionManager.getDisabledWorlds()) {
-            worlds += s + ", ";
+            worlds.append(s).append(", ");
         }
-        if (worlds.length() > 2) worlds = worlds.substring(0, worlds.length() - 2);
+        if (worlds.length() > 2) worlds = new StringBuilder(worlds.substring(0, worlds.length() - 2));
 
         LangManager.sendCustomMessage(pplayer, LangManager.getText(Lang.DISABLED_WORLDS) + " " + worlds);
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     public String getName() {
diff --git a/src/com/esophose/playerparticles/database/DatabaseConnector.java b/src/com/esophose/playerparticles/database/DatabaseConnector.java
index f139f2e..a876466 100644
--- a/src/com/esophose/playerparticles/database/DatabaseConnector.java
+++ b/src/com/esophose/playerparticles/database/DatabaseConnector.java
@@ -10,25 +10,25 @@ public interface DatabaseConnector {
      * 
      * @return If the connection is created or not
      */
-    public boolean isInitialized();
+    boolean isInitialized();
 
     /**
      * Closes all open connections to the database
      */
-    public void closeConnection();
+    void closeConnection();
 
     /**
      * Executes a callback with a Connection passed and automatically closes it when finished
      * 
      * @param callback The callback to execute once the connection is retrieved
      */
-    public void connect(ConnectionCallback callback);
+    void connect(ConnectionCallback callback);
 
     /**
      * Allows Lambda expressions to be used to reduce duplicated code for getting connections
      */
-    public static interface ConnectionCallback {
-        public void execute(Connection connection) throws SQLException;
+    interface ConnectionCallback {
+        void execute(Connection connection) throws SQLException;
     }
 
 }
diff --git a/src/com/esophose/playerparticles/database/MySqlDatabaseConnector.java b/src/com/esophose/playerparticles/database/MySqlDatabaseConnector.java
index b2d1348..2c42b76 100644
--- a/src/com/esophose/playerparticles/database/MySqlDatabaseConnector.java
+++ b/src/com/esophose/playerparticles/database/MySqlDatabaseConnector.java
@@ -11,7 +11,7 @@ import com.zaxxer.hikari.HikariDataSource;
 public class MySqlDatabaseConnector implements DatabaseConnector {
 
     private HikariDataSource hikari;
-    private boolean initializedSuccessfully = false;
+    private boolean initializedSuccessfully;
 
     public MySqlDatabaseConnector() {
         String hostname = PSetting.DATABASE_HOSTNAME.getString();
@@ -19,12 +19,13 @@ public class MySqlDatabaseConnector implements DatabaseConnector {
         String database = PSetting.DATABASE_NAME.getString();
         String user = PSetting.DATABASE_USER_NAME.getString();
         String pass = PSetting.DATABASE_USER_PASSWORD.getString();
+        boolean useSSL = PSetting.DATABASE_USE_SSL.getBoolean();
 
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:mysql://" + hostname + ":" + port + "/" + database);
+        config.setJdbcUrl("jdbc:mysql://" + hostname + ":" + port + "/" + database + "?useSSL=" + useSSL);
         config.setUsername(user);
         config.setPassword(pass);
-        config.setMaximumPoolSize(5);
+        config.setMaximumPoolSize(3);
 
         try {
             this.hikari = new HikariDataSource(config);
diff --git a/src/com/esophose/playerparticles/gui/GuiActionButton.java b/src/com/esophose/playerparticles/gui/GuiActionButton.java
index dfcd7fe..4850758 100644
--- a/src/com/esophose/playerparticles/gui/GuiActionButton.java
+++ b/src/com/esophose/playerparticles/gui/GuiActionButton.java
@@ -98,7 +98,6 @@ public class GuiActionButton {
      * 
      * @return The icon ItemStack for the GUI
      */
-    @SuppressWarnings("deprecation")
     public ItemStack getIcon() {
         ItemStack itemStack;
         if (this.icons != null) {
@@ -112,12 +111,12 @@ public class GuiActionButton {
         }
         
         ItemMeta itemMeta = itemStack.getItemMeta();
-        
-        itemMeta.setDisplayName(this.name);
-        itemMeta.setLore(parseLore(this.lore));
-        itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_POTION_EFFECTS);
-        
-        itemStack.setItemMeta(itemMeta);
+        if (itemMeta != null) {
+            itemMeta.setDisplayName(this.name);
+            itemMeta.setLore(parseLore(this.lore));
+            itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_POTION_EFFECTS);
+            itemStack.setItemMeta(itemMeta);
+        }
         
         return itemStack;
     }
@@ -125,10 +124,9 @@ public class GuiActionButton {
     /**
      * Executes the onClick callback passed in the constructor
      * 
-     * @param button The button that was clicked
      * @param isShiftClick If the player was holding shift when they clicked
      */
-    public void handleClick(GuiActionButton button, boolean isShiftClick) {
+    public void handleClick(boolean isShiftClick) {
         if (this.onClick != null)
             this.onClick.execute(this, isShiftClick);
     }
@@ -158,7 +156,7 @@ public class GuiActionButton {
      * @return A parsed list of lore text
      */
     public static List<String> parseLore(String... lore) {
-        List<String> parsedLore = new ArrayList<String>();
+        List<String> parsedLore = new ArrayList<>();
         for (String line : lore) {
             // Try to maintain the color going to the next line if it's split
             // If there is no color, just ignore it
@@ -181,8 +179,8 @@ public class GuiActionButton {
      * Allows button click callbacks as parameters
      */
     @FunctionalInterface
-    public static interface GuiActionButtonClickCallback {
-        public void execute(GuiActionButton button, boolean isShiftClick);
+    public interface GuiActionButtonClickCallback {
+        void execute(GuiActionButton button, boolean isShiftClick);
     }
 
 }
diff --git a/src/com/esophose/playerparticles/gui/GuiHandler.java b/src/com/esophose/playerparticles/gui/GuiHandler.java
index d489883..64dfb5c 100644
--- a/src/com/esophose/playerparticles/gui/GuiHandler.java
+++ b/src/com/esophose/playerparticles/gui/GuiHandler.java
@@ -23,7 +23,7 @@ import com.esophose.playerparticles.particles.PPlayer;
  */
 public class GuiHandler extends BukkitRunnable implements Listener {
 
-    private static List<GuiInventory> guiInventories = new ArrayList<GuiInventory>();
+    private static List<GuiInventory> guiInventories = new ArrayList<>();
     private static BukkitTask guiTask = null;
 
     /**
@@ -40,7 +40,7 @@ public class GuiHandler extends BukkitRunnable implements Listener {
      * Removes entries from playerGuiInventories if the player no longer has the inventory open or is offline
      */
     public void run() {
-        List<GuiInventory> toRemoveList = new ArrayList<GuiInventory>();
+        List<GuiInventory> toRemoveList = new ArrayList<>();
 
         for (GuiInventory inventory : guiInventories) {
             PPlayer pplayer = DataManager.getPPlayer(inventory.getPPlayer().getUniqueId());
diff --git a/src/com/esophose/playerparticles/gui/GuiInventory.java b/src/com/esophose/playerparticles/gui/GuiInventory.java
index e1a0518..4b3003c 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventory.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventory.java
@@ -24,12 +24,13 @@ public abstract class GuiInventory implements InventoryHolder {
         ORANGE(1, "ORANGE_STAINED_GLASS_PANE"),
         RED(14, "RED_STAINED_GLASS_PANE"),
         BROWN(12, "BROWN_STAINED_GLASS_PANE"),
-        GREEN(13, "GREEN_STAINED_GLASS_PANE");
+        GREEN(13, "GREEN_STAINED_GLASS_PANE"),
+        YELLOW(4, "YELLOW_STAINED_GLASS_PANE");
         
         private short data;
         private Material material;
         
-        private BorderColor(int data, String materialName) {
+        BorderColor(int data, String materialName) {
             this.data = (short)data;
             this.material = ParticleUtils.closestMatch(materialName);
         }
@@ -44,9 +45,11 @@ public abstract class GuiInventory implements InventoryHolder {
             }
             
             ItemMeta meta = borderIcon.getItemMeta();
-            meta.setDisplayName(" ");
-            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_ENCHANTS);
-            borderIcon.setItemMeta(meta);
+            if (meta != null) {
+                meta.setDisplayName(" ");
+                meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_ENCHANTS);
+                borderIcon.setItemMeta(meta);
+            }
             
             return borderIcon;
         }
@@ -60,7 +63,7 @@ public abstract class GuiInventory implements InventoryHolder {
     public GuiInventory(PPlayer pplayer, Inventory inventory) {
         this.pplayer = pplayer;
         this.inventory = inventory;
-        this.actionButtons = new ArrayList<GuiActionButton>();
+        this.actionButtons = new ArrayList<>();
     }
     
     /**
@@ -110,7 +113,7 @@ public abstract class GuiInventory implements InventoryHolder {
      * Populates the Inventory with the contents of actionButtons
      */
     protected void populate() {
-        for (GuiActionButton button : actionButtons) {
+        for (GuiActionButton button : this.actionButtons) {
             this.inventory.setItem(button.getSlot(), button.getIcon());
         }
     }
@@ -140,12 +143,10 @@ public abstract class GuiInventory implements InventoryHolder {
         
         for (GuiActionButton button : this.actionButtons) {
             if (button.getSlot() == slot) {
-                button.handleClick(button, isShiftClick);
-                if (PSetting.GUI_BUTTON_SOUND.getBoolean()) {
-                    if (event.getWhoClicked() instanceof Player) {
-                        Player player = (Player) event.getWhoClicked();
-                        player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 0.5f, 1);
-                    }
+                button.handleClick(isShiftClick);
+                if (PSetting.GUI_BUTTON_SOUND.getBoolean() && event.getWhoClicked() instanceof Player) {
+                    Player player = (Player) event.getWhoClicked();
+                    player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 0.5f, 1);
                 }
                 break;
             }
@@ -153,8 +154,8 @@ public abstract class GuiInventory implements InventoryHolder {
     }
     
     @FunctionalInterface
-    public static interface GuiInventoryEditFinishedCallback {
-        public void execute();
+    public interface GuiInventoryEditFinishedCallback {
+        void execute();
     }
 
 }
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
index 046b207..1250ec7 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
@@ -1,14 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.SkullType;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
-
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
@@ -20,15 +11,23 @@ import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.SkullType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("deprecation")
 public class GuiInventoryDefault extends GuiInventory {
 
     public GuiInventoryDefault(PPlayer pplayer) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_PLAYERPARTICLES)));
-        
+
         this.fillBorder(BorderColor.WHITE);
-        
+
         // PPlayer information icon
         ItemStack headIcon;
         Material playerHead = ParticleUtils.closestMatch("PLAYER_HEAD");
@@ -39,25 +38,27 @@ public class GuiInventoryDefault extends GuiInventory {
         }
 
         SkullMeta currentIconMeta = (SkullMeta) headIcon.getItemMeta();
-        currentIconMeta.setDisplayName(LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + pplayer.getPlayer().getName());
-        String[] currentIconLore = new String[] {
-            LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_ACTIVE_PARTICLES, pplayer.getActiveParticles().size()),
-            LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVED_GROUPS, pplayer.getParticleGroups().size() - 1),
-            LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_FIXED_EFFECTS, pplayer.getFixedEffectIds().size()),
-            " ",
-            LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_COMMANDS_INFO)
-        };
-        currentIconMeta.setLore(GuiActionButton.parseLore(currentIconLore));
-        currentIconMeta.setOwner(pplayer.getPlayer().getName());
-        headIcon.setItemMeta(currentIconMeta);
-        
+        if (currentIconMeta != null) {
+            currentIconMeta.setDisplayName(LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + pplayer.getPlayer().getName());
+            String[] currentIconLore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_ACTIVE_PARTICLES, pplayer.getActiveParticles().size()),
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVED_GROUPS, pplayer.getParticleGroups().size() - 1),
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_FIXED_EFFECTS, pplayer.getFixedEffectIds().size()),
+                    " ",
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_COMMANDS_INFO)
+            };
+            currentIconMeta.setLore(GuiActionButton.parseLore(currentIconLore));
+            currentIconMeta.setOwner(pplayer.getPlayer().getName());
+            headIcon.setItemMeta(currentIconMeta);
+        }
+
         this.inventory.setItem(13, headIcon);
-        
+
         // Define what slots to put the icons at based on what other slots are visible
         boolean manageGroupsVisible = PermissionManager.canPlayerSaveGroups(pplayer);
         boolean loadPresetGroupVisible = !ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty();
         int manageParticlesSlot = -1, manageGroupsSlot = -1, loadPresetGroupSlot = -1;
-        
+
         if (!manageGroupsVisible && !loadPresetGroupVisible) {
             manageParticlesSlot = 22;
         } else if (!manageGroupsVisible) {
@@ -71,157 +72,157 @@ public class GuiInventoryDefault extends GuiInventory {
             manageGroupsSlot = 22;
             loadPresetGroupSlot = 24;
         }
-        
+
         // Manage Your Particles button
-        GuiActionButton manageYourParticlesButton = new GuiActionButton(manageParticlesSlot, 
-                                                                        GuiIcon.PARTICLES.get(), 
-                                                                        LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES), 
-                                                                        new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES_DESCRIPTION) }, 
-                                                                        (button, isShiftClick) -> {
-                                                                            GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
-                                                                        });
+        GuiActionButton manageYourParticlesButton = new GuiActionButton(
+                manageParticlesSlot,
+                GuiIcon.PARTICLES.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES_DESCRIPTION)},
+                (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryManageParticles(pplayer)));
         this.actionButtons.add(manageYourParticlesButton);
-        
+
         // Manage Your Groups button
         if (manageGroupsVisible) {
-            GuiActionButton manageYourGroupsButton = new GuiActionButton(manageGroupsSlot, 
-                                                                         GuiIcon.GROUPS.get(), 
-                                                                         LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS), 
-                                                                         new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS_DESCRIPTION) }, 
-                                                                         (button, isShiftClick) -> {
-                                                                             GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
-                                                                         });
+            GuiActionButton manageYourGroupsButton = new GuiActionButton(
+                    manageGroupsSlot,
+                    GuiIcon.GROUPS.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS_DESCRIPTION)},
+                    (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryManageGroups(pplayer)));
             this.actionButtons.add(manageYourGroupsButton);
         }
-        
+
         // Load Preset Groups
         if (loadPresetGroupVisible) {
-            GuiActionButton loadPresetGroups = new GuiActionButton(loadPresetGroupSlot, 
-                                                                   GuiIcon.PRESET_GROUPS.get(), 
-                                                                   LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP), 
-                                                                   new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP_DESCRIPTION) }, 
-                                                                   (button, isShiftClick) -> {
-                                                                       GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer, false));
-                                                                   });
+            GuiActionButton loadPresetGroups = new GuiActionButton(
+                    loadPresetGroupSlot,
+                    GuiIcon.PRESET_GROUPS.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP_DESCRIPTION)},
+                    (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer, false)));
             this.actionButtons.add(loadPresetGroups);
         }
-        
+
         final ParticlePair editingParticle = pplayer.getPrimaryParticle();
         boolean canEditPrimaryStyleAndData = pplayer.getActiveParticle(1) != null;
         boolean doesEffectUseData = editingParticle.getEffect().hasProperty(ParticleProperty.COLORABLE) || editingParticle.getEffect().hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA);
-        
+
         // Edit Primary Effect
-        GuiActionButton editPrimaryEffect = new GuiActionButton(38,
-                                                                GuiIcon.EDIT_EFFECT.get(),
-                                                                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_EFFECT),
-                                                                new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_EFFECT_DESCRIPTION) },
-                                                                (button, isShiftClick) -> {
-                                                                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
-                                                                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
-                                                                    callbacks.add(() -> {
-                                                                        ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                        if (canEditPrimaryStyleAndData) {
-                                                                            for (ParticlePair particle : group.getParticles()) {
-                                                                                if (particle.getId() == editingParticle.getId()) {
-                                                                                    particle.setEffect(editingParticle.getEffect());
-                                                                                    break;
-                                                                                }
-                                                                            }
-                                                                        } else {
-                                                                            group.getParticles().add(editingParticle);
-                                                                        }
-                                                                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                        
-                                                                        GuiHandler.transition(new GuiInventoryDefault(pplayer));
-                                                                    });
-                                                                    
-                                                                    callbacks.get(1).execute();
-                                                                });
+        GuiActionButton editPrimaryEffect = new GuiActionButton(
+                38,
+                GuiIcon.EDIT_EFFECT.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_EFFECT),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_EFFECT_DESCRIPTION)},
+                (button, isShiftClick) -> {
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> {
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        if (canEditPrimaryStyleAndData) {
+                            for (ParticlePair particle : group.getParticles()) {
+                                if (particle.getId() == editingParticle.getId()) {
+                                    particle.setEffect(editingParticle.getEffect());
+                                    break;
+                                }
+                            }
+                        } else {
+                            group.getParticles().add(editingParticle);
+                        }
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        GuiHandler.transition(new GuiInventoryDefault(pplayer));
+                    });
+
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(editPrimaryEffect);
-        
+
         // Edit Primary Style
         String[] editPrimaryStyleLore;
         if (canEditPrimaryStyleAndData) {
-            editPrimaryStyleLore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_DESCRIPTION) };
+            editPrimaryStyleLore = new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_DESCRIPTION)};
         } else {
-            editPrimaryStyleLore = new String[] {
-                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_DESCRIPTION),
-                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_MISSING_EFFECT)
+            editPrimaryStyleLore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE_MISSING_EFFECT)
             };
         }
-        GuiActionButton editPrimaryStyle = new GuiActionButton(40,
-                                                               GuiIcon.EDIT_STYLE.get(),
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE),
-                                                               editPrimaryStyleLore,
-                                                               (button, isShiftClick) -> {
-                                                                   if (!canEditPrimaryStyleAndData) return;
-                                                                   
-                                                                   List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                   callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
-                                                                   callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 1)));
-                                                                   callbacks.add(() -> {
-                                                                       ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                       for (ParticlePair particle : group.getParticles()) {
-                                                                           if (particle.getId() == editingParticle.getId()) {
-                                                                               particle.setStyle(editingParticle.getStyle());
-                                                                               break;
-                                                                           }
-                                                                       }
-                                                                       DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                       
-                                                                       GuiHandler.transition(new GuiInventoryDefault(pplayer));
-                                                                   });
-                                                                   
-                                                                   callbacks.get(1).execute();
-                                                               });
+        GuiActionButton editPrimaryStyle = new GuiActionButton(
+                40,
+                GuiIcon.EDIT_STYLE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_STYLE),
+                editPrimaryStyleLore,
+                (button, isShiftClick) -> {
+                    if (!canEditPrimaryStyleAndData) return;
+
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> {
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        for (ParticlePair particle : group.getParticles()) {
+                            if (particle.getId() == editingParticle.getId()) {
+                                particle.setStyle(editingParticle.getStyle());
+                                break;
+                            }
+                        }
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        GuiHandler.transition(new GuiInventoryDefault(pplayer));
+                    });
+
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(editPrimaryStyle);
-        
+
         // Edit Primary Data
         String[] editPrimaryDataLore;
         if (canEditPrimaryStyleAndData && doesEffectUseData) {
-            editPrimaryDataLore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION) };
+            editPrimaryDataLore = new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION)};
         } else if (canEditPrimaryStyleAndData) {
-            editPrimaryDataLore = new String[] { 
-                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION),
-                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_UNAVAILABLE)
+            editPrimaryDataLore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_UNAVAILABLE)
             };
         } else {
-            editPrimaryDataLore = new String[] { 
-                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION),
-                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_MISSING_EFFECT)
+            editPrimaryDataLore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA_MISSING_EFFECT)
             };
         }
-        GuiActionButton editPrimaryData = new GuiActionButton(42,
-                                                              GuiIcon.EDIT_DATA.get(),
-                                                              LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA),
-                                                              editPrimaryDataLore,
-                                                              (button, isShiftClick) -> {
-                                                                  if (!canEditPrimaryStyleAndData || !doesEffectUseData) return;
-                                                                  
-                                                                  List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                  callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
-                                                                  callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 1)));
-                                                                  callbacks.add(() -> {
-                                                                      ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                      for (ParticlePair particle : group.getParticles()) {
-                                                                          if (particle.getId() == editingParticle.getId()) {
-                                                                              particle.setColor(editingParticle.getColor());
-                                                                              particle.setNoteColor(editingParticle.getNoteColor());
-                                                                              particle.setItemMaterial(editingParticle.getItemMaterial());
-                                                                              particle.setBlockMaterial(editingParticle.getBlockMaterial());
-                                                                              break;
-                                                                          }
-                                                                      }
-                                                                      DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                      
-                                                                      GuiHandler.transition(new GuiInventoryDefault(pplayer));
-                                                                  });
-                                                                  
-                                                                  callbacks.get(1).execute();
-                                                              });
+        GuiActionButton editPrimaryData = new GuiActionButton(
+                42,
+                GuiIcon.EDIT_DATA.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_PRIMARY_DATA),
+                editPrimaryDataLore,
+                (button, isShiftClick) -> {
+                    if (!canEditPrimaryStyleAndData || !doesEffectUseData) return;
+
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> {
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        for (ParticlePair particle : group.getParticles()) {
+                            if (particle.getId() == editingParticle.getId()) {
+                                particle.setColor(editingParticle.getColor());
+                                particle.setNoteColor(editingParticle.getNoteColor());
+                                particle.setItemMaterial(editingParticle.getItemMaterial());
+                                particle.setBlockMaterial(editingParticle.getBlockMaterial());
+                                break;
+                            }
+                        }
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        GuiHandler.transition(new GuiInventoryDefault(pplayer));
+                    });
+
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(editPrimaryData);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditData.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditData.java
index dcd8b2c..8e283ab 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditData.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditData.java
@@ -1,18 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.DyeColor;
-import org.bukkit.Material;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
@@ -23,78 +10,90 @@ import com.esophose.playerparticles.particles.ParticleEffect.OrdinaryColor;
 import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
 
 @SuppressWarnings("deprecation")
 public class GuiInventoryEditData extends GuiInventory {
-    
+
     private static Random RANDOM = new Random();
     private static List<Material> BLOCK_MATERIALS, ITEM_MATERIALS;
     private static ColorData[] colorMapping;
     private static ColorData[] rainbowColorMapping;
     private static ColorData[] noteColorMapping;
-    
+
     static {
-        colorMapping = new ColorData[] {
-            new ColorData(DyeColor.RED, ParticleUtils.closestMatch("ROSE_RED"), new OrdinaryColor(255, 0, 0), Lang.GUI_EDIT_DATA_COLOR_RED),
-            new ColorData(DyeColor.ORANGE, ParticleUtils.closestMatch("ORANGE_DYE"), new OrdinaryColor(255, 140, 0), Lang.GUI_EDIT_DATA_COLOR_ORANGE),
-            new ColorData(DyeColor.YELLOW, ParticleUtils.closestMatch("DANDELION_YELLOW"), new OrdinaryColor(255, 255, 0), Lang.GUI_EDIT_DATA_COLOR_YELLOW),
-            new ColorData(DyeColor.LIME, ParticleUtils.closestMatch("LIME_DYE"), new OrdinaryColor(50, 205, 50), Lang.GUI_EDIT_DATA_COLOR_LIME_GREEN),
-            new ColorData(DyeColor.GREEN, ParticleUtils.closestMatch("CACTUS_GREEN"), new OrdinaryColor(0, 128, 0), Lang.GUI_EDIT_DATA_COLOR_GREEN),
-            new ColorData(DyeColor.BLUE, ParticleUtils.closestMatch("LAPIS_LAZULI"), new OrdinaryColor(0, 0, 255), Lang.GUI_EDIT_DATA_COLOR_BLUE),
-            new ColorData(DyeColor.CYAN, ParticleUtils.closestMatch("CYAN_DYE"), new OrdinaryColor(0, 139, 139), Lang.GUI_EDIT_DATA_COLOR_CYAN),
-            new ColorData(DyeColor.LIGHT_BLUE, ParticleUtils.closestMatch("LIGHT_BLUE_DYE"), new OrdinaryColor(173, 216, 230), Lang.GUI_EDIT_DATA_COLOR_LIGHT_BLUE),
-            new ColorData(DyeColor.PURPLE, ParticleUtils.closestMatch("PURPLE_DYE"), new OrdinaryColor(138, 43, 226), Lang.GUI_EDIT_DATA_COLOR_PURPLE),
-            new ColorData(DyeColor.MAGENTA, ParticleUtils.closestMatch("MAGENTA_DYE"), new OrdinaryColor(202, 31, 123), Lang.GUI_EDIT_DATA_COLOR_MAGENTA),
-            new ColorData(DyeColor.PINK, ParticleUtils.closestMatch("PINK_DYE"), new OrdinaryColor(255, 182, 193), Lang.GUI_EDIT_DATA_COLOR_PINK),
-            new ColorData(DyeColor.BROWN, ParticleUtils.closestMatch("COCOA_BEANS"), new OrdinaryColor(139, 69, 19), Lang.GUI_EDIT_DATA_COLOR_BROWN),
-            new ColorData(DyeColor.BLACK, ParticleUtils.closestMatch("INK_SAC"), new OrdinaryColor(0, 0, 0), Lang.GUI_EDIT_DATA_COLOR_BLACK),
-            new ColorData(DyeColor.GRAY, ParticleUtils.closestMatch("GRAY_DYE"), new OrdinaryColor(128, 128, 128), Lang.GUI_EDIT_DATA_COLOR_GRAY),
-            new ColorData(DyeColor.getByDyeData((byte)7), ParticleUtils.closestMatch("LIGHT_GRAY_DYE"), new OrdinaryColor(192, 192, 192), Lang.GUI_EDIT_DATA_COLOR_LIGHT_GRAY),
-            new ColorData(DyeColor.WHITE, ParticleUtils.closestMatch("BONE_MEAL"), new OrdinaryColor(255, 255, 255), Lang.GUI_EDIT_DATA_COLOR_WHITE),
+        colorMapping = new ColorData[]{
+                new ColorData(DyeColor.RED, ParticleUtils.closestMatchWithFallback(false, "RED_DYE", "ROSE_RED"), new OrdinaryColor(255, 0, 0), Lang.GUI_EDIT_DATA_COLOR_RED),
+                new ColorData(DyeColor.ORANGE, ParticleUtils.closestMatchWithFallback(false, "ORANGE_DYE"), new OrdinaryColor(255, 140, 0), Lang.GUI_EDIT_DATA_COLOR_ORANGE),
+                new ColorData(DyeColor.YELLOW, ParticleUtils.closestMatchWithFallback(false, "YELLOW_DYE", "DANDELION_YELLOW"), new OrdinaryColor(255, 255, 0), Lang.GUI_EDIT_DATA_COLOR_YELLOW),
+                new ColorData(DyeColor.LIME, ParticleUtils.closestMatchWithFallback(false, "LIME_DYE"), new OrdinaryColor(50, 205, 50), Lang.GUI_EDIT_DATA_COLOR_LIME_GREEN),
+                new ColorData(DyeColor.GREEN, ParticleUtils.closestMatchWithFallback(false, "GREEN_DYE", "CACTUS_GREEN"), new OrdinaryColor(0, 128, 0), Lang.GUI_EDIT_DATA_COLOR_GREEN),
+                new ColorData(DyeColor.BLUE, ParticleUtils.closestMatchWithFallback(false, "BLUE_DYE", "LAPIS_LAZULI"), new OrdinaryColor(0, 0, 255), Lang.GUI_EDIT_DATA_COLOR_BLUE),
+                new ColorData(DyeColor.CYAN, ParticleUtils.closestMatchWithFallback(false, "CYAN_DYE"), new OrdinaryColor(0, 139, 139), Lang.GUI_EDIT_DATA_COLOR_CYAN),
+                new ColorData(DyeColor.LIGHT_BLUE, ParticleUtils.closestMatchWithFallback(false, "LIGHT_BLUE_DYE"), new OrdinaryColor(173, 216, 230), Lang.GUI_EDIT_DATA_COLOR_LIGHT_BLUE),
+                new ColorData(DyeColor.PURPLE, ParticleUtils.closestMatchWithFallback(false, "PURPLE_DYE"), new OrdinaryColor(138, 43, 226), Lang.GUI_EDIT_DATA_COLOR_PURPLE),
+                new ColorData(DyeColor.MAGENTA, ParticleUtils.closestMatchWithFallback(false, "MAGENTA_DYE"), new OrdinaryColor(202, 31, 123), Lang.GUI_EDIT_DATA_COLOR_MAGENTA),
+                new ColorData(DyeColor.PINK, ParticleUtils.closestMatchWithFallback(false, "PINK_DYE"), new OrdinaryColor(255, 182, 193), Lang.GUI_EDIT_DATA_COLOR_PINK),
+                new ColorData(DyeColor.BROWN, ParticleUtils.closestMatchWithFallback(false, "BROWN_DYE", "COCOA_BEANS"), new OrdinaryColor(139, 69, 19), Lang.GUI_EDIT_DATA_COLOR_BROWN),
+                new ColorData(DyeColor.BLACK, ParticleUtils.closestMatchWithFallback(false, "BLACK_DYE", "INK_SAC"), new OrdinaryColor(0, 0, 0), Lang.GUI_EDIT_DATA_COLOR_BLACK),
+                new ColorData(DyeColor.GRAY, ParticleUtils.closestMatchWithFallback(false, "GRAY_DYE"), new OrdinaryColor(128, 128, 128), Lang.GUI_EDIT_DATA_COLOR_GRAY),
+                new ColorData(DyeColor.getByDyeData((byte) 7), ParticleUtils.closestMatchWithFallback(false, "LIGHT_GRAY_DYE"), new OrdinaryColor(192, 192, 192), Lang.GUI_EDIT_DATA_COLOR_LIGHT_GRAY),
+                new ColorData(DyeColor.WHITE, ParticleUtils.closestMatchWithFallback(false, "WHITE_DYE", "BONE_MEAL"), new OrdinaryColor(255, 255, 255), Lang.GUI_EDIT_DATA_COLOR_WHITE),
         };
 
-        rainbowColorMapping = new ColorData[] { 
-            colorMapping[0], // Red
-            colorMapping[1], // Orange
-            colorMapping[2], // Yellow
-            colorMapping[3], // Lime
-            colorMapping[7], // Light Blue
-            colorMapping[5], // Blue
-            colorMapping[8]  // Purple
+        rainbowColorMapping = new ColorData[]{
+                colorMapping[0], // Red
+                colorMapping[1], // Orange
+                colorMapping[2], // Yellow
+                colorMapping[3], // Lime
+                colorMapping[7], // Light Blue
+                colorMapping[5], // Blue
+                colorMapping[8]  // Purple
         };
-        
+
         // Note: This is supposed to be a rainbow but there's actually a bug in Minecraft since 1.8 that makes a bunch of them gray
-        noteColorMapping = new ColorData[] {
-            colorMapping[7],  // Light Blue
-            colorMapping[7],  // Light Blue
-            colorMapping[13], // Gray
-            colorMapping[10], // Pink
-            colorMapping[9],  // Magenta
-            colorMapping[9],  // Magenta
-            colorMapping[0],  // Red
-            colorMapping[2],  // Yellow
-            colorMapping[2],  // Yellow
-            colorMapping[14], // Light Gray
-            colorMapping[13], // Gray
-            colorMapping[6],  // Cyan
-            colorMapping[6],  // Cyan
-            colorMapping[6],  // Cyan
-            colorMapping[5],  // Blue
-            colorMapping[8],  // Purple
-            colorMapping[8],  // Purple
-            colorMapping[8],  // Purple
-            colorMapping[13], // Gray
-            colorMapping[4],  // Green
-            colorMapping[3],  // Lime
-            colorMapping[2],  // Yellow
-            colorMapping[4],  // Green
-            colorMapping[7],  // Light Blue
-            colorMapping[7]   // Light Blue
+        noteColorMapping = new ColorData[]{
+                colorMapping[7],  // Light Blue
+                colorMapping[7],  // Light Blue
+                colorMapping[13], // Gray
+                colorMapping[10], // Pink
+                colorMapping[9],  // Magenta
+                colorMapping[9],  // Magenta
+                colorMapping[0],  // Red
+                colorMapping[2],  // Yellow
+                colorMapping[2],  // Yellow
+                colorMapping[14], // Light Gray
+                colorMapping[13], // Gray
+                colorMapping[6],  // Cyan
+                colorMapping[6],  // Cyan
+                colorMapping[6],  // Cyan
+                colorMapping[5],  // Blue
+                colorMapping[8],  // Purple
+                colorMapping[8],  // Purple
+                colorMapping[8],  // Purple
+                colorMapping[13], // Gray
+                colorMapping[4],  // Green
+                colorMapping[3],  // Lime
+                colorMapping[2],  // Yellow
+                colorMapping[4],  // Green
+                colorMapping[7],  // Light Blue
+                colorMapping[7]   // Light Blue
         };
-        
-        BLOCK_MATERIALS = new ArrayList<Material>();
-        ITEM_MATERIALS = new ArrayList<Material>();
-        
+
+        BLOCK_MATERIALS = new ArrayList<>();
+        ITEM_MATERIALS = new ArrayList<>();
+
         Inventory tempInventory = Bukkit.createInventory(null, 9);
         for (Material mat : Material.values()) {
             // Verify an ItemStack of the material can be placed into an inventory. In 1.12 and up this can easily be checked with mat.isItem(), but that doesn't exist pre-1.12
@@ -113,7 +112,7 @@ public class GuiInventoryEditData extends GuiInventory {
 
     public GuiInventoryEditData(PPlayer pplayer, ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_SELECT_DATA)));
-        
+
         ParticleEffect pe = editingParticle.getEffect();
         if (pe.hasProperty(ParticleProperty.COLORABLE)) {
             if (pe == ParticleEffect.NOTE) { // Note data
@@ -128,21 +127,24 @@ public class GuiInventoryEditData extends GuiInventory {
                 this.populateBlockData(editingParticle, callbackList, callbackListPosition);
             }
         }
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            callbackList.get(callbackListPosition - 1).execute();
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> callbackList.get(callbackListPosition - 1).execute());
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
-    
+
     /**
      * Populates the Inventory with available color data options
-     * 
-     * @param editingParticle The ParticlePair that's being edited
-     * @param callbackList The List of GuiInventoryEditFinishedCallbacks 
+     *
+     * @param editingParticle      The ParticlePair that's being edited
+     * @param callbackList         The List of GuiInventoryEditFinishedCallbacks
      * @param callbackListPosition The index of the callbackList we're currently at
      */
     private void populateColorData(ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
@@ -153,55 +155,57 @@ public class GuiInventoryEditData extends GuiInventory {
             String formattedDisplayColor = ChatColor.RED.toString() + colorData.getOrdinaryColor().getRed() + " " + ChatColor.GREEN + colorData.getOrdinaryColor().getGreen() + " " + ChatColor.AQUA + colorData.getOrdinaryColor().getBlue();
 
             // Color Data Buttons
-            GuiActionButton setColorButton = new GuiActionButton(index,
-                                                                 colorData,
-                                                                 colorData.getName(),
-                                                                 new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, formattedDisplayColor) },
-                                                                 (button, isShiftClick) -> {
-                                                                     editingParticle.setColor(colorData.getOrdinaryColor());
-                                                                     callbackList.get(callbackListPosition + 1).execute();
-                                                                 });
+            GuiActionButton setColorButton = new GuiActionButton(
+                    index,
+                    colorData,
+                    colorData.getName(),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, formattedDisplayColor)},
+                    (button, isShiftClick) -> {
+                        editingParticle.setColor(colorData.getOrdinaryColor());
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(setColorButton);
-            
+
             index++;
             if (index == nextWrap) { // Loop around border
                 nextWrap += 9;
-                index += 2; 
+                index += 2;
             }
         }
-        
+
         // Rainbow Color Data Button
-        GuiActionButton setRainbowColorButton = new GuiActionButton(39,
-                                                                    rainbowColorMapping,
-                                                                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RAINBOW),
-                                                                    new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RAINBOW)) },
-                                                                    (button, isShiftClick) -> {
-                                                                        editingParticle.setColor(new OrdinaryColor(999, 999, 999));
-                                                                        callbackList.get(callbackListPosition + 1).execute();
-                                                                    });
+        GuiActionButton setRainbowColorButton = new GuiActionButton(
+                39,
+                rainbowColorMapping,
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RAINBOW),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RAINBOW))},
+                (button, isShiftClick) -> {
+                    editingParticle.setColor(new OrdinaryColor(999, 999, 999));
+                    callbackList.get(callbackListPosition + 1).execute();
+                });
         this.actionButtons.add(setRainbowColorButton);
-        
+
         // Rainbow Color Data Button
         List<ColorData> randomizedColorsList = Arrays.asList(colorMapping.clone());
         Collections.shuffle(randomizedColorsList);
         ColorData[] randomizedColors = new ColorData[randomizedColorsList.size()];
         randomizedColors = randomizedColorsList.toArray(randomizedColors);
         GuiActionButton setRandomColorButton = new GuiActionButton(41,
-                                                                   randomizedColors,
-                                                                   LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RANDOM),
-                                                                   new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RANDOM)) },
-                                                                   (button, isShiftClick) -> {
-                                                                       editingParticle.setColor(new OrdinaryColor(998, 998, 998));
-                                                                       callbackList.get(callbackListPosition + 1).execute();
-                                                                   });
+                randomizedColors,
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RANDOM),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RANDOM))},
+                (button, isShiftClick) -> {
+                    editingParticle.setColor(new OrdinaryColor(998, 998, 998));
+                    callbackList.get(callbackListPosition + 1).execute();
+                });
         this.actionButtons.add(setRandomColorButton);
     }
-    
+
     /**
      * Populates the Inventory with available note data options
-     * 
-     * @param editingParticle The ParticlePair that's being edited
-     * @param callbackList The List of GuiInventoryEditFinishedCallbacks 
+     *
+     * @param editingParticle      The ParticlePair that's being edited
+     * @param callbackList         The List of GuiInventoryEditFinishedCallbacks
      * @param callbackListPosition The index of the callbackList we're currently at
      */
     private void populateNoteData(ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
@@ -212,122 +216,129 @@ public class GuiInventoryEditData extends GuiInventory {
 
             // Note Color Buttons
             int noteIndex = i;
-            GuiActionButton setColorButton = new GuiActionButton(i,
-                                                                 colorData,
-                                                                 formattedDisplayName,
-                                                                 new String[] { formattedDescription },
-                                                                 (button, isShiftClick) -> {
-                                                                     editingParticle.setNoteColor(new NoteColor(noteIndex));
-                                                                     callbackList.get(callbackListPosition + 1).execute();
-                                                                 });
+            GuiActionButton setColorButton = new GuiActionButton(
+                    i,
+                    colorData,
+                    formattedDisplayName,
+                    new String[]{formattedDescription},
+                    (button, isShiftClick) -> {
+                        editingParticle.setNoteColor(new NoteColor(noteIndex));
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(setColorButton);
         }
-        
+
         // Rainbow Note Data Button
-        GuiActionButton setRainbowColorButton = new GuiActionButton(39,
-                                                                    rainbowColorMapping,
-                                                                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RAINBOW),
-                                                                    new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RAINBOW)) },
-                                                                    (button, isShiftClick) -> {
-                                                                        editingParticle.setNoteColor(new NoteColor(99));
-                                                                        callbackList.get(callbackListPosition + 1).execute();
-                                                                    });
+        GuiActionButton setRainbowColorButton = new GuiActionButton(
+                39,
+                rainbowColorMapping,
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RAINBOW),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RAINBOW))},
+                (button, isShiftClick) -> {
+                    editingParticle.setNoteColor(new NoteColor(99));
+                    callbackList.get(callbackListPosition + 1).execute();
+                });
         this.actionButtons.add(setRainbowColorButton);
-        
+
         // Rainbow Note Data Button
         List<ColorData> randomizedColorsList = Arrays.asList(colorMapping.clone());
         Collections.shuffle(randomizedColorsList);
         ColorData[] randomizedColors = new ColorData[randomizedColorsList.size()];
         randomizedColors = randomizedColorsList.toArray(randomizedColors);
-        GuiActionButton setRandomColorButton = new GuiActionButton(41,
-                                                                   randomizedColors,
-                                                                   LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RANDOM),
-                                                                   new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RANDOM)) },
-                                                                   (button, isShiftClick) -> {
-                                                                       editingParticle.setNoteColor(new NoteColor(98));
-                                                                       callbackList.get(callbackListPosition + 1).execute();
-                                                                   });
+        GuiActionButton setRandomColorButton = new GuiActionButton(
+                41,
+                randomizedColors,
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.RANDOM),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, LangManager.getText(Lang.RANDOM))},
+                (button, isShiftClick) -> {
+                    editingParticle.setNoteColor(new NoteColor(98));
+                    callbackList.get(callbackListPosition + 1).execute();
+                });
         this.actionButtons.add(setRandomColorButton);
     }
-    
+
     /**
      * Populates the Inventory with available item data options
-     * 
-     * @param editingParticle The ParticlePair that's being edited
-     * @param callbackList The List of GuiInventoryEditFinishedCallbacks 
+     *
+     * @param editingParticle      The ParticlePair that's being edited
+     * @param callbackList         The List of GuiInventoryEditFinishedCallbacks
      * @param callbackListPosition The index of the callbackList we're currently at
      */
     private void populateItemData(ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
-        List<Material> materialBag = new ArrayList<Material>();
+        List<Material> materialBag = new ArrayList<>();
         while (materialBag.size() < 36) { // Grab 36 random materials that are an item
             Material randomMaterial = ITEM_MATERIALS.get(RANDOM.nextInt(ITEM_MATERIALS.size()));
             if (!materialBag.contains(randomMaterial)) materialBag.add(randomMaterial);
         }
-        
+
         for (int i = 0; i < materialBag.size(); i++) {
             // Item Data Button
             Material material = materialBag.get(i);
-            GuiActionButton setRainbowColorButton = new GuiActionButton(i,
-                                                                        material,
-                                                                        LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + material.name().toLowerCase(),
-                                                                        new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, material.name().toLowerCase()) },
-                                                                        (button, isShiftClick) -> {
-                                                                            editingParticle.setItemMaterial(material);
-                                                                            callbackList.get(callbackListPosition + 1).execute();
-                                                                        });
+            GuiActionButton setRainbowColorButton = new GuiActionButton(
+                    i,
+                    material,
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + material.name().toLowerCase(),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, material.name().toLowerCase())},
+                    (button, isShiftClick) -> {
+                        editingParticle.setItemMaterial(material);
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(setRainbowColorButton);
         }
-        
+
         // Randomize Button, re-randomizes the icons
-        GuiActionButton randomizeButton = new GuiActionButton(45, 
-                                                              GuiIcon.RANDOMIZE.get(), 
-                                                              LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_ITEMS), 
-                                                              new String[] { LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_ITEMS_DESCRIPTION) },
-                                                              (block, isShiftClick) -> {
-                                                                  callbackList.get(callbackListPosition).execute(); // Just reopen the same inventory
-                                                              });
+        GuiActionButton randomizeButton = new GuiActionButton(
+                45,
+                GuiIcon.RANDOMIZE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_ITEMS),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_ITEMS_DESCRIPTION)},
+                (block, isShiftClick) -> {
+                    callbackList.get(callbackListPosition).execute(); // Just reopen the same inventory
+                });
         this.actionButtons.add(randomizeButton);
     }
-    
+
     /**
      * Populates the Inventory with available block data options
-     * 
-     * @param editingParticle The ParticlePair that's being edited
-     * @param callbackList The List of GuiInventoryEditFinishedCallbacks 
+     *
+     * @param editingParticle      The ParticlePair that's being edited
+     * @param callbackList         The List of GuiInventoryEditFinishedCallbacks
      * @param callbackListPosition The index of the callbackList we're currently at
      */
     private void populateBlockData(ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
-        List<Material> materialBag = new ArrayList<Material>();
+        List<Material> materialBag = new ArrayList<>();
         while (materialBag.size() < 36) { // Grab 36 random materials that are an item
             Material randomMaterial = BLOCK_MATERIALS.get(RANDOM.nextInt(BLOCK_MATERIALS.size()));
             if (!materialBag.contains(randomMaterial)) materialBag.add(randomMaterial);
         }
-        
+
         for (int i = 0; i < materialBag.size(); i++) {
             // Item Data Button
             Material material = materialBag.get(i);
-            GuiActionButton setRainbowColorButton = new GuiActionButton(i,
-                                                                        material,
-                                                                        LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + material.name().toLowerCase(),
-                                                                        new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, material.name().toLowerCase()) },
-                                                                        (button, isShiftClick) -> {
-                                                                            editingParticle.setBlockMaterial(material);
-                                                                            callbackList.get(callbackListPosition + 1).execute();
-                                                                        });
+            GuiActionButton setRainbowColorButton = new GuiActionButton(
+                    i,
+                    material,
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + material.name().toLowerCase(),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_DATA_DESCRIPTION, material.name().toLowerCase())},
+                    (button, isShiftClick) -> {
+                        editingParticle.setBlockMaterial(material);
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(setRainbowColorButton);
         }
-        
+
         // Randomize Button, re-randomizes the icons
-        GuiActionButton randomizeButton = new GuiActionButton(45, 
-                                                              GuiIcon.RANDOMIZE.get(), 
-                                                              LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_BLOCKS), 
-                                                              new String[] { LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_BLOCKS_DESCRIPTION) },
-                                                              (block, isShiftClick) -> {
-                                                                  callbackList.get(callbackListPosition).execute(); // Just reopen the same inventory
-                                                              });
+        GuiActionButton randomizeButton = new GuiActionButton(
+                45,
+                GuiIcon.RANDOMIZE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_BLOCKS),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_SELECT_DATA_RANDOMIZE_BLOCKS_DESCRIPTION)},
+                (block, isShiftClick) -> {
+                    callbackList.get(callbackListPosition).execute(); // Just reopen the same inventory
+                });
         this.actionButtons.add(randomizeButton);
     }
-    
+
     /**
      * A data class used for storing information about the color data
      */
@@ -336,44 +347,44 @@ public class GuiInventoryEditData extends GuiInventory {
         private Material material;
         private OrdinaryColor ordinaryColor;
         private Lang name;
-        
+
         public ColorData(DyeColor dyeColor, Material material, OrdinaryColor ordinaryColor, Lang name) {
             this.dyeColor = dyeColor;
             this.material = material;
             this.ordinaryColor = ordinaryColor;
             this.name = name;
         }
-        
+
         /**
-         * Get the DyeColor 
-         * 
+         * Get the DyeColor
+         *
          * @return The DyeColor
          */
         public DyeColor getDyeColor() {
             return this.dyeColor;
         }
-        
+
         /**
          * Get the Material representing this color
-         * 
+         *
          * @return The Material
          */
         public Material getMaterial() {
             return this.material;
         }
-        
+
         /**
          * Get the OrdinaryColor representing this color
-         * 
+         *
          * @return The OrdinaryColor
          */
         public OrdinaryColor getOrdinaryColor() {
             return this.ordinaryColor;
         }
-        
+
         /**
          * Get the name of this color
-         * 
+         *
          * @return The name of this color
          */
         public String getName() {
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
index a693f5e..93ca150 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
@@ -1,9 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.manager.PermissionManager;
@@ -12,33 +8,41 @@ import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleEffect;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
+import java.util.List;
 
 public class GuiInventoryEditEffect extends GuiInventory {
 
     public GuiInventoryEditEffect(PPlayer pplayer, ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_SELECT_EFFECT)));
-        
+
         // Select Effect Buttons
         List<ParticleEffect> effectsUserHasPermissionFor = PermissionManager.getEffectsUserHasPermissionFor(pplayer.getPlayer());
         for (int i = 0; i < effectsUserHasPermissionFor.size(); i++) {
+            // TODO: Paginate when there are more effects than will fit normally
             ParticleEffect effect = effectsUserHasPermissionFor.get(i);
-            GuiActionButton selectButton = new GuiActionButton(i, 
-                                                               GuiIcon.EFFECT.get(effect.getName()), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(effect.getName()),
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(effect.getName())) },
-                                                               (button, isShiftClick) -> {
-                                                                   editingParticle.setEffect(effect);
-                                                                   callbackList.get(callbackListPosition + 1).execute();
-                                                               });
+            GuiActionButton selectButton = new GuiActionButton(
+                    i,
+                    GuiIcon.EFFECT.get(effect.getName()),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(effect.getName()),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(effect.getName()))},
+                    (button, isShiftClick) -> {
+                        editingParticle.setEffect(effect);
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(selectButton);
         }
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            callbackList.get(callbackListPosition - 1).execute();
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> callbackList.get(callbackListPosition - 1).execute());
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditParticle.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditParticle.java
index 0ca77e0..36c2450 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditParticle.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditParticle.java
@@ -1,10 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
@@ -13,114 +8,123 @@ import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
+import org.bukkit.Bukkit;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class GuiInventoryEditParticle extends GuiInventory {
 
     public GuiInventoryEditParticle(PPlayer pplayer, ParticlePair editingParticle) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_EDITING_PARTICLE, editingParticle.getId())));
-        
+
         this.fillBorder(BorderColor.RED);
-        
+
         // Particle Info Icon
         String particleInfo = LangManager.getText(Lang.GUI_PARTICLE_INFO, editingParticle.getId(), editingParticle.getEffect().getName(), editingParticle.getStyle().getName(), editingParticle.getDataString());
-        GuiActionButton particleInfoIcon = new GuiActionButton(13, 
-                                                               GuiIcon.PARTICLES.get(), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_PARTICLE_NAME, editingParticle.getId()),
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + particleInfo },
-                                                               (button, isShiftClick) -> {});
+        GuiActionButton particleInfoIcon = new GuiActionButton(
+                13,
+                GuiIcon.PARTICLES.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_PARTICLE_NAME, editingParticle.getId()),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + particleInfo},
+                (button, isShiftClick) -> { });
         this.actionButtons.add(particleInfoIcon);
-        
+
         // Edit Effect Button
-        GuiActionButton editEffectButton = new GuiActionButton(38, 
-                                                               GuiIcon.EDIT_EFFECT.get(), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_EFFECT), 
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_EFFECT_DESCRIPTION) }, 
-                                                               (button, isShiftClick) -> {
-                                                                   List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                   callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
-                                                                   callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
-                                                                   callbacks.add(() -> {
-                                                                       ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                       for (ParticlePair particle : group.getParticles()) {
-                                                                           if (particle.getId() == editingParticle.getId()) {
-                                                                               particle.setEffect(editingParticle.getEffect());
-                                                                               break;
-                                                                           }
-                                                                       }
-                                                                       DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                       
-                                                                       GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
-                                                                   });
-                                                                   
-                                                                   callbacks.get(1).execute();
-                                                               });
+        GuiActionButton editEffectButton = new GuiActionButton(
+                38,
+                GuiIcon.EDIT_EFFECT.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_EFFECT),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_EFFECT_DESCRIPTION)},
+                (button, isShiftClick) -> {
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> {
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        for (ParticlePair particle : group.getParticles()) {
+                            if (particle.getId() == editingParticle.getId()) {
+                                particle.setEffect(editingParticle.getEffect());
+                                break;
+                            }
+                        }
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
+                    });
+
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(editEffectButton);
-        
+
         // Edit Style Button
-        GuiActionButton editStyleButton = new GuiActionButton(40, 
-                                                              GuiIcon.EDIT_STYLE.get(), 
-                                                              LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_STYLE), 
-                                                              new String[] { LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_STYLE_DESCRIPTION) }, 
-                                                              (button, isShiftClick) -> {
-                                                                  List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                  callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
-                                                                  callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 1)));
-                                                                  callbacks.add(() -> {
-                                                                      ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                      for (ParticlePair particle : group.getParticles()) {
-                                                                          if (particle.getId() == editingParticle.getId()) {
-                                                                              particle.setStyle(editingParticle.getStyle());
-                                                                              break;
-                                                                          }
-                                                                      }
-                                                                      DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                      
-                                                                      GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
-                                                                  });
-                                                                  
-                                                                  callbacks.get(1).execute();
-                                                              });
+        GuiActionButton editStyleButton = new GuiActionButton(40,
+                GuiIcon.EDIT_STYLE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_STYLE),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_STYLE_DESCRIPTION)},
+                (button, isShiftClick) -> {
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> {
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        for (ParticlePair particle : group.getParticles()) {
+                            if (particle.getId() == editingParticle.getId()) {
+                                particle.setStyle(editingParticle.getStyle());
+                                break;
+                            }
+                        }
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
+                    });
+
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(editStyleButton);
-        
+
         // Edit Data Button
         boolean usesData = editingParticle.getEffect().hasProperty(ParticleProperty.COLORABLE) || editingParticle.getEffect().hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA);
-        GuiActionButton editDataButton = new GuiActionButton(42, 
-                                                             GuiIcon.EDIT_DATA.get(), 
-                                                             LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_DATA), 
-                                                             usesData ? new String[] { LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_DATA_DESCRIPTION) } : 
-                                                                        new String[] { LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_DATA_UNAVAILABLE) }, 
-                                                             (button, isShiftClick) -> {
-                                                                 if (usesData) {
-                                                                     List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                     callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
-                                                                     callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 1)));
-                                                                     callbacks.add(() -> {
-                                                                         ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                         for (ParticlePair particle : group.getParticles()) {
-                                                                             if (particle.getId() == editingParticle.getId()) {
-                                                                                 particle.setColor(editingParticle.getColor());
-                                                                                 particle.setNoteColor(editingParticle.getNoteColor());
-                                                                                 particle.setItemMaterial(editingParticle.getItemMaterial());
-                                                                                 particle.setBlockMaterial(editingParticle.getBlockMaterial());
-                                                                                 break;
-                                                                             }
-                                                                         }
-                                                                         DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                         
-                                                                         GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
-                                                                     });
-                                                                     
-                                                                     callbacks.get(1).execute();
-                                                                 }
-                                                             });
+        GuiActionButton editDataButton = new GuiActionButton(42,
+                GuiIcon.EDIT_DATA.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_EDIT_DATA),
+                usesData ? new String[]{LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_EDIT_DATA_DESCRIPTION)} :
+                        new String[]{LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_EDIT_DATA_UNAVAILABLE)},
+                (button, isShiftClick) -> {
+                    if (usesData) {
+                        List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                        callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle)));
+                        callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 1)));
+                        callbacks.add(() -> {
+                            ParticleGroup group = pplayer.getActiveParticleGroup();
+                            for (ParticlePair particle : group.getParticles()) {
+                                if (particle.getId() == editingParticle.getId()) {
+                                    particle.setColor(editingParticle.getColor());
+                                    particle.setNoteColor(editingParticle.getNoteColor());
+                                    particle.setItemMaterial(editingParticle.getItemMaterial());
+                                    particle.setBlockMaterial(editingParticle.getBlockMaterial());
+                                    break;
+                                }
+                            }
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                            GuiHandler.transition(new GuiInventoryEditParticle(pplayer, editingParticle));
+                        });
+
+                        callbacks.get(1).execute();
+                    }
+                });
         this.actionButtons.add(editDataButton);
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryManageParticles(pplayer)));
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
index 828eaf5..16d2cf1 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
@@ -1,9 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.manager.PermissionManager;
@@ -12,33 +8,40 @@ import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.styles.api.ParticleStyle;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
+import java.util.List;
 
 public class GuiInventoryEditStyle extends GuiInventory {
 
     public GuiInventoryEditStyle(PPlayer pplayer, ParticlePair editingParticle, List<GuiInventoryEditFinishedCallback> callbackList, int callbackListPosition) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_SELECT_STYLE)));
-        
+
         // Select Style Buttons
         List<ParticleStyle> stylesUserHasPermissionFor = PermissionManager.getStylesUserHasPermissionFor(pplayer.getPlayer());
         for (int i = 0; i < stylesUserHasPermissionFor.size(); i++) {
             ParticleStyle style = stylesUserHasPermissionFor.get(i);
-            GuiActionButton selectButton = new GuiActionButton(i, 
-                                                               GuiIcon.STYLE.get(style.getName()), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(style.getName()),
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(style.getName())) },
-                                                               (button, isShiftClick) -> {
-                                                                   editingParticle.setStyle(style);
-                                                                   callbackList.get(callbackListPosition + 1).execute();
-                                                               });
+            GuiActionButton selectButton = new GuiActionButton(
+                    i,
+                    GuiIcon.STYLE.get(style.getName()),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(style.getName()),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(style.getName()))},
+                    (button, isShiftClick) -> {
+                        editingParticle.setStyle(style);
+                        callbackList.get(callbackListPosition + 1).execute();
+                    });
             this.actionButtons.add(selectButton);
         }
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            callbackList.get(callbackListPosition - 1).execute();
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> callbackList.get(callbackListPosition - 1).execute());
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
index 22eb52e..21a2c48 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
@@ -1,10 +1,5 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.Comparator;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
@@ -16,14 +11,18 @@ import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticleGroupPreset;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
+import java.util.Comparator;
+import java.util.List;
 
 public class GuiInventoryLoadPresetGroups extends GuiInventory {
 
     public GuiInventoryLoadPresetGroups(PPlayer pplayer, boolean isEndPoint) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP)));
-        
+
         this.fillBorder(BorderColor.GREEN);
-        
+
         int index = 10;
         int nextWrap = 17;
         int maxIndex = 43;
@@ -31,15 +30,15 @@ public class GuiInventoryLoadPresetGroups extends GuiInventory {
         for (ParticleGroupPreset group : groups) {
             List<ParticlePair> particles = group.getGroup().getParticles();
             particles.sort(Comparator.comparingInt(ParticlePair::getId));
-            
+
             String[] lore = new String[particles.size() + 1];
             lore[0] = LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_LOAD, particles.size());
             int i = 1;
             for (ParticlePair particle : particles) {
                 lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString());
                 i++;
-            } 
-            
+            }
+
             // Load Group Buttons
             GuiActionButton groupButton = new GuiActionButton(index, group.getGuiIcon(), LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getDisplayName(), lore, (button, isShiftClick) -> {
                 ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
@@ -47,40 +46,43 @@ public class GuiInventoryLoadPresetGroups extends GuiInventory {
                 for (ParticlePair particle : particles)
                     activeGroup.getParticles().add(particle.clone());
                 DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
-                
+
                 if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
                     pplayer.getPlayer().closeInventory();
                 }
             });
             this.actionButtons.add(groupButton);
-            
+
             index++;
             if (index == nextWrap) { // Loop around border
                 nextWrap += 9;
-                index += 2; 
+                index += 2;
             }
             if (index > maxIndex) break; // Overflowed the available space
         }
-        
+
         if (!isEndPoint) {
             // Back Button
-            GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-                GuiHandler.transition(new GuiInventoryDefault(pplayer));
-            });
+            GuiActionButton backButton = new GuiActionButton(
+                    INVENTORY_SIZE - 1, GuiIcon.BACK.get(),
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                    new String[]{},
+                    (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
             this.actionButtons.add(backButton);
         } else {
             // Reset Particles Button
-            GuiActionButton resetParticles = new GuiActionButton(49,
-                                                                 GuiIcon.RESET.get(),
-                                                                 LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_RESET_PARTICLES),
-                                                                 new String[] { LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_RESET_PARTICLES_DESCRIPTION) },
-                                                                 (button, isShiftClick) -> {
-                                                                     // Reset particles
-                                                                     DataManager.saveParticleGroup(pplayer.getUniqueId(), ParticleGroup.getDefaultGroup());
-                                                                 });
+            GuiActionButton resetParticles = new GuiActionButton(
+                    49,
+                    GuiIcon.RESET.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_RESET_PARTICLES),
+                    new String[]{LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_RESET_PARTICLES_DESCRIPTION)},
+                    (button, isShiftClick) -> {
+                        // Reset particles
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), ParticleGroup.getDefaultGroup());
+                    });
             this.actionButtons.add(resetParticles);
         }
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageFixedEffects.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageFixedEffects.java
new file mode 100644
index 0000000..cfb0bd5
--- /dev/null
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageFixedEffects.java
@@ -0,0 +1,165 @@
+package com.esophose.playerparticles.gui;
+
+import com.esophose.playerparticles.gui.hook.PlayerChatHook;
+import com.esophose.playerparticles.gui.hook.PlayerChatHookData;
+import com.esophose.playerparticles.manager.DataManager;
+import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.LangManager.Lang;
+import com.esophose.playerparticles.manager.PermissionManager;
+import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
+import com.esophose.playerparticles.manager.SettingManager.PSetting;
+import com.esophose.playerparticles.particles.PPlayer;
+import com.esophose.playerparticles.particles.ParticleGroup;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class GuiInventoryManageFixedEffects extends GuiInventory {
+
+    public GuiInventoryManageFixedEffects(PPlayer pplayer) {
+        super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS)));
+
+        this.fillBorder(BorderColor.YELLOW);
+
+        int index = 10;
+        int nextWrap = 17;
+        int maxIndex = 35;
+        List<ParticleGroup> groups = pplayer.getParticleGroups();
+        groups.sort(Comparator.comparing(ParticleGroup::getName));
+
+        for (ParticleGroup group : groups) {
+            if (group.getName().equals(ParticleGroup.DEFAULT_NAME)) continue;
+
+            List<ParticlePair> particles = group.getParticles();
+            particles.sort(Comparator.comparingInt(ParticlePair::getId));
+
+            String[] lore = new String[particles.size() + 2];
+            lore[0] = LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_LOAD, particles.size());
+            int i = 1;
+            for (ParticlePair particle : particles) {
+                lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString());
+                i++;
+            }
+            lore[i] = LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE);
+
+            // Load Group Buttons
+            GuiActionButton groupButton = new GuiActionButton(
+                    index, GuiIcon.GROUPS.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getName(),
+                    lore,
+                    (button, isShiftClick) -> {
+                        if (isShiftClick) {
+                            DataManager.removeParticleGroup(pplayer.getUniqueId(), group);
+
+                            this.actionButtons.remove(button);
+                            this.inventory.setItem(button.getSlot(), null);
+                        } else {
+                            ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+                            activeGroup.getParticles().clear();
+                            for (ParticlePair particle : particles)
+                                activeGroup.getParticles().add(particle.clone());
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+
+                            if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
+                                pplayer.getPlayer().closeInventory();
+                            }
+                        }
+                    });
+            this.actionButtons.add(groupButton);
+
+            index++;
+            if (index == nextWrap) { // Loop around border
+                nextWrap += 9;
+                index += 2;
+            }
+            if (index > maxIndex) break; // Overflowed the available space
+        }
+
+        boolean hasReachedMax = PermissionManager.hasPlayerReachedMaxGroups(pplayer);
+        boolean hasParticles = !pplayer.getActiveParticles().isEmpty();
+        String[] lore;
+        if (hasReachedMax) {
+            lore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_FULL)
+            };
+        } else if (!hasParticles) {
+            lore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_NO_PARTICLES)
+            };
+        } else {
+            lore = new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION)};
+        }
+
+        // Save Group Button
+        GuiActionButton saveGroupButton = new GuiActionButton(
+                40,
+                GuiIcon.CREATE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SAVE_GROUP),
+                lore,
+                (button, isShiftClick) -> {
+                    if (hasReachedMax || !hasParticles)
+                        return;
+
+                    PlayerChatHook.addHook(new PlayerChatHookData(pplayer.getUniqueId(), 15, (textEntered) -> {
+                        if (textEntered == null || textEntered.equalsIgnoreCase("cancel")) {
+                            GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                        } else {
+                            String groupName = textEntered.split(" ")[0];
+
+                            // Check that the groupName isn't the reserved name
+                            if (groupName.equalsIgnoreCase(ParticleGroup.DEFAULT_NAME)) {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_RESERVED);
+                                return;
+                            }
+
+                            // The database column can only hold up to 100 characters, cut it off there
+                            if (groupName.length() >= 100) {
+                                groupName = groupName.substring(0, 100);
+                            }
+
+                            // Use the existing group if available, otherwise create a new one
+                            ParticleGroup group = pplayer.getParticleGroupByName(groupName);
+                            boolean groupUpdated = false;
+                            if (group == null) {
+                                List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                                for (ParticlePair particle : pplayer.getActiveParticles())
+                                    particles.add(particle.clone()); // Make sure the ParticlePairs aren't the same references in both the active and saved group
+                                group = new ParticleGroup(groupName, particles);
+                            } else {
+                                groupUpdated = true;
+                            }
+
+                            // Apply changes and notify player
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+                            if (groupUpdated) {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS_OVERWRITE, groupName);
+                            } else {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS, groupName);
+                            }
+
+                            GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                        }
+                    }));
+                    pplayer.getPlayer().closeInventory();
+                });
+        this.actionButtons.add(saveGroupButton);
+
+        // Back Button
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
+        this.actionButtons.add(backButton);
+
+        this.populate();
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
index aaf3a41..afc1160 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
@@ -1,43 +1,42 @@
 package com.esophose.playerparticles.gui;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.esophose.playerparticles.gui.hook.PlayerChatHook;
 import com.esophose.playerparticles.gui.hook.PlayerChatHookData;
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
-import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
+import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
 import com.esophose.playerparticles.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 public class GuiInventoryManageGroups extends GuiInventory {
 
     public GuiInventoryManageGroups(PPlayer pplayer) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS)));
-        
+
         this.fillBorder(BorderColor.BROWN);
-        
+
         int index = 10;
         int nextWrap = 17;
         int maxIndex = 35;
         List<ParticleGroup> groups = pplayer.getParticleGroups();
         groups.sort(Comparator.comparing(ParticleGroup::getName));
-        
+
         for (ParticleGroup group : groups) {
             if (group.getName().equals(ParticleGroup.DEFAULT_NAME)) continue;
-            
+
             List<ParticlePair> particles = group.getParticles();
             particles.sort(Comparator.comparingInt(ParticlePair::getId));
-            
+
             String[] lore = new String[particles.size() + 2];
             lore[0] = LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_LOAD, particles.size());
             int i = 1;
@@ -46,111 +45,120 @@ public class GuiInventoryManageGroups extends GuiInventory {
                 i++;
             }
             lore[i] = LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE);
-            
+
             // Load Group Buttons
-            GuiActionButton groupButton = new GuiActionButton(index, GuiIcon.GROUPS.get(), LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getName(), lore, (button, isShiftClick) -> {
-                if (isShiftClick) {
-                    DataManager.removeParticleGroup(pplayer.getUniqueId(), group);
-                    
-                    this.actionButtons.remove(button);
-                    this.inventory.setItem(button.getSlot(), null);
-                } else {
-                    ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
-                    activeGroup.getParticles().clear();
-                    for (ParticlePair particle : particles)
-                        activeGroup.getParticles().add(particle.clone());
-                    DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
-                    
-                    if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
-                        pplayer.getPlayer().closeInventory();
-                    }
-                }
-            });
+            GuiActionButton groupButton = new GuiActionButton(
+                    index,
+                    GuiIcon.GROUPS.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getName(),
+                    lore,
+                    (button, isShiftClick) -> {
+                        if (isShiftClick) {
+                            DataManager.removeParticleGroup(pplayer.getUniqueId(), group);
+
+                            this.actionButtons.remove(button);
+                            this.inventory.setItem(button.getSlot(), null);
+                        } else {
+                            ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+                            activeGroup.getParticles().clear();
+                            for (ParticlePair particle : particles)
+                                activeGroup.getParticles().add(particle.clone());
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+
+                            if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
+                                pplayer.getPlayer().closeInventory();
+                            }
+                        }
+                    });
             this.actionButtons.add(groupButton);
-            
+
             index++;
             if (index == nextWrap) { // Loop around border
                 nextWrap += 9;
-                index += 2; 
+                index += 2;
             }
             if (index > maxIndex) break; // Overflowed the available space
         }
-        
+
         boolean hasReachedMax = PermissionManager.hasPlayerReachedMaxGroups(pplayer);
         boolean hasParticles = !pplayer.getActiveParticles().isEmpty();
         String[] lore;
         if (hasReachedMax) {
-            lore = new String[] { 
-                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION), 
-                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_FULL)
+            lore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_FULL)
             };
         } else if (!hasParticles) {
-            lore = new String[] { 
-                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION), 
-                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_NO_PARTICLES)
+            lore = new String[]{
+                    LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION),
+                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_NO_PARTICLES)
             };
         } else {
-            lore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION) };
+            lore = new String[]{LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION)};
         }
-        
+
         // Save Group Button
-        GuiActionButton saveGroupButton = new GuiActionButton(40, 
-                                                              GuiIcon.CREATE.get(), 
-                                                              LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SAVE_GROUP),
-                                                              lore,
-                                                              (button, isShiftClick) -> {
-                                                                  if (hasReachedMax || !hasParticles) return;
-                                                                  
-                                                                  PlayerChatHook.addHook(new PlayerChatHookData(pplayer.getUniqueId(), 15, (textEntered) -> {
-                                                                      if (textEntered == null || textEntered.equalsIgnoreCase("cancel")) {
-                                                                          GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
-                                                                      } else {
-                                                                          String groupName = textEntered.split(" ")[0];
-                                                                          
-                                                                          // Check that the groupName isn't the reserved name
-                                                                          if (groupName.equalsIgnoreCase(ParticleGroup.DEFAULT_NAME)) {
-                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_RESERVED);
-                                                                              return;
-                                                                          }
-                                                                          
-                                                                          // The database column can only hold up to 100 characters, cut it off there
-                                                                          if (groupName.length() >= 100) {
-                                                                              groupName = groupName.substring(0, 100);
-                                                                          }
-                                                                          
-                                                                          // Use the existing group if available, otherwise create a new one
-                                                                          ParticleGroup group = pplayer.getParticleGroupByName(groupName);
-                                                                          boolean groupUpdated = false;
-                                                                          if (group == null) {
-                                                                              List<ParticlePair> particles = new ArrayList<ParticlePair>();
-                                                                              for (ParticlePair particle : pplayer.getActiveParticles())
-                                                                                  particles.add(particle.clone()); // Make sure the ParticlePairs aren't the same references in both the active and saved group
-                                                                              group = new ParticleGroup(groupName, particles);
-                                                                          } else {
-                                                                              groupUpdated = true;
-                                                                          }
-                                                                          
-                                                                          // Apply changes and notify player
-                                                                          DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                          if (groupUpdated) {
-                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS_OVERWRITE, groupName);
-                                                                          } else {
-                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS, groupName);
-                                                                          }
-                                                                          
-                                                                          GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
-                                                                      }
-                                                                  }));
-                                                                  pplayer.getPlayer().closeInventory();
-                                                              });
+        GuiActionButton saveGroupButton = new GuiActionButton(
+                40,
+                GuiIcon.CREATE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SAVE_GROUP),
+                lore,
+                (button, isShiftClick) -> {
+                    if (hasReachedMax || !hasParticles) return;
+
+                    PlayerChatHook.addHook(new PlayerChatHookData(pplayer.getUniqueId(), 15, (textEntered) -> {
+                        if (textEntered == null || textEntered.equalsIgnoreCase("cancel")) {
+                            GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                        } else {
+                            String groupName = textEntered.split(" ")[0];
+
+                            // Check that the groupName isn't the reserved name
+                            if (groupName.equalsIgnoreCase(ParticleGroup.DEFAULT_NAME)) {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_RESERVED);
+                                return;
+                            }
+
+                            // The database column can only hold up to 100 characters, cut it off there
+                            if (groupName.length() >= 100) {
+                                groupName = groupName.substring(0, 100);
+                            }
+
+                            // Use the existing group if available, otherwise create a new one
+                            ParticleGroup group = pplayer.getParticleGroupByName(groupName);
+                            boolean groupUpdated = false;
+                            if (group == null) {
+                                List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                                for (ParticlePair particle : pplayer.getActiveParticles())
+                                    particles.add(particle.clone()); // Make sure the ParticlePairs aren't the same references in both the active and saved group
+                                group = new ParticleGroup(groupName, particles);
+                            } else {
+                                groupUpdated = true;
+                            }
+
+                            // Apply changes and notify player
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+                            if (groupUpdated) {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS_OVERWRITE, groupName);
+                            } else {
+                                LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS, groupName);
+                            }
+
+                            GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                        }
+                    }));
+                    pplayer.getPlayer().closeInventory();
+                });
         this.actionButtons.add(saveGroupButton);
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            GuiHandler.transition(new GuiInventoryDefault(pplayer));
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
index c06a4f0..cb40238 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
@@ -1,128 +1,132 @@
 package com.esophose.playerparticles.gui;
 
+import com.esophose.playerparticles.manager.DataManager;
+import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.LangManager.Lang;
+import com.esophose.playerparticles.manager.PermissionManager;
+import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
+import com.esophose.playerparticles.particles.PPlayer;
+import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
+import com.esophose.playerparticles.particles.ParticleGroup;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.util.ParticleUtils;
+import org.bukkit.Bukkit;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import org.bukkit.Bukkit;
-
-import com.esophose.playerparticles.manager.DataManager;
-import com.esophose.playerparticles.manager.LangManager;
-import com.esophose.playerparticles.manager.PermissionManager;
-import com.esophose.playerparticles.manager.LangManager.Lang;
-import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
-import com.esophose.playerparticles.particles.PPlayer;
-import com.esophose.playerparticles.particles.ParticleGroup;
-import com.esophose.playerparticles.particles.ParticlePair;
-import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
-import com.esophose.playerparticles.util.ParticleUtils;
-
 public class GuiInventoryManageParticles extends GuiInventory {
 
     public GuiInventoryManageParticles(PPlayer pplayer) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES)));
-        
+
         this.fillBorder(BorderColor.ORANGE);
-        
+
         // Manage/Delete Particle Buttons
         List<ParticlePair> particles = pplayer.getActiveParticles();
         particles.sort(Comparator.comparingInt(ParticlePair::getId));
-        
+
         int index = 10;
         int nextWrap = 17;
         int maxIndex = 35;
         for (ParticlePair particle : particles) {
-            GuiActionButton selectButton = new GuiActionButton(index, 
-                                                               GuiIcon.PARTICLES.get(), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_PARTICLE_NAME, particle.getId()),
-                                                               new String[] {
-                                                                   LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_EDIT_PARTICLE, particles.size()),
-                                                                   LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString()),
-                                                                   LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE)
-                                                               },
-                                                               (button, isShiftClick) -> {
-                                                                   if (!isShiftClick) {
-                                                                       GuiHandler.transition(new GuiInventoryEditParticle(pplayer, particle));
-                                                                   } else {
-                                                                       // Delete particle
-                                                                       ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
-                                                                       for (ParticlePair pp : activeGroup.getParticles()) {
-                                                                           if (pp.getId() == particle.getId()) {
-                                                                               activeGroup.getParticles().remove(pp);
-                                                                               break;
-                                                                           }
-                                                                       }
-                                                                       DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
-                                                                       
-                                                                       // Update inventory to reflect deletion
-                                                                       this.actionButtons.remove(button);
-                                                                       this.inventory.setItem(button.getSlot(), null);
-                                                                   }
-                                                               });
+            GuiActionButton selectButton = new GuiActionButton(
+                    index,
+                    GuiIcon.PARTICLES.get(),
+                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_PARTICLE_NAME, particle.getId()),
+                    new String[]{
+                            LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_EDIT_PARTICLE, particles.size()),
+                            LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString()),
+                            LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE)
+                    },
+                    (button, isShiftClick) -> {
+                        if (!isShiftClick) {
+                            GuiHandler.transition(new GuiInventoryEditParticle(pplayer, particle));
+                        } else {
+                            // Delete particle
+                            ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+                            for (ParticlePair pp : activeGroup.getParticles()) {
+                                if (pp.getId() == particle.getId()) {
+                                    activeGroup.getParticles().remove(pp);
+                                    break;
+                                }
+                            }
+                            DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+
+                            // Update inventory to reflect deletion
+                            this.actionButtons.remove(button);
+                            this.inventory.setItem(button.getSlot(), null);
+                        }
+                    });
             this.actionButtons.add(selectButton);
-            
+
             index++;
             if (index == nextWrap) { // Loop around border
                 nextWrap += 9;
-                index += 2; 
+                index += 2;
             }
             if (index > maxIndex) break; // Overflowed the available space
         }
-        
+
         // Create New Particle Button
         boolean canCreate = pplayer.getActiveParticles().size() < PermissionManager.getMaxParticlesAllowed(pplayer.getPlayer());
         String lore = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_CREATE_PARTICLE_DESCRIPTION);
-        GuiActionButton createNewParticle = new GuiActionButton(38, 
-                                                                GuiIcon.CREATE.get(), 
-                                                                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_CREATE_PARTICLE),
-                                                                canCreate ? new String[] { lore } : new String[] { lore, LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_CREATE_PARTICLE_UNAVAILABLE) },
-                                                                (button, isShiftClick) -> {
-                                                                    if (!canCreate) return;
-                                                                    ParticlePair editingParticle = ParticlePair.getNextDefault(pplayer);
-                                                                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<GuiInventoryEditFinishedCallback>();
-                                                                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryManageParticles(pplayer)));
-                                                                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
-                                                                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 2)));
-                                                                    callbacks.add(() -> {
-                                                                        if (editingParticle.getEffect().hasProperty(ParticleProperty.COLORABLE) || editingParticle.getEffect().hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
-                                                                            GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 3));
-                                                                        } else {
-                                                                            callbacks.get(4).execute();
-                                                                        }
-                                                                    });
-                                                                    callbacks.add(() -> {
-                                                                        // Save new particle
-                                                                        ParticleGroup group = pplayer.getActiveParticleGroup();
-                                                                        group.getParticles().add(editingParticle);
-                                                                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
-                                                                        
-                                                                        // Reopen the manage particle inventory
-                                                                        GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
-                                                                    });
-                                                                    callbacks.get(1).execute();
-                                                                });
+        GuiActionButton createNewParticle = new GuiActionButton(
+                38,
+                GuiIcon.CREATE.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_CREATE_PARTICLE),
+                canCreate ? new String[]{lore} : new String[]{lore, LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_CREATE_PARTICLE_UNAVAILABLE)},
+                (button, isShiftClick) -> {
+                    if (!canCreate) return;
+                    ParticlePair editingParticle = ParticlePair.getNextDefault(pplayer);
+                    List<GuiInventoryEditFinishedCallback> callbacks = new ArrayList<>();
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryManageParticles(pplayer)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditEffect(pplayer, editingParticle, callbacks, 1)));
+                    callbacks.add(() -> GuiHandler.transition(new GuiInventoryEditStyle(pplayer, editingParticle, callbacks, 2)));
+                    callbacks.add(() -> {
+                        if (editingParticle.getEffect().hasProperty(ParticleProperty.COLORABLE) || editingParticle.getEffect().hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+                            GuiHandler.transition(new GuiInventoryEditData(pplayer, editingParticle, callbacks, 3));
+                        } else {
+                            callbacks.get(4).execute();
+                        }
+                    });
+                    callbacks.add(() -> {
+                        // Save new particle
+                        ParticleGroup group = pplayer.getActiveParticleGroup();
+                        group.getParticles().add(editingParticle);
+                        DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+
+                        // Reopen the manage particle inventory
+                        GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
+                    });
+                    callbacks.get(1).execute();
+                });
         this.actionButtons.add(createNewParticle);
-        
+
         // Reset Particles Button
         GuiActionButton resetParticles = new GuiActionButton(42,
-                                                             GuiIcon.RESET.get(),
-                                                             LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_RESET_PARTICLES),
-                                                             new String[] { LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_RESET_PARTICLES_DESCRIPTION) },
-                                                             (button, isShiftClick) -> {
-                                                                 // Reset particles
-                                                                 DataManager.saveParticleGroup(pplayer.getUniqueId(), ParticleGroup.getDefaultGroup());
-                                                                 
-                                                                 // Reopen this same inventory to refresh it
-                                                                 GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
-                                                             });
+                GuiIcon.RESET.get(),
+                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_RESET_PARTICLES),
+                new String[]{LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_RESET_PARTICLES_DESCRIPTION)},
+                (button, isShiftClick) -> {
+                    // Reset particles
+                    DataManager.saveParticleGroup(pplayer.getUniqueId(), ParticleGroup.getDefaultGroup());
+
+                    // Reopen this same inventory to refresh it
+                    GuiHandler.transition(new GuiInventoryManageParticles(pplayer));
+                });
         this.actionButtons.add(resetParticles);
-        
+
         // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            GuiHandler.transition(new GuiInventoryDefault(pplayer));
-        });
+        GuiActionButton backButton = new GuiActionButton(
+                INVENTORY_SIZE - 1,
+                GuiIcon.BACK.get(),
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON),
+                new String[]{},
+                (button, isShiftClick) -> GuiHandler.transition(new GuiInventoryDefault(pplayer)));
         this.actionButtons.add(backButton);
-        
+
         this.populate();
     }
 
diff --git a/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java b/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
index b75d328..acc729c 100644
--- a/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
+++ b/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
@@ -27,13 +27,12 @@ public class PlayerChatHook extends BukkitRunnable implements Listener {
      * Initializes all the static values for this class
      */
     public static void setup() {
-        hooks = new HashSet<PlayerChatHookData>();
+        hooks = new HashSet<>();
         if (hookTask != null)
             hookTask.cancel();
         hookTask = new PlayerChatHook().runTaskTimer(PlayerParticles.getPlugin(), 0, 20);
     }
     
-    
     /**
      * Called when a player sends a message in chat
      * 
@@ -55,7 +54,7 @@ public class PlayerChatHook extends BukkitRunnable implements Listener {
      * Ticked every second to decrease the seconds remaining on each hook
      */
     public void run() {
-        Set<PlayerChatHookData> hooksToRemove = new HashSet<PlayerChatHookData>();
+        Set<PlayerChatHookData> hooksToRemove = new HashSet<>();
         
         for (PlayerChatHookData hook : hooks) {
             hook.decrementHookLength();
@@ -84,7 +83,7 @@ public class PlayerChatHook extends BukkitRunnable implements Listener {
      */
     public static void addHook(PlayerChatHookData newHook) {
         for (PlayerChatHookData hook : hooks) {
-            if (hook.getPlayerUUID().equals(hook.getPlayerUUID())) {
+            if (hook.getPlayerUUID().equals(newHook.getPlayerUUID())) {
                 hooks.remove(hook);
                 break;
             }
diff --git a/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java b/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java
index b1a7336..64edfb8 100644
--- a/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java
+++ b/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java
@@ -61,8 +61,8 @@ public class PlayerChatHookData {
      * Allows simple hooking into the player chat for a specific time interval
      */
     @FunctionalInterface
-    public static interface PlayerChatHookCallback {
-        public void onPlayerChat(String textEntered);
+    public interface PlayerChatHookCallback {
+        void onPlayerChat(String textEntered);
     }
 
 }
diff --git a/src/com/esophose/playerparticles/manager/DataManager.java b/src/com/esophose/playerparticles/manager/DataManager.java
index c883234..105d7bb 100644
--- a/src/com/esophose/playerparticles/manager/DataManager.java
+++ b/src/com/esophose/playerparticles/manager/DataManager.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.scheduler.BukkitRunnable;
 
@@ -27,14 +28,14 @@ import com.esophose.playerparticles.util.ParticleUtils;
 public class DataManager {
 
     private DataManager() {
-        
+
     }
 
     /**
      * Gets a PPlayer from cache
      * This method should be used over the other one unless you absolutely need the PPlayer and you don't care about waiting
      * You should always check for a null result when using this method
-     * 
+     *
      * @param playerUUID The PPlayer to get
      * @return The PPlayer from cache
      */
@@ -42,7 +43,7 @@ public class DataManager {
         List<PPlayer> pplayers = ParticleManager.getPPlayers();
         synchronized (pplayers) { // Under rare circumstances, the PPlayers list can be changed while it's looping
             for (PPlayer pp : pplayers)
-                if (pp.getUniqueId().equals(playerUUID)) 
+                if (pp.getUniqueId().equals(playerUUID))
                     return pp;
             return null;
         }
@@ -50,7 +51,7 @@ public class DataManager {
 
     /**
      * Gets a player from the save data, creates one if it doesn't exist and caches it
-     * 
+     *
      * @param playerUUID The pplayer to get
      * @param callback The callback to execute with the found pplayer, or a newly generated one
      */
@@ -72,26 +73,26 @@ public class DataManager {
                 String settingsQuery = "SELECT particles_hidden FROM pp_settings WHERE player_uuid = ?";
                 try (PreparedStatement statement = connection.prepareStatement(settingsQuery)) {
                     statement.setString(1, playerUUID.toString());
-                    
+
                     ResultSet result = statement.executeQuery();
                     if (result.next()) {
                         particlesHidden = result.getBoolean("particles_hidden");
                     } else {
                         statement.close();
-                        
+
                         String updateQuery = "INSERT INTO pp_settings (player_uuid, particles_hidden) VALUES (?, ?)";
                         try (PreparedStatement updateStatement = connection.prepareStatement(updateQuery)) {
                             updateStatement.setString(1, playerUUID.toString());
                             updateStatement.setBoolean(2, false);
-                            
+
                             updateStatement.executeUpdate();
                         }
                     }
                 }
-                
+
                 // Load particle groups
                 String groupQuery = "SELECT * FROM pp_group g " + // @formatter:off
-        					   	    "JOIN pp_particle p ON g.uuid = p.group_uuid " + 
+        					   	    "JOIN pp_particle p ON g.uuid = p.group_uuid " +
         					   	    "WHERE g.owner_uuid = ?"; // @formatter:on
                 try (PreparedStatement statement = connection.prepareStatement(groupQuery)) {
                     statement.setString(1, playerUUID.toString());
@@ -105,8 +106,8 @@ public class DataManager {
                         int id = result.getInt("id");
                         ParticleEffect effect = ParticleEffect.fromName(result.getString("effect"));
                         ParticleStyle style = ParticleStyle.fromName(result.getString("style"));
-                        Material itemMaterial = ParticleUtils.closestMatchWithFallback(result.getString("item_material"));
-                        Material blockMaterial = ParticleUtils.closestMatchWithFallback(result.getString("block_material"));
+                        Material itemMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("item_material"));
+                        Material blockMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("block_material"));
                         NoteColor noteColor = new NoteColor(result.getInt("note"));
                         OrdinaryColor color = new OrdinaryColor(result.getInt("r"), result.getInt("g"), result.getInt("b"));
                         ParticlePair particle = new ParticlePair(playerUUID, id, effect, style, itemMaterial, blockMaterial, color, noteColor);
@@ -123,7 +124,7 @@ public class DataManager {
 
                         // Add the particle to a new group if one didn't already exist
                         if (!groupAlreadyExists) {
-                            List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                            List<ParticlePair> particles = new ArrayList<>();
                             particles.add(particle);
                             ParticleGroup newGroup = new ParticleGroup(groupName, particles);
                             groups.add(newGroup);
@@ -133,7 +134,7 @@ public class DataManager {
 
                 // Load fixed effects
                 String fixedQuery = "SELECT f.id AS f_id, f.world, f.xPos, f.yPos, f.zPos, p.id AS p_id, p.effect, p.style, p.item_material, p.block_material, p.note, p.r, p.g, p.b FROM pp_fixed f " + // @formatter:off
-        						    "JOIN pp_particle p ON f.particle_uuid = p.uuid " + 
+        						    "JOIN pp_particle p ON f.particle_uuid = p.uuid " +
         						    "WHERE f.owner_uuid = ?"; // @formatter:on
                 try (PreparedStatement statement = connection.prepareStatement(fixedQuery)) {
                     statement.setString(1, playerUUID.toString());
@@ -151,8 +152,8 @@ public class DataManager {
                         int particleId = result.getInt("p_id");
                         ParticleEffect effect = ParticleEffect.fromName(result.getString("effect"));
                         ParticleStyle style = ParticleStyle.fromName(result.getString("style"));
-                        Material itemMaterial = ParticleUtils.closestMatchWithFallback(result.getString("item_material"));
-                        Material blockMaterial = ParticleUtils.closestMatchWithFallback(result.getString("block_material"));
+                        Material itemMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("item_material"));
+                        Material blockMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("block_material"));
                         NoteColor noteColor = new NoteColor(result.getInt("note"));
                         OrdinaryColor color = new OrdinaryColor(result.getInt("r"), result.getInt("g"), result.getInt("b"));
                         ParticlePair particle = new ParticlePair(playerUUID, particleId, effect, style, itemMaterial, blockMaterial, color, noteColor);
@@ -160,7 +161,7 @@ public class DataManager {
                         fixedParticles.add(new FixedParticleEffect(playerUUID, fixedEffectId, worldName, xPos, yPos, zPos, particle));
                     }
                 }
-                
+
                 // If there aren't any groups then this is a brand new PPlayer and we need to save a new active group for them
                 boolean activeGroupExists = false;
                 for (ParticleGroup group : groups) {
@@ -170,14 +171,14 @@ public class DataManager {
                     }
                 }
 
-                if (!activeGroupExists) { 
-                    ParticleGroup activeGroup = new ParticleGroup(ParticleGroup.DEFAULT_NAME, new ArrayList<ParticlePair>());
+                if (!activeGroupExists) {
+                    ParticleGroup activeGroup = new ParticleGroup(ParticleGroup.DEFAULT_NAME, new ArrayList<>());
                     saveParticleGroup(playerUUID, activeGroup);
                     groups.add(activeGroup);
                 }
 
                 PPlayer loadedPPlayer = new PPlayer(playerUUID, groups, fixedParticles, particlesHidden);
-                
+
                 sync(() -> {
                     synchronized (loadedPPlayer) {
                         if (getPPlayer(playerUUID) == null) { // Make sure the PPlayer still isn't added, since this is async it's possible it got ran twice
@@ -189,111 +190,101 @@ public class DataManager {
             });
         });
     }
-    
+
     /**
      * Loads all PPlayers from the database that own FixedParticleEffects
      */
     public static void loadFixedEffects() {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                String query = "SELECT DISTINCT owner_uuid FROM pp_fixed";
-                try (PreparedStatement statement = connection.prepareStatement(query)) {
-                    ResultSet result = statement.executeQuery();
-                    while (result.next()) {
-                        UUID playerUUID = UUID.fromString(result.getString("owner_uuid"));
-                        sync(() -> {
-                            getPPlayer(playerUUID, (pplayer) -> { });
-                        });
-                    }
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String query = "SELECT DISTINCT owner_uuid FROM pp_fixed";
+            try (PreparedStatement statement = connection.prepareStatement(query)) {
+                ResultSet result = statement.executeQuery();
+                while (result.next()) {
+                    UUID playerUUID = UUID.fromString(result.getString("owner_uuid"));
+                    sync(() -> getPPlayer(playerUUID, (pplayer) -> { }));
                 }
-            });
-        });
+            }
+        }));
     }
-    
+
     /**
      * Updates the particles_hidden setting in the database and for the PPlayer
-     * 
+     *
      * @param playerUUID The player to hide PlayerParticles from
      * @param particlesHidden True if the particles should be hidden, otherwise False
      */
     public static void updateSettingParticlesHidden(UUID playerUUID, boolean particlesHidden) {
-        async(() -> {
-           PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-               String updateQuery = "UPDATE pp_settings SET particles_hidden = ? WHERE player_uuid = ?";
-               try (PreparedStatement updateStatement = connection.prepareStatement(updateQuery)) {
-                   updateStatement.setBoolean(1, particlesHidden);
-                   updateStatement.setString(2, playerUUID.toString());
-                   
-                   updateStatement.executeUpdate();
-               }
-           }); 
-        });
-        
-        getPPlayer(playerUUID, (pplayer) -> {
-            pplayer.setParticlesHidden(particlesHidden);
-        });
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String updateQuery = "UPDATE pp_settings SET particles_hidden = ? WHERE player_uuid = ?";
+            try (PreparedStatement updateStatement = connection.prepareStatement(updateQuery)) {
+                updateStatement.setBoolean(1, particlesHidden);
+                updateStatement.setString(2, playerUUID.toString());
+
+                updateStatement.executeUpdate();
+            }
+        }));
+
+        getPPlayer(playerUUID, (pplayer) -> pplayer.setParticlesHidden(particlesHidden));
     }
 
     /**
      * Saves a ParticleGroup. If it already exists, update it.
-     * 
+     *
      * @param playerUUID The owner of the group
      * @param group The group to create/update
      */
     public static void saveParticleGroup(UUID playerUUID, ParticleGroup group) {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                String groupUUID = null;
-                
-                String groupUUIDQuery = "SELECT uuid FROM pp_group WHERE owner_uuid = ? AND name = ?";
-                try (PreparedStatement statement = connection.prepareStatement(groupUUIDQuery)) {
-                    statement.setString(1, playerUUID.toString());
-                    statement.setString(2, group.getName());
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String groupUUID;
 
-                    ResultSet result = statement.executeQuery();
-                    if (result.next()) { // Clear out particles from existing group
-                        groupUUID = result.getString("uuid");
+            String groupUUIDQuery = "SELECT uuid FROM pp_group WHERE owner_uuid = ? AND name = ?";
+            try (PreparedStatement statement = connection.prepareStatement(groupUUIDQuery)) {
+                statement.setString(1, playerUUID.toString());
+                statement.setString(2, group.getName());
 
-                        String particlesDeleteQuery = "DELETE FROM pp_particle WHERE group_uuid = ?";
-                        PreparedStatement particlesDeleteStatement = connection.prepareStatement(particlesDeleteQuery);
-                        particlesDeleteStatement.setString(1, result.getString("uuid"));
+                ResultSet result = statement.executeQuery();
+                if (result.next()) { // Clear out particles from existing group
+                    groupUUID = result.getString("uuid");
 
-                        particlesDeleteStatement.executeUpdate();
-                    } else { // Create new group
-                        groupUUID = UUID.randomUUID().toString();
+                    String particlesDeleteQuery = "DELETE FROM pp_particle WHERE group_uuid = ?";
+                    PreparedStatement particlesDeleteStatement = connection.prepareStatement(particlesDeleteQuery);
+                    particlesDeleteStatement.setString(1, result.getString("uuid"));
 
-                        String groupCreateQuery = "INSERT INTO pp_group (uuid, owner_uuid, name) VALUES (?, ?, ?)";
-                        PreparedStatement groupCreateStatement = connection.prepareStatement(groupCreateQuery);
-                        groupCreateStatement.setString(1, groupUUID);
-                        groupCreateStatement.setString(2, playerUUID.toString());
-                        groupCreateStatement.setString(3, group.getName());
+                    particlesDeleteStatement.executeUpdate();
+                } else { // Create new group
+                    groupUUID = UUID.randomUUID().toString();
 
-                        groupCreateStatement.executeUpdate();
-                    }
+                    String groupCreateQuery = "INSERT INTO pp_group (uuid, owner_uuid, name) VALUES (?, ?, ?)";
+                    PreparedStatement groupCreateStatement = connection.prepareStatement(groupCreateQuery);
+                    groupCreateStatement.setString(1, groupUUID);
+                    groupCreateStatement.setString(2, playerUUID.toString());
+                    groupCreateStatement.setString(3, group.getName());
+
+                    groupCreateStatement.executeUpdate();
                 }
-                
-                // Fill group with new particles
-                String createParticlesQuery = "INSERT INTO pp_particle (uuid, group_uuid, id, effect, style, item_material, block_material, note, r, g, b) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-                try (PreparedStatement particlesStatement = connection.prepareStatement(createParticlesQuery)) {
-                    for (ParticlePair particle : group.getParticles()) {
-                        particlesStatement.setString(1, UUID.randomUUID().toString());
-                        particlesStatement.setString(2, groupUUID);
-                        particlesStatement.setInt(3, particle.getId());
-                        particlesStatement.setString(4, particle.getEffect().getName());
-                        particlesStatement.setString(5, particle.getStyle().getName());
-                        particlesStatement.setString(6, particle.getItemMaterial().name());
-                        particlesStatement.setString(7, particle.getBlockMaterial().name());
-                        particlesStatement.setInt(8, particle.getNoteColor().getNote());
-                        particlesStatement.setInt(9, particle.getColor().getRed());
-                        particlesStatement.setInt(10, particle.getColor().getGreen());
-                        particlesStatement.setInt(11, particle.getColor().getBlue());
-                        particlesStatement.addBatch();
-                    }
-                    
-                    particlesStatement.executeBatch();
+            }
+
+            // Fill group with new particles
+            String createParticlesQuery = "INSERT INTO pp_particle (uuid, group_uuid, id, effect, style, item_material, block_material, note, r, g, b) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            try (PreparedStatement particlesStatement = connection.prepareStatement(createParticlesQuery)) {
+                for (ParticlePair particle : group.getParticles()) {
+                    particlesStatement.setString(1, UUID.randomUUID().toString());
+                    particlesStatement.setString(2, groupUUID);
+                    particlesStatement.setInt(3, particle.getId());
+                    particlesStatement.setString(4, particle.getEffect().getName());
+                    particlesStatement.setString(5, particle.getStyle().getName());
+                    particlesStatement.setString(6, particle.getItemMaterial().name());
+                    particlesStatement.setString(7, particle.getBlockMaterial().name());
+                    particlesStatement.setInt(8, particle.getNoteColor().getNote());
+                    particlesStatement.setInt(9, particle.getColor().getRed());
+                    particlesStatement.setInt(10, particle.getColor().getGreen());
+                    particlesStatement.setInt(11, particle.getColor().getBlue());
+                    particlesStatement.addBatch();
                 }
-            });
-        });
+
+                particlesStatement.executeBatch();
+            }
+        }));
 
         getPPlayer(playerUUID, (pplayer) -> {
             for (ParticleGroup existing : pplayer.getParticleGroups()) {
@@ -308,137 +299,127 @@ public class DataManager {
 
     /**
      * Removes a ParticleGroup
-     * 
+     *
      * @param playerUUID The owner of the group
      * @param group The group to remove
      */
     public static void removeParticleGroup(UUID playerUUID, ParticleGroup group) {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                String groupQuery = "SELECT * FROM pp_group WHERE owner_uuid = ? AND name = ?";
-                String particleDeleteQuery = "DELETE FROM pp_particle WHERE group_uuid = ?";
-                String groupDeleteQuery = "DELETE FROM pp_group WHERE uuid = ?";
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String groupQuery = "SELECT * FROM pp_group WHERE owner_uuid = ? AND name = ?";
+            String particleDeleteQuery = "DELETE FROM pp_particle WHERE group_uuid = ?";
+            String groupDeleteQuery = "DELETE FROM pp_group WHERE uuid = ?";
 
-                // Execute group uuid query
-                String groupUUID = null;
-                try (PreparedStatement statement = connection.prepareStatement(groupQuery)) {
-                    statement.setString(1, playerUUID.toString());
-                    statement.setString(2, group.getName());
+            // Execute group uuid query
+            String groupUUID = null;
+            try (PreparedStatement statement = connection.prepareStatement(groupQuery)) {
+                statement.setString(1, playerUUID.toString());
+                statement.setString(2, group.getName());
 
-                    ResultSet result = statement.executeQuery();
-                    if (result.next()) {
-                        groupUUID = result.getString("uuid");
-                    }
+                ResultSet result = statement.executeQuery();
+                if (result.next()) {
+                    groupUUID = result.getString("uuid");
                 }
+            }
 
-                // Execute particle delete update
-                try (PreparedStatement statement = connection.prepareStatement(particleDeleteQuery)) {
-                    statement.setString(1, groupUUID);
+            // Execute particle delete update
+            try (PreparedStatement statement = connection.prepareStatement(particleDeleteQuery)) {
+                statement.setString(1, groupUUID);
 
-                    statement.executeUpdate();
-                }
+                statement.executeUpdate();
+            }
 
-                // Execute group delete update
-                try (PreparedStatement statement = connection.prepareStatement(groupDeleteQuery)) {
-                    statement.setString(1, groupUUID);
+            // Execute group delete update
+            try (PreparedStatement statement = connection.prepareStatement(groupDeleteQuery)) {
+                statement.setString(1, groupUUID);
 
-                    statement.executeUpdate();
-                }
-            });
-        });
+                statement.executeUpdate();
+            }
+        }));
 
-        getPPlayer(playerUUID, (pplayer) -> {
-            pplayer.getParticleGroups().remove(group);
-        });
+        getPPlayer(playerUUID, (pplayer) -> pplayer.getParticleGroups().remove(group));
     }
 
     /**
      * Saves a fixed effect to save data
      * Does not perform a check to see if a fixed effect with this id already exists
-     * 
+     *
      * @param fixedEffect The fixed effect to save
      */
     public static void saveFixedEffect(FixedParticleEffect fixedEffect) {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                String particleUUID = UUID.randomUUID().toString();
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String particleUUID = UUID.randomUUID().toString();
 
-                String particleQuery = "INSERT INTO pp_particle (uuid, group_uuid, id, effect, style, item_material, block_material, note, r, g, b) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-                try (PreparedStatement statement = connection.prepareStatement(particleQuery)) {
-                    ParticlePair particle = fixedEffect.getParticlePair();
-                    statement.setString(1, particleUUID);
-                    statement.setNull(2, java.sql.Types.VARCHAR);
-                    statement.setInt(3, fixedEffect.getId());
-                    statement.setString(4, particle.getEffect().getName());
-                    statement.setString(5, particle.getStyle().getName());
-                    statement.setString(6, particle.getItemMaterial().name());
-                    statement.setString(7, particle.getBlockMaterial().name());
-                    statement.setInt(8, particle.getNoteColor().getNote());
-                    statement.setInt(9, particle.getColor().getRed());
-                    statement.setInt(10, particle.getColor().getGreen());
-                    statement.setInt(11, particle.getColor().getBlue());
-                    statement.executeUpdate();
-                }
+            String particleQuery = "INSERT INTO pp_particle (uuid, group_uuid, id, effect, style, item_material, block_material, note, r, g, b) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            try (PreparedStatement statement = connection.prepareStatement(particleQuery)) {
+                ParticlePair particle = fixedEffect.getParticlePair();
+                statement.setString(1, particleUUID);
+                statement.setNull(2, java.sql.Types.VARCHAR);
+                statement.setInt(3, fixedEffect.getId());
+                statement.setString(4, particle.getEffect().getName());
+                statement.setString(5, particle.getStyle().getName());
+                statement.setString(6, particle.getItemMaterial().name());
+                statement.setString(7, particle.getBlockMaterial().name());
+                statement.setInt(8, particle.getNoteColor().getNote());
+                statement.setInt(9, particle.getColor().getRed());
+                statement.setInt(10, particle.getColor().getGreen());
+                statement.setInt(11, particle.getColor().getBlue());
+                statement.executeUpdate();
+            }
 
-                String fixedEffectQuery = "INSERT INTO pp_fixed (owner_uuid, id, particle_uuid, world, xPos, yPos, zPos) VALUES (?, ?, ?, ?, ?, ?, ?)";
-                try (PreparedStatement statement = connection.prepareStatement(fixedEffectQuery)) {
-                    statement.setString(1, fixedEffect.getOwnerUniqueId().toString());
-                    statement.setInt(2, fixedEffect.getId());
-                    statement.setString(3, particleUUID);
-                    statement.setString(4, fixedEffect.getLocation().getWorld().getName());
-                    statement.setDouble(5, fixedEffect.getLocation().getX());
-                    statement.setDouble(6, fixedEffect.getLocation().getY());
-                    statement.setDouble(7, fixedEffect.getLocation().getZ());
-                    statement.executeUpdate();
-                }
-            });
-        });
+            String fixedEffectQuery = "INSERT INTO pp_fixed (owner_uuid, id, particle_uuid, world, xPos, yPos, zPos) VALUES (?, ?, ?, ?, ?, ?, ?)";
+            try (PreparedStatement statement = connection.prepareStatement(fixedEffectQuery)) {
+                statement.setString(1, fixedEffect.getOwnerUniqueId().toString());
+                statement.setInt(2, fixedEffect.getId());
+                statement.setString(3, particleUUID);
+                statement.setString(4, fixedEffect.getLocation().getWorld().getName());
+                statement.setDouble(5, fixedEffect.getLocation().getX());
+                statement.setDouble(6, fixedEffect.getLocation().getY());
+                statement.setDouble(7, fixedEffect.getLocation().getZ());
+                statement.executeUpdate();
+            }
+        }));
 
-        getPPlayer(fixedEffect.getOwnerUniqueId(), (pplayer) -> {
-            pplayer.addFixedEffect(fixedEffect);
-        });
+        getPPlayer(fixedEffect.getOwnerUniqueId(), (pplayer) -> pplayer.addFixedEffect(fixedEffect));
     }
-    
+
     /**
      * Updates a fixed effect's particle values
-     * 
+     *
      * @param fixedEffect The fixed effect to update
      */
     public static void updateFixedEffect(FixedParticleEffect fixedEffect) {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                // Update fixed effect
-                String fixedEffectQuery = "UPDATE pp_fixed SET xPos = ?, yPos = ?, zPos = ? WHERE owner_uuid = ? AND id = ?";
-                try (PreparedStatement statement = connection.prepareStatement(fixedEffectQuery)) {
-                    statement.setDouble(1, fixedEffect.getLocation().getX());
-                    statement.setDouble(2, fixedEffect.getLocation().getY());
-                    statement.setDouble(3, fixedEffect.getLocation().getZ());
-                    statement.setString(4, fixedEffect.getOwnerUniqueId().toString());
-                    statement.setInt(5, fixedEffect.getId());
-                    statement.executeUpdate();
-                }
-                
-                // Update particle
-                String particleUpdateQuery = "UPDATE pp_particle " +
-                                             "SET effect = ?, style = ?, item_material = ?, block_material = ?, note = ?, r = ?, g = ?, b = ? " +
-                                             "WHERE uuid = (SELECT particle_uuid FROM pp_fixed WHERE owner_uuid = ? AND id = ?)";
-                try (PreparedStatement statement = connection.prepareStatement(particleUpdateQuery)) {
-                    ParticlePair particle = fixedEffect.getParticlePair();
-                    statement.setString(1, particle.getEffect().getName());
-                    statement.setString(2, particle.getStyle().getName());
-                    statement.setString(3, particle.getItemMaterial().name());
-                    statement.setString(4, particle.getBlockMaterial().name());
-                    statement.setInt(5, particle.getNoteColor().getNote());
-                    statement.setInt(6, particle.getColor().getRed());
-                    statement.setInt(7, particle.getColor().getGreen());
-                    statement.setInt(8, particle.getColor().getBlue());
-                    statement.setString(9, fixedEffect.getOwnerUniqueId().toString());
-                    statement.setInt(10, fixedEffect.getId());
-                    statement.executeUpdate();
-                }
-            });
-        });
-        
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            // Update fixed effect
+            String fixedEffectQuery = "UPDATE pp_fixed SET xPos = ?, yPos = ?, zPos = ? WHERE owner_uuid = ? AND id = ?";
+            try (PreparedStatement statement = connection.prepareStatement(fixedEffectQuery)) {
+                statement.setDouble(1, fixedEffect.getLocation().getX());
+                statement.setDouble(2, fixedEffect.getLocation().getY());
+                statement.setDouble(3, fixedEffect.getLocation().getZ());
+                statement.setString(4, fixedEffect.getOwnerUniqueId().toString());
+                statement.setInt(5, fixedEffect.getId());
+                statement.executeUpdate();
+            }
+
+            // Update particle
+            String particleUpdateQuery = "UPDATE pp_particle " +
+                                         "SET effect = ?, style = ?, item_material = ?, block_material = ?, note = ?, r = ?, g = ?, b = ? " +
+                                         "WHERE uuid = (SELECT particle_uuid FROM pp_fixed WHERE owner_uuid = ? AND id = ?)";
+            try (PreparedStatement statement = connection.prepareStatement(particleUpdateQuery)) {
+                ParticlePair particle = fixedEffect.getParticlePair();
+                statement.setString(1, particle.getEffect().getName());
+                statement.setString(2, particle.getStyle().getName());
+                statement.setString(3, particle.getItemMaterial().name());
+                statement.setString(4, particle.getBlockMaterial().name());
+                statement.setInt(5, particle.getNoteColor().getNote());
+                statement.setInt(6, particle.getColor().getRed());
+                statement.setInt(7, particle.getColor().getGreen());
+                statement.setInt(8, particle.getColor().getBlue());
+                statement.setString(9, fixedEffect.getOwnerUniqueId().toString());
+                statement.setInt(10, fixedEffect.getId());
+                statement.executeUpdate();
+            }
+        }));
+
         getPPlayer(fixedEffect.getOwnerUniqueId(), (pplayer) -> {
             pplayer.removeFixedEffect(fixedEffect.getId());
             pplayer.addFixedEffect(fixedEffect);
@@ -448,51 +429,47 @@ public class DataManager {
     /**
      * Deletes a fixed effect from save data
      * Does not perform a check to see if a fixed effect with this id already exists
-     * 
+     *
      * @param playerUUID The player who owns the effect
      * @param id The id of the effect to remove
      */
     public static void removeFixedEffect(UUID playerUUID, int id) {
-        async(() -> {
-            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
-                String particleUUID = null;
+        async(() -> PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
+            String particleUUID = null;
 
-                String particleUUIDQuery = "SELECT particle_uuid FROM pp_fixed WHERE owner_uuid = ? AND id = ?";
-                try (PreparedStatement statement = connection.prepareStatement(particleUUIDQuery)) {
-                    statement.setString(1, playerUUID.toString());
-                    statement.setInt(2, id);
+            String particleUUIDQuery = "SELECT particle_uuid FROM pp_fixed WHERE owner_uuid = ? AND id = ?";
+            try (PreparedStatement statement = connection.prepareStatement(particleUUIDQuery)) {
+                statement.setString(1, playerUUID.toString());
+                statement.setInt(2, id);
 
-                    ResultSet result = statement.executeQuery();
-                    if (result.next()) {
-                        particleUUID = result.getString("particle_uuid");
-                    }
+                ResultSet result = statement.executeQuery();
+                if (result.next()) {
+                    particleUUID = result.getString("particle_uuid");
                 }
+            }
 
-                String particleDeleteQuery = "DELETE FROM pp_particle WHERE uuid = ?";
-                try (PreparedStatement statement = connection.prepareStatement(particleDeleteQuery)) {
-                    statement.setString(1, particleUUID);
+            String particleDeleteQuery = "DELETE FROM pp_particle WHERE uuid = ?";
+            try (PreparedStatement statement = connection.prepareStatement(particleDeleteQuery)) {
+                statement.setString(1, particleUUID);
 
-                    statement.executeUpdate();
-                }
+                statement.executeUpdate();
+            }
 
-                String fixedEffectDeleteQuery = "DELETE FROM pp_fixed WHERE owner_uuid = ? AND id = ?";
-                try (PreparedStatement statement = connection.prepareStatement(fixedEffectDeleteQuery)) {
-                    statement.setString(1, playerUUID.toString());
-                    statement.setInt(2, id);
+            String fixedEffectDeleteQuery = "DELETE FROM pp_fixed WHERE owner_uuid = ? AND id = ?";
+            try (PreparedStatement statement = connection.prepareStatement(fixedEffectDeleteQuery)) {
+                statement.setString(1, playerUUID.toString());
+                statement.setInt(2, id);
 
-                    statement.executeUpdate();
-                }
-            });
-        });
+                statement.executeUpdate();
+            }
+        }));
 
-        getPPlayer(playerUUID, (pplayer) -> {
-            pplayer.removeFixedEffect(id);
-        });
+        getPPlayer(playerUUID, (pplayer) -> pplayer.removeFixedEffect(id));
     }
 
     /**
      * Asynchronizes the callback with it's own thread
-     * 
+     *
      * @param asyncCallback The callback to run on a separate thread
      */
     private static void async(SyncInterface asyncCallback) {
@@ -505,7 +482,7 @@ public class DataManager {
 
     /**
      * Synchronizes the callback with the main thread
-     * 
+     *
      * @param syncCallback The callback to run on the main thread
      */
     private static void sync(SyncInterface syncCallback) {
@@ -520,16 +497,16 @@ public class DataManager {
      * Provides an easy way to run a section of code either synchronously or asynchronously using a callback
      */
     @FunctionalInterface
-    private static interface SyncInterface {
-        public void execute();
+    private interface SyncInterface {
+        void execute();
     }
 
     /**
      * Allows callbacks to be passed between configuration methods and executed for returning objects after database queries
      */
     @FunctionalInterface
-    public static interface ConfigurationCallback<T> {
-        public void execute(T obj);
+    public interface ConfigurationCallback<T> {
+        void execute(T obj);
     }
 
 }
diff --git a/src/com/esophose/playerparticles/manager/LangManager.java b/src/com/esophose/playerparticles/manager/LangManager.java
index 88f3d47..ddfc4f1 100644
--- a/src/com/esophose/playerparticles/manager/LangManager.java
+++ b/src/com/esophose/playerparticles/manager/LangManager.java
@@ -375,7 +375,7 @@ public class LangManager {
         File targetLangFile = new File(pluginDataFolder.getAbsolutePath() + "/lang/" + langFileName);
         
         // TODO: Move this somewhere else
-        Set<String> defaultLangFileNames = new HashSet<String>();
+        Set<String> defaultLangFileNames = new HashSet<>();
         defaultLangFileNames.add("en_US.lang");
         defaultLangFileNames.add("fr_FR.lang");
         defaultLangFileNames.add("vi_VN.lang");
diff --git a/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java b/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
index 9651f5c..b6f204b 100644
--- a/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
+++ b/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
@@ -42,7 +42,7 @@ public class ParticleGroupPresetManager {
      * Loads the preset groups from the preset_groups.yml file
      */
     public static void reload() {
-        presetGroups = new ArrayList<ParticleGroupPreset>();
+        presetGroups = new ArrayList<>();
         
         File pluginDataFolder = PlayerParticles.getPlugin().getDataFolder();
         File groupsFile = new File(pluginDataFolder.getAbsolutePath() + File.separator + FILE_NAME);
@@ -61,7 +61,7 @@ public class ParticleGroupPresetManager {
         Set<String> groupNames = groupsYaml.getKeys(false);
         for (String groupName : groupNames) {
             try {
-                List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                List<ParticlePair> particles = new ArrayList<>();
                 String displayName = "";
                 Material guiIcon = Material.ENDER_CHEST;
                 String permission = "";
@@ -120,7 +120,7 @@ public class ParticleGroupPresetManager {
                                 if (args[0].equalsIgnoreCase("rainbow")) {
                                     noteColorData = new NoteColor(99);
                                 } else {
-                                    int note = -1;
+                                    int note;
                                     try {
                                         note = Integer.parseInt(args[0]);
                                     } catch (Exception e) {
@@ -139,9 +139,7 @@ public class ParticleGroupPresetManager {
                                 if (args[0].equalsIgnoreCase("rainbow")) {
                                     colorData = new OrdinaryColor(999, 999, 999);
                                 } else {
-                                    int r = -1;
-                                    int g = -1;
-                                    int b = -1;
+                                    int r, g, b;
 
                                     try {
                                         r = Integer.parseInt(args[0]);
@@ -181,7 +179,7 @@ public class ParticleGroupPresetManager {
                         }
                     }
                     
-                    particles.add(new ParticlePair(null, id, effect, style, blockData, blockData, colorData, noteColorData));
+                    particles.add(new ParticlePair(null, id, effect, style, itemData, blockData, colorData, noteColorData));
                 }
                 
                 presetGroups.add(new ParticleGroupPreset(displayName, guiIcon, permission, allowPermissionOverride, new ParticleGroup(groupName, particles)));
diff --git a/src/com/esophose/playerparticles/manager/ParticleManager.java b/src/com/esophose/playerparticles/manager/ParticleManager.java
index 1717c18..3a95263 100644
--- a/src/com/esophose/playerparticles/manager/ParticleManager.java
+++ b/src/com/esophose/playerparticles/manager/ParticleManager.java
@@ -32,7 +32,7 @@ public class ParticleManager extends BukkitRunnable implements Listener {
     /**
      * The list containing all the loaded PPlayer info
      */
-    private static List<PPlayer> particlePlayers = new ArrayList<PPlayer>();
+    private static List<PPlayer> particlePlayers = new ArrayList<>();
 
     /**
      * Rainbow particle effect hue and note color used for rainbow colorable effects
@@ -106,15 +106,15 @@ public class ParticleManager extends BukkitRunnable implements Listener {
 
             // Don't show their particles if they are in spectator mode
             // Don't spawn particles if the world doesn't allow it
-            if (player != null && player.getGameMode() != GameMode.SPECTATOR && !PermissionManager.isWorldDisabled(player.getWorld().getName()))
+            if (player != null && player.getGameMode() != GameMode.SPECTATOR && PermissionManager.isWorldEnabled(player.getWorld().getName()))
                 for (ParticlePair particles : pplayer.getActiveParticles())
-                    displayParticles(pplayer, particles, player.getLocation().clone().add(0, 1, 0));
+                    this.displayParticles(pplayer, particles, player.getLocation().clone().add(0, 1, 0));
             
             // Loop for FixedParticleEffects
             // Don't spawn particles if the world doesn't allow it
             for (FixedParticleEffect effect : pplayer.getFixedParticles())
-                if (!PermissionManager.isWorldDisabled(effect.getLocation().getWorld().getName())) 
-                    displayFixedParticleEffect(effect);
+                if (PermissionManager.isWorldEnabled(effect.getLocation().getWorld().getName()))
+                    this.displayFixedParticleEffect(effect);
         }
     }
 
diff --git a/src/com/esophose/playerparticles/manager/PermissionManager.java b/src/com/esophose/playerparticles/manager/PermissionManager.java
index 746d3df..e9f89e6 100644
--- a/src/com/esophose/playerparticles/manager/PermissionManager.java
+++ b/src/com/esophose/playerparticles/manager/PermissionManager.java
@@ -37,7 +37,7 @@ public class PermissionManager {
         
         private final String permissionString;
         
-        private PPermission(String permissionString) {
+        PPermission(String permissionString) {
             this.permissionString = permissionString;
         }
         
@@ -149,13 +149,13 @@ public class PermissionManager {
     }
 
     /**
-     * Checks if a world is disabled for particles to spawn in
+     * Checks if a world is enabled for particles to spawn in
      * 
      * @param world The world name to check
      * @return True if the world is disabled
      */
-    public static boolean isWorldDisabled(String world) {
-        return getDisabledWorlds().contains(world);
+    public static boolean isWorldEnabled(String world) {
+        return !getDisabledWorlds().contains(world);
     }
 
     /**
@@ -200,7 +200,7 @@ public class PermissionManager {
      * @return A String List of all effect names the given player has permission for
      */
     public static List<String> getEffectNamesUserHasPermissionFor(Player p) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (ParticleEffect pe : ParticleEffect.getSupportedEffects())
             if (hasEffectPermission(p, pe)) 
                 list.add(pe.getName());
@@ -214,7 +214,7 @@ public class PermissionManager {
      * @return A String List of all style names the given player has permission for
      */
     public static List<String> getStyleNamesUserHasPermissionFor(Player p) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (ParticleStyle ps : ParticleStyleManager.getStyles())
             if (hasStylePermission(p, ps)) 
                 list.add(ps.getName());
@@ -228,7 +228,7 @@ public class PermissionManager {
      * @return A String List of all fixable style names the given player has permission for
      */
     public static List<String> getFixableStyleNamesUserHasPermissionFor(Player p) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (ParticleStyle ps : ParticleStyleManager.getStyles())
             if (ps.canBeFixed() && hasStylePermission(p, ps)) 
                 list.add(ps.getName());
@@ -242,7 +242,7 @@ public class PermissionManager {
      * @return A List of all effects the given player has permission for
      */
     public static List<ParticleEffect> getEffectsUserHasPermissionFor(Player p) {
-        List<ParticleEffect> list = new ArrayList<ParticleEffect>();
+        List<ParticleEffect> list = new ArrayList<>();
         for (ParticleEffect pe : ParticleEffect.getSupportedEffects())
             if (hasEffectPermission(p, pe)) 
                 list.add(pe);
@@ -256,7 +256,7 @@ public class PermissionManager {
      * @return A List of all styles the given player has permission for
      */
     public static List<ParticleStyle> getStylesUserHasPermissionFor(Player p) {
-        List<ParticleStyle> list = new ArrayList<ParticleStyle>();
+        List<ParticleStyle> list = new ArrayList<>();
         for (ParticleStyle ps : ParticleStyleManager.getStyles())
             if (hasStylePermission(p, ps)) 
                 list.add(ps);
diff --git a/src/com/esophose/playerparticles/manager/SettingManager.java b/src/com/esophose/playerparticles/manager/SettingManager.java
index db2c0e2..6cc96a0 100644
--- a/src/com/esophose/playerparticles/manager/SettingManager.java
+++ b/src/com/esophose/playerparticles/manager/SettingManager.java
@@ -54,6 +54,7 @@ public class SettingManager {
         DATABASE_NAME(PSettingType.STRING),
         DATABASE_USER_NAME(PSettingType.STRING),
         DATABASE_USER_PASSWORD(PSettingType.STRING),
+        DATABASE_USE_SSL(PSettingType.BOOLEAN),
         
         MAX_FIXED_EFFECTS(PSettingType.INTEGER),
         MAX_FIXED_EFFECT_CREATION_DISTANCE(PSettingType.INTEGER),
@@ -71,7 +72,7 @@ public class SettingManager {
         private final PSettingType settingType;
         private Object value = null;
         
-        private PSetting(PSettingType settingType) {
+        PSetting(PSettingType settingType) {
             this.settingType = settingType;
         }
         
@@ -199,8 +200,8 @@ public class SettingManager {
         
         private Map<String, Material> materials;
         
-        private GuiIcon() {
-            this.materials = new HashMap<String, Material>();
+        GuiIcon() {
+            this.materials = new HashMap<>();
         }
         
         /**
@@ -264,7 +265,7 @@ public class SettingManager {
          * Resets the setting's value so it will be fetched from the config the next time it's needed
          */
         private void resetDefault() {
-            this.materials = new HashMap<String, Material>();
+            this.materials = new HashMap<>();
         }
     }
 
diff --git a/src/com/esophose/playerparticles/particles/PPlayer.java b/src/com/esophose/playerparticles/particles/PPlayer.java
index 2da3a16..501a3cf 100644
--- a/src/com/esophose/playerparticles/particles/PPlayer.java
+++ b/src/com/esophose/playerparticles/particles/PPlayer.java
@@ -168,7 +168,7 @@ public class PPlayer {
      * @return A List of ParticlePairs with a matching style
      */
     public List<ParticlePair> getActiveParticlesForStyle(ParticleStyle style) {
-        List<ParticlePair> matches = new ArrayList<ParticlePair>();
+        List<ParticlePair> matches = new ArrayList<>();
         for (ParticlePair pair : this.getActiveParticles())
             if (pair.getStyle().equals(style)) 
                 matches.add(pair);
@@ -216,7 +216,7 @@ public class PPlayer {
      * @return A List of Integer ids this player's fixed effects have
      */
     public List<Integer> getFixedEffectIds() {
-        List<Integer> ids = new ArrayList<Integer>();
+        List<Integer> ids = new ArrayList<>();
         for (FixedParticleEffect fixedEffect : this.fixedParticles)
             ids.add(fixedEffect.getId());
         return ids;
diff --git a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
index 50971eb..b133671 100644
--- a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
+++ b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
@@ -6,11 +6,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import com.esophose.playerparticles.PlayerParticles;
 import com.esophose.playerparticles.manager.DataManager;
@@ -19,31 +19,29 @@ import com.esophose.playerparticles.manager.SettingManager.PSetting;
 public class PPlayerMovementListener implements Listener {
     
     private static final int CHECK_INTERVAL = 3;
-    private Map<UUID, Integer> timeSinceLastMovement = new HashMap<UUID, Integer>();
+    private Map<UUID, Integer> timeSinceLastMovement = new HashMap<>();
     
     public PPlayerMovementListener() {
-        new BukkitRunnable() {
-            public void run() {
-                if (!PSetting.TOGGLE_ON_MOVE.getBoolean()) return;
-                
-                List<UUID> toRemove = new ArrayList<UUID>();
-                
-                for (UUID uuid : timeSinceLastMovement.keySet()) {
-                    PPlayer pplayer = DataManager.getPPlayer(uuid);
-                    if (pplayer == null) {
-                        toRemove.add(uuid);
-                    } else {
-                        int standingTime = timeSinceLastMovement.get(uuid);
-                        pplayer.setMoving(standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt());
-                        if (standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt())
-                            timeSinceLastMovement.replace(uuid, standingTime + CHECK_INTERVAL);
-                    }
+        Bukkit.getScheduler().runTaskTimer(PlayerParticles.getPlugin(), () -> {
+            if (!PSetting.TOGGLE_ON_MOVE.getBoolean()) return;
+
+            List<UUID> toRemove = new ArrayList<>();
+
+            for (UUID uuid : this.timeSinceLastMovement.keySet()) {
+                PPlayer pplayer = DataManager.getPPlayer(uuid);
+                if (pplayer == null) {
+                    toRemove.add(uuid);
+                } else {
+                    int standingTime = this.timeSinceLastMovement.get(uuid);
+                    pplayer.setMoving(standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt());
+                    if (standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt())
+                        this.timeSinceLastMovement.replace(uuid, standingTime + CHECK_INTERVAL);
                 }
-                
-                for (UUID uuid : toRemove)
-                    timeSinceLastMovement.remove(uuid);
             }
-        }.runTaskTimer(PlayerParticles.getPlugin(), 0, CHECK_INTERVAL);
+
+            for (UUID uuid : toRemove)
+                this.timeSinceLastMovement.remove(uuid);
+        }, 0, CHECK_INTERVAL);
     }
 
     /**
@@ -57,10 +55,10 @@ public class PPlayerMovementListener implements Listener {
         if (event.getTo().getBlockX() == event.getFrom().getBlockX() && event.getTo().getBlockY() == event.getFrom().getBlockY() && event.getTo().getBlockZ() == event.getFrom().getBlockZ()) return;
         
         UUID playerUUID = event.getPlayer().getUniqueId();
-        if (!timeSinceLastMovement.containsKey(playerUUID)) {
-            timeSinceLastMovement.put(playerUUID, 0);
+        if (!this.timeSinceLastMovement.containsKey(playerUUID)) {
+            this.timeSinceLastMovement.put(playerUUID, 0);
         } else {
-            timeSinceLastMovement.replace(playerUUID, 0);
+            this.timeSinceLastMovement.replace(playerUUID, 0);
         }
     }
 
diff --git a/src/com/esophose/playerparticles/particles/ParticleEffect.java b/src/com/esophose/playerparticles/particles/ParticleEffect.java
index 67b3ff3..22b4581 100644
--- a/src/com/esophose/playerparticles/particles/ParticleEffect.java
+++ b/src/com/esophose/playerparticles/particles/ParticleEffect.java
@@ -32,7 +32,10 @@ public enum ParticleEffect {
     BUBBLE("WATER_BUBBLE", "WATER_BUBBLE"),
     BUBBLE_COLUMN_UP("BUBBLE_COLUMN_UP", null),
     BUBBLE_POP("BUBBLE_POP", null),
+    CAMPFIRE_COSY_SMOKE("CAMPFIRE_COSY_SMOKE", null),
+    CAMPFIRE_SIGNAL_SMOKE("CAMPFIRE_SIGNAL_SMOKE", null),
     CLOUD("CLOUD", "CLOUD"),
+    COMPOSTER("COMPOSTER", null),
     CRIT("CRIT", "CRIT"),
     CURRENT_DOWN("CURRENT_DOWN", null),
     DAMAGE_INDICATOR("DAMAGE_INDICATOR", "DAMAGE_INDICATOR"),
@@ -49,9 +52,12 @@ public enum ParticleEffect {
     EXPLOSION("EXPLOSION_LARGE", "EXPLOSION_LARGE"),
     EXPLOSION_EMITTER("EXPLOSION_HUGE", "EXPLOSION_HUGE"),
     FALLING_DUST("FALLING_DUST", "FALLING_DUST", ParticleProperty.REQUIRES_MATERIAL_DATA),
+    FALLING_LAVA("FALLING_LAVA", null),
+    FALLING_WATER("FALLING_WATER", null),
     FIREWORK("FIREWORKS_SPARK", "FIREWORKS_SPARK"),
     FISHING("WATER_WAKE", "WATER_WAKE"),
     FLAME("FLAME", "FLAME"),
+    // FLASH("FLASH", null), // Also no thank you
     FOOTSTEP(null, "FOOTSTEP"), // Removed in Minecraft 1.13 :(
     HAPPY_VILLAGER("VILLAGER_HAPPY", "VILLAGER_HAPPY"),
     HEART("HEART", "HEART"),
@@ -59,6 +65,7 @@ public enum ParticleEffect {
     ITEM("ITEM_CRACK", "ITEM_CRACK", ParticleProperty.REQUIRES_MATERIAL_DATA),
     ITEM_SLIME("SLIME", "SLIME"),
     ITEM_SNOWBALL("SNOWBALL", "SNOWBALL"),
+    LANDING_LAVA("LANDING_LAVA", null),
     LARGE_SMOKE("SMOKE_LARGE", "SMOKE_LARGE"),
     LAVA("LAVA", "LAVA"),
     MYCELIUM("TOWN_AURA", "TOWN_AURA"),
@@ -68,6 +75,7 @@ public enum ParticleEffect {
     PORTAL("PORTAL", "PORTAL"),
     RAIN("WATER_DROP", "WATER_DROP"),
     SMOKE("SMOKE_NORMAL", "SMOKE_NORMAL"),
+    SNEEZE("SNEEZE", null),
     SPELL("SPELL", "SPELL"), // The Minecraft internal name for this is actually "effect", but that's the command name, so it's SPELL for the plugin instead
     SPIT("SPIT", "SPIT"),
     SPLASH("WATER_SPLASH", "WATER_SPLASH"),
@@ -78,7 +86,7 @@ public enum ParticleEffect {
     WITCH("SPELL_WITCH", "SPELL_WTICH");
 
     public static boolean VERSION_13; // This is a particle unique to Minecraft 1.13, this is a reliable way of telling what server version is running
-    private static final Map<String, ParticleEffect> NAME_MAP = new HashMap<String, ParticleEffect>();
+    private static final Map<String, ParticleEffect> NAME_MAP = new HashMap<>();
     private static Constructor<?> DustOptions_CONSTRUCTOR;
     private static Method createBlockData_METHOD;
     private final Particle internalEnum;
@@ -87,12 +95,13 @@ public enum ParticleEffect {
     // Initialize map for quick name and id lookup
     // Initialize Minecraft 1.13 related variables
     static {
-        for (ParticleEffect effect : values()) {
-            NAME_MAP.put(effect.getName(), effect);
-        }
+        for (ParticleEffect effect : values())
+            if (effect.isSupported())
+                NAME_MAP.put(effect.getName(), effect);
 
         try {
-            VERSION_13 = Particle.valueOf("NAUTILUS") != null;
+            Particle.valueOf("NAUTILUS");
+            VERSION_13 = true;
             DustOptions_CONSTRUCTOR = Particle.REDSTONE.getDataType().getConstructor(Color.class, float.class);
             createBlockData_METHOD = Material.class.getMethod("createBlockData");
         } catch (Exception e) {
@@ -109,7 +118,7 @@ public enum ParticleEffect {
      * @param enumNameLegacy Name of the Particle Enum when the server version is less than 1.13
      * @param properties Properties of this particle effect
      */
-    private ParticleEffect(String enumName, String enumNameLegacy, ParticleProperty... properties) {
+    ParticleEffect(String enumName, String enumNameLegacy, ParticleProperty... properties) {
         this.properties = Arrays.asList(properties);
 
         Particle matchingEnum = null;
@@ -167,9 +176,10 @@ public enum ParticleEffect {
      * @return Supported effects
      */
     public static List<ParticleEffect> getSupportedEffects() {
-        List<ParticleEffect> effects = new ArrayList<ParticleEffect>();
+        List<ParticleEffect> effects = new ArrayList<>();
         for (ParticleEffect pe : values())
-            if (pe.isSupported()) effects.add(pe);
+            if (pe.isSupported()) 
+                effects.add(pe);
         return effects;
     }
 
@@ -222,12 +232,12 @@ public enum ParticleEffect {
      * @throws ParticleDataException If the particle effect requires additional data
      */
     public void display(double offsetX, double offsetY, double offsetZ, double speed, int amount, Location center, boolean isFixedEffect) throws ParticleDataException {
-        if (hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+        if (this.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
             throw new ParticleDataException("This particle effect requires additional data");
         }
 
-        for (Player player : getPlayersInRange(center, isFixedEffect)) {
-            player.spawnParticle(internalEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed);
+        for (Player player : this.getPlayersInRange(center, isFixedEffect)) {
+            player.spawnParticle(this.internalEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed);
         }
     }
 
@@ -240,7 +250,7 @@ public enum ParticleEffect {
      * @throws ParticleColorException If the particle effect is not colorable or the color type is incorrect
      */
     public void display(ParticleColor color, Location center, boolean isFixedEffect) throws ParticleColorException {
-        if (!hasProperty(ParticleProperty.COLORABLE)) {
+        if (!this.hasProperty(ParticleProperty.COLORABLE)) {
             throw new ParticleColorException("This particle effect is not colorable");
         }
 
@@ -249,17 +259,15 @@ public enum ParticleEffect {
             Object dustData = null;
             try { // The DustData class doesn't exist in Minecraft versions less than 1.13... so this is disgusting... but it works great
                 dustData = DustOptions_CONSTRUCTOR.newInstance(Color.fromRGB(dustColor.getRed(), dustColor.getGreen(), dustColor.getBlue()), 1); // Wait, you can change the size of these now??? AWESOME! I might implement this in the future!
-            } catch (Exception e) {
-                
-            }
+            } catch (Exception ignored) { }
 
-            for (Player player : getPlayersInRange(center, isFixedEffect)) {
-                player.spawnParticle(internalEnum, center.getX(), center.getY(), center.getZ(), 1, 0, 0, 0, 0, dustData);
+            for (Player player : this.getPlayersInRange(center, isFixedEffect)) {
+                player.spawnParticle(this.internalEnum, center.getX(), center.getY(), center.getZ(), 1, 0, 0, 0, 0, dustData);
             }
         } else {
-            for (Player player : getPlayersInRange(center, isFixedEffect)) {
+            for (Player player : this.getPlayersInRange(center, isFixedEffect)) {
                 // Minecraft clients require that you pass a non-zero value if the Red value should be zero
-                player.spawnParticle(internalEnum, center.getX(), center.getY(), center.getZ(), 0, this == ParticleEffect.DUST && color.getValueX() == 0 ? Float.MIN_VALUE : color.getValueX(), color.getValueY(), color.getValueZ(), 1);
+                player.spawnParticle(this.internalEnum, center.getX(), center.getY(), center.getZ(), 0, this == ParticleEffect.DUST && color.getValueX() == 0 ? Float.MIN_VALUE : color.getValueX(), color.getValueY(), color.getValueZ(), 1);
             }
         }
     }
@@ -280,27 +288,23 @@ public enum ParticleEffect {
      * @throws ParticleDataException If the particle effect does not require additional data or if the data type is incorrect
      */
     public void display(Material spawnMaterial, double offsetX, double offsetY, double offsetZ, double speed, int amount, Location center, boolean isFixedEffect) throws ParticleDataException {
-        if (!hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+        if (!this.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
             throw new ParticleDataException("This particle effect does not require additional data");
         }
 
         Object extraData = null;
-        if (internalEnum.getDataType().getTypeName().equals("org.bukkit.block.data.BlockData")) {
+        if (this.internalEnum.getDataType().getTypeName().equals("org.bukkit.block.data.BlockData")) {
             try { // The Material.createBlockData() method doesn't exist in Minecraft versions less than 1.13... so this is disgusting... but it works great
                 extraData = createBlockData_METHOD.invoke(spawnMaterial);
-            } catch (Exception e) {
-                
-            }
-        } else if (internalEnum.getDataType() == ItemStack.class) {
+            } catch (Exception ignored) { }
+        } else if (this.internalEnum.getDataType() == ItemStack.class) {
             extraData = new ItemStack(spawnMaterial);
-        } else if (internalEnum.getDataType() == MaterialData.class) {
+        } else if (this.internalEnum.getDataType() == MaterialData.class) {
             extraData = new MaterialData(spawnMaterial); // Deprecated, only used in versions < 1.13
-        } else {
-            extraData = null;
         }
 
-        for (Player player : getPlayersInRange(center, isFixedEffect))
-            player.spawnParticle(internalEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed, extraData);
+        for (Player player : this.getPlayersInRange(center, isFixedEffect))
+            player.spawnParticle(this.internalEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed, extraData);
     }
 
     /**
@@ -311,7 +315,7 @@ public enum ParticleEffect {
      * @return A List of Players within the particle display range
      */
     private List<Player> getPlayersInRange(Location center, boolean isFixedEffect) {
-        List<Player> players = new ArrayList<Player>();
+        List<Player> players = new ArrayList<>();
         int range = !isFixedEffect ? PSetting.PARTICLE_RENDER_RANGE_PLAYER.getInt() : PSetting.PARTICLE_RENDER_RANGE_FIXED_EFFECT.getInt();
 
         for (PPlayer pplayer : ParticleManager.getPPlayers()) {
@@ -333,7 +337,7 @@ public enum ParticleEffect {
      * @author DarkBlade12
      * @since 1.7
      */
-    public static enum ParticleProperty {
+    public enum ParticleProperty {
         /**
          * The particle effect requires block or item material data to be displayed
          */
@@ -341,7 +345,7 @@ public enum ParticleEffect {
         /**
          * The particle effect uses the offsets as color values
          */
-        COLORABLE;
+        COLORABLE
     }
 
     /**
@@ -438,7 +442,7 @@ public enum ParticleEffect {
          * @return The red value
          */
         public int getRed() {
-            return red;
+            return this.red;
         }
 
         /**
@@ -447,7 +451,7 @@ public enum ParticleEffect {
          * @return The green value
          */
         public int getGreen() {
-            return green;
+            return this.green;
         }
 
         /**
@@ -456,7 +460,7 @@ public enum ParticleEffect {
          * @return The blue value
          */
         public int getBlue() {
-            return blue;
+            return this.blue;
         }
 
         /**
@@ -466,8 +470,8 @@ public enum ParticleEffect {
          */
         @Override
         public float getValueX() {
-            if (red == 999 || red == 998) return 0F;
-            return (float) red / 255F;
+            if (this.red == 999 || this.red == 998) return 0F;
+            return (float) this.red / 255F;
         }
 
         /**
@@ -477,8 +481,8 @@ public enum ParticleEffect {
          */
         @Override
         public float getValueY() {
-            if (green == 999 || green == 998) return 0F;
-            return (float) green / 255F;
+            if (this.green == 999 || this.green == 998) return 0F;
+            return (float) this.green / 255F;
         }
 
         /**
@@ -488,8 +492,8 @@ public enum ParticleEffect {
          */
         @Override
         public float getValueZ() {
-            if (blue == 999 || blue == 998) return 0F;
-            return (float) blue / 255F;
+            if (this.blue == 999 || this.blue == 998) return 0F;
+            return (float) this.blue / 255F;
         }
     }
 
diff --git a/src/com/esophose/playerparticles/particles/ParticleGroup.java b/src/com/esophose/playerparticles/particles/ParticleGroup.java
index ed60fa8..afa0ac4 100644
--- a/src/com/esophose/playerparticles/particles/ParticleGroup.java
+++ b/src/com/esophose/playerparticles/particles/ParticleGroup.java
@@ -40,7 +40,7 @@ public class ParticleGroup {
      * @return The default empty active ParticleGroup
      */
     public static ParticleGroup getDefaultGroup() {
-        return new ParticleGroup(DEFAULT_NAME, new ArrayList<ParticlePair>());
+        return new ParticleGroup(DEFAULT_NAME, new ArrayList<>());
     }
 
 }
diff --git a/src/com/esophose/playerparticles/particles/ParticlePair.java b/src/com/esophose/playerparticles/particles/ParticlePair.java
index 37963f2..694f6c4 100644
--- a/src/com/esophose/playerparticles/particles/ParticlePair.java
+++ b/src/com/esophose/playerparticles/particles/ParticlePair.java
@@ -280,7 +280,7 @@ public class ParticlePair {
                                 -1, 
                                 ParticleEffect.FLAME, 
                                 DefaultStyles.NORMAL, 
-                                ParticleUtils.closestMatchWithFallback("IRON_SHOVEL", "IRON_SPADE"), 
+                                ParticleUtils.closestMatchWithFallback(true, "IRON_SHOVEL", "IRON_SPADE"), 
                                 Material.STONE, 
                                 new OrdinaryColor(0, 0, 0), 
                                 new NoteColor(0)); // @formatter:on
@@ -297,7 +297,7 @@ public class ParticlePair {
                                 pplayer.getNextActiveParticleId(), 
     							ParticleEffect.FLAME, 
     							DefaultStyles.NORMAL, 
-    							ParticleUtils.closestMatchWithFallback("IRON_SHOVEL", "IRON_SPADE"), 
+    							ParticleUtils.closestMatchWithFallback(true, "IRON_SHOVEL", "IRON_SPADE"), 
     							Material.STONE, 
     							new OrdinaryColor(0, 0, 0), 
     							new NoteColor(0)); // @formatter:on
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java b/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
index 2b74706..d95e978 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
@@ -41,13 +41,13 @@ public class ParticleStyleCelebration implements ParticleStyle {
             Random random = new Random();
             for (PPlayer pplayer : ParticleManager.getPPlayers()) {
                 Player player = pplayer.getPlayer();
-                if (player != null && player.getGameMode() != GameMode.SPECTATOR && !PermissionManager.isWorldDisabled(player.getWorld().getName()))
+                if (player != null && player.getGameMode() != GameMode.SPECTATOR && PermissionManager.isWorldEnabled(player.getWorld().getName()))
                     for (ParticlePair particle : pplayer.getActiveParticles())
                         if (particle.getStyle() == this) 
                             spawnFirework(player.getLocation(), pplayer, particle, random);
                 
                 for (FixedParticleEffect fixedEffect : pplayer.getFixedParticles())
-                    if (fixedEffect.getParticlePair().getStyle() == this && !PermissionManager.isWorldDisabled(fixedEffect.getLocation().getWorld().getName()))
+                    if (fixedEffect.getParticlePair().getStyle() == this && PermissionManager.isWorldEnabled(fixedEffect.getLocation().getWorld().getName()))
                         spawnFirework(fixedEffect.getLocation(), pplayer, fixedEffect.getParticlePair(), random);
             }
         }
diff --git a/src/com/esophose/playerparticles/styles/api/ParticleStyle.java b/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
index 1b50a06..a627be7 100644
--- a/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
+++ b/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
@@ -15,40 +15,40 @@ public interface ParticleStyle {
      * @param location The central location of the particles
      * @return A List of PParticles to spawn
      */
-    public List<PParticle> getParticles(ParticlePair particle, Location location);
+    List<PParticle> getParticles(ParticlePair particle, Location location);
 
     /**
      * Used to update timers for animations, called once per particle tick
      */
-    public void updateTimers();
+    void updateTimers();
 
     /**
      * The name of the style
      * 
      * @return The style's name
      */
-    public String getName();
+    String getName();
 
     /**
      * Gets if the style can be used in a FixedParticleEffect
      * 
      * @return If the style can be used in a FixedParticleEffect
      */
-    public boolean canBeFixed();
+    boolean canBeFixed();
     
     /**
      * Gets if the style can be replaced with DefaultStyles.FEET when the player is moving
      * 
      * @return True if it can be, otherwise False
      */
-    public boolean canToggleWithMovement();
+    boolean canToggleWithMovement();
     
     /**
      * The Y-axis offset to be applied when using '/pp fixed create looking'
      * 
      * @return How far to move the style up or down to get it centered on the block properly
      */
-    public double getFixedEffectOffset();
+    double getFixedEffectOffset();
     
     /**
      * Gets the ParticleStyle with the name given, returns null if not found
@@ -56,7 +56,7 @@ public interface ParticleStyle {
      * @param styleName The name of the style to search for
      * @return The ParticleStyle with a matching name
      */
-    public static ParticleStyle fromName(String styleName) {
+    static ParticleStyle fromName(String styleName) {
         for (ParticleStyle style : ParticleStyleManager.getStyles())
             if (style.getName().equalsIgnoreCase(styleName)) 
                 return style;
diff --git a/src/com/esophose/playerparticles/styles/api/ParticleStyleManager.java b/src/com/esophose/playerparticles/styles/api/ParticleStyleManager.java
index 6bbb91a..069119a 100644
--- a/src/com/esophose/playerparticles/styles/api/ParticleStyleManager.java
+++ b/src/com/esophose/playerparticles/styles/api/ParticleStyleManager.java
@@ -10,8 +10,8 @@ public class ParticleStyleManager {
     /**
      * Arrays that contain all registered styles
      */
-    private static List<ParticleStyle> styles = new ArrayList<ParticleStyle>();
-    private static List<ParticleStyle> customHandledStyles = new ArrayList<ParticleStyle>();
+    private static List<ParticleStyle> styles = new ArrayList<>();
+    private static List<ParticleStyle> customHandledStyles = new ArrayList<>();
 
     /**
      * Registers a style that is put into the plugin's update loop
diff --git a/src/com/esophose/playerparticles/DataUpdater.java b/src/com/esophose/playerparticles/updater/DataUpdater.java
similarity index 94%
rename from src/com/esophose/playerparticles/DataUpdater.java
rename to src/com/esophose/playerparticles/updater/DataUpdater.java
index 59126eb..71d6447 100644
--- a/src/com/esophose/playerparticles/DataUpdater.java
+++ b/src/com/esophose/playerparticles/updater/DataUpdater.java
@@ -1,7 +1,9 @@
-package com.esophose.playerparticles;
+package com.esophose.playerparticles.updater;
 
 import java.sql.Statement;
 
+import com.esophose.playerparticles.PlayerParticles;
+
 /**
  * This class handles updating the SQLite or MySQL data from older versions to the current version
  * Everything is purposely done on the main thread to prevent the plugin from starting before all the data is updated
@@ -12,7 +14,7 @@ public class DataUpdater {
      * Checks to make sure all the correct database tables exist
      * If they don't, create them
      */
-    protected static void tryCreateTables() {
+    public static void tryCreateTables() {
         PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
             try (Statement createStatement = connection.createStatement()) {
                 createStatement.addBatch("CREATE TABLE IF NOT EXISTS pp_settings (player_uuid VARCHAR(36), particles_hidden TINYINT)");
@@ -30,7 +32,7 @@ public class DataUpdater {
      * @param configVersion The old version of the plugin 
      * @param currentVersion The current version of the plugin
      */
-    protected static void updateData(double configVersion, double currentVersion) {
+    public static void updateData(double configVersion, double currentVersion) {
         if (configVersion == currentVersion) return;
         
         PlayerParticles.getPlugin().getLogger().warning("Starting to update SQLite/MySQL data from " + (configVersion < 5.3 ? "a legacy version" : "v" + configVersion) + " to v" + PlayerParticles.getPlugin().getDescription().getVersion() + ", this may take a while...");
diff --git a/src/com/esophose/playerparticles/updater/PluginUpdateListener.java b/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
index 828e78e..db074b4 100644
--- a/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
+++ b/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
@@ -1,24 +1,27 @@
 package com.esophose.playerparticles.updater;
 
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
 import com.esophose.playerparticles.PlayerParticles;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
 
 public class PluginUpdateListener implements Listener {
 
     /**
      * Called when a player joins and notifies ops if an update is available
-     * 
+     *
      * @param e The join event
      */
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
         if (e.getPlayer().isOp() && PlayerParticles.getPlugin().getUpdateVersion() != null) {
-            LangManager.sendCommandSenderMessage(e.getPlayer(), Lang.UPDATE_AVAILABLE, PlayerParticles.getPlugin().getUpdateVersion(), PlayerParticles.getPlugin().getDescription().getVersion());
+            LangManager.sendCommandSenderMessage(
+                    e.getPlayer(),
+                    Lang.UPDATE_AVAILABLE,
+                    PlayerParticles.getPlugin().getUpdateVersion(),
+                    PlayerParticles.getPlugin().getDescription().getVersion());
         }
     }
 
diff --git a/src/com/esophose/playerparticles/util/ParticleUtils.java b/src/com/esophose/playerparticles/util/ParticleUtils.java
index ff421e4..83e8398 100644
--- a/src/com/esophose/playerparticles/util/ParticleUtils.java
+++ b/src/com/esophose/playerparticles/util/ParticleUtils.java
@@ -50,16 +50,19 @@ public class ParticleUtils {
      * Finds a block/item as a material from a list of possible strings
      * Contains a fallback to the barrier icon just in case
      * 
+     * @param barrierFallback If the material should fall back to barrier
      * @param input A list of material names
      * @return The first matching material
      */
-    public static Material closestMatchWithFallback(String... input) {
+    public static Material closestMatchWithFallback(boolean barrierFallback, String... input) {
         Material mat = null;
         for (String name : input) {
             mat = closestMatch(name);
-            if (mat != null) return mat;
+            if (mat != null)
+                return mat;
         }
-        if (mat == null) mat = Material.BARRIER;
+        if (barrierFallback)
+            mat = Material.BARRIER;
         return mat;
     }
 
diff --git a/src/config.yml b/src/config.yml
index 387d526..921a764 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -157,6 +157,11 @@ database-user-name: ''
 # Default: ''
 database-user-password: ''
 
+# If the database connection should use SSL
+# You should enable this if your database supports SSL
+# Default: false
+database-use-ssl: false
+
 # =================================================================== #
 #                        GUI ICON SETTINGS                            #
 # This configuration option allows you to change any of the GUI       #
@@ -212,9 +217,15 @@ gui-icon:
       - MAGMA_BLOCK
     bubble_pop:
       - BUBBLE_CORAL_FAN
+    campfire_cosy_smoke:
+      - CAMPFIRE
+    campfire_signal_smoke:
+      - REDSTONE_TORCH
     cloud:
       - WHITE_WOOL
       - WOOL
+    composter:
+      - COMPOSTER
     crit:
       - IRON_SWORD
     current_down:
@@ -248,6 +259,10 @@ gui-icon:
       - TNT
     falling_dust:
       - SAND
+    falling_lava:
+      - RED_DYE
+    falling_water:
+      - BLUE_DYE
     firework:
       - FIREWORK_ROCKET
       - FIREWORK
@@ -275,6 +290,8 @@ gui-icon:
     large_smoke:
       - COBWEB
       - WEB
+    landing_lava:
+      - ORANGE_DYE
     lava:
       - MAGMA_CREAM
     mycelium:
@@ -294,6 +311,8 @@ gui-icon:
       - LAPIS_BLOCK
     smoke:
       - TORCH
+    sneeze:
+      - BAMBOO
     spell:
       - POTION
       - GLASS_BOTTLE
diff --git a/src/plugin.yml b/src/plugin.yml
index 77a2be2..e9caf96 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -2,7 +2,7 @@ name: PlayerParticles
 main: com.esophose.playerparticles.PlayerParticles
 version: 6.4
 api-version: 1.13
-description: Display particles around your player using customized styles and data!
+description: Display particles around your player and blocks using customized styles and data!
 author: Esophose
 website: https://www.spigotmc.org/resources/playerparticles.40261/
 commands:
@@ -10,3 +10,4 @@ commands:
         description: The main PlayerParticles command. By default, opens the GUI.
     ppo: 
         description: Allows executing a /pp command for another player.
+        permission: playerparticles.other