diff --git a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java
index 382511da7..21ecf7a87 100755
--- a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java
+++ b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java
@@ -151,8 +151,6 @@ public class BSkyBlock extends JavaPlugin {
         });
     }
 
-
-
     /**
      * Register listeners
      */
diff --git a/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java b/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java
index a99a3d626..d1bc5e914 100644
--- a/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java
+++ b/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java
@@ -5,6 +5,8 @@ import org.bukkit.event.Listener;
 
 import us.tastybento.bskyblock.api.flags.Flag.Type;
 import us.tastybento.bskyblock.api.flags.clicklisteners.CycleClick;
+import us.tastybento.bskyblock.api.flags.clicklisteners.IslandToggleClick;
+import us.tastybento.bskyblock.api.flags.clicklisteners.WorldToggleClick;
 import us.tastybento.bskyblock.api.panels.PanelItem;
 import us.tastybento.bskyblock.managers.RanksManager;
 
@@ -21,8 +23,6 @@ public class FlagBuilder {
 
     public FlagBuilder id(String string) {
         id = string;
-        // Set the default click operation to UpDownClick
-        onClick = new CycleClick(id);
         return this;
     }
 
@@ -44,6 +44,24 @@ public class FlagBuilder {
     }
 
     public Flag build() {
+        // If no onClick has been set, then apply default ones
+        if (onClick == null) {
+            switch (type){
+                case PROTECTION:
+                    onClick = new CycleClick(id);
+                    break;
+                case SETTING:
+                    onClick = new IslandToggleClick(id);
+                    break;
+                case WORLD_SETTING:
+                    onClick = new WorldToggleClick(id);
+                    break;
+                default:
+                    onClick = new CycleClick(id);
+                    break;
+            }
+        }
+
         Flag f = new Flag(id, icon, listener, type, defaultRank, onClick, subPanel);
         f.setDefaultSetting(setting);
         return f;
diff --git a/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListener.java b/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClick.java
similarity index 95%
rename from src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListener.java
rename to src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClick.java
index 5c6f0c0cf..d34833153 100644
--- a/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListener.java
+++ b/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClick.java
@@ -19,7 +19,7 @@ import us.tastybento.bskyblock.util.Util;
  * @author tastybento
  *
  */
-public class IslandToggleClickListener implements ClickHandler {
+public class IslandToggleClick implements ClickHandler {
 
     private BSkyBlock plugin = BSkyBlock.getInstance();
     private String id;
@@ -27,7 +27,7 @@ public class IslandToggleClickListener implements ClickHandler {
     /**
      * @param id - the flag ID that this click listener is associated with
      */
-    public IslandToggleClickListener(String id) {
+    public IslandToggleClick(String id) {
         this.id = id;
     }
 
diff --git a/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListener.java b/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClick.java
similarity index 94%
rename from src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListener.java
rename to src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClick.java
index 7221f0506..e0b47422e 100644
--- a/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListener.java
+++ b/src/main/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClick.java
@@ -18,7 +18,7 @@ import us.tastybento.bskyblock.util.Util;
  * @author tastybento
  *
  */
-public class WorldToggleClickListener implements ClickHandler {
+public class WorldToggleClick implements ClickHandler {
 
     private BSkyBlock plugin = BSkyBlock.getInstance();
     private String id;
@@ -26,7 +26,7 @@ public class WorldToggleClickListener implements ClickHandler {
     /**
      * @param id - the flag ID that this click listener is associated with
      */
-    public WorldToggleClickListener(String id) {
+    public WorldToggleClick(String id) {
         this.id = id;
     }
 
diff --git a/src/main/java/us/tastybento/bskyblock/lists/Flags.java b/src/main/java/us/tastybento/bskyblock/lists/Flags.java
index dde158657..666605f2f 100644
--- a/src/main/java/us/tastybento/bskyblock/lists/Flags.java
+++ b/src/main/java/us/tastybento/bskyblock/lists/Flags.java
@@ -10,8 +10,6 @@ import org.bukkit.Material;
 import us.tastybento.bskyblock.api.flags.Flag;
 import us.tastybento.bskyblock.api.flags.Flag.Type;
 import us.tastybento.bskyblock.api.flags.FlagBuilder;
-import us.tastybento.bskyblock.api.flags.clicklisteners.IslandToggleClickListener;
-import us.tastybento.bskyblock.api.flags.clicklisteners.WorldToggleClickListener;
 import us.tastybento.bskyblock.listeners.flags.BlockInteractionListener;
 import us.tastybento.bskyblock.listeners.flags.BreakBlocksListener;
 import us.tastybento.bskyblock.listeners.flags.BreedingListener;
@@ -144,45 +142,52 @@ public class Flags {
      */
     // PVP
     public static final Flag PVP_OVERWORLD = new FlagBuilder().id("PVP_OVERWORLD").icon(Material.ARROW).type(Type.SETTING)
-            .defaultRank(DISABLED).listener(new PVPListener()).onClick(new IslandToggleClickListener("PVP_OVERWORLD")).build();
+            .defaultRank(DISABLED).listener(new PVPListener()).build();
     public static final Flag PVP_NETHER = new FlagBuilder().id("PVP_NETHER").icon(Material.IRON_AXE).type(Type.SETTING)
-            .defaultRank(DISABLED).onClick(new IslandToggleClickListener("PVP_NETHER")).build();
+            .defaultRank(DISABLED).build();
     public static final Flag PVP_END = new FlagBuilder().id("PVP_END").icon(Material.END_CRYSTAL).type(Type.SETTING)
-            .defaultRank(DISABLED).onClick(new IslandToggleClickListener("PVP_END")).build();
+            .defaultRank(DISABLED).build();
 
     // Others
     public static final Flag ANIMAL_SPAWN = new FlagBuilder().id("ANIMAL_SPAWN").icon(Material.APPLE).allowedByDefault(true).type(Type.SETTING)
-            .listener(new MobSpawnListener()).onClick(new IslandToggleClickListener("ANIMAL_SPAWN")).build();
-    public static final Flag MONSTER_SPAWN = new FlagBuilder().id("MONSTER_SPAWN").icon(Material.MOB_SPAWNER).allowedByDefault(true).type(Type.SETTING)
-            .onClick(new IslandToggleClickListener("MONSTER_SPAWN")).build();
-    public static final Flag FIRE_SPREAD = new FlagBuilder().id("FIRE_SPREAD").icon(Material.FIREWORK_CHARGE).allowedByDefault(true).type(Type.SETTING)
-            .onClick(new IslandToggleClickListener("FIRE_SPREAD")).build();
+            .listener(new MobSpawnListener()).build();
+    public static final Flag MONSTER_SPAWN = new FlagBuilder().id("MONSTER_SPAWN").icon(Material.MOB_SPAWNER).allowedByDefault(true).type(Type.SETTING).build();
+    public static final Flag FIRE_SPREAD = new FlagBuilder().id("FIRE_SPREAD").icon(Material.FIREWORK_CHARGE).allowedByDefault(true).type(Type.SETTING).build();
+
+    /*
+     * World Settings - they apply to every island in the game worlds.
+     */
 
     // World Settings - apply to every island in the game worlds
     public static final Flag ENDER_CHEST = new FlagBuilder().id("ENDER_CHEST").icon(Material.ENDER_CHEST)
             .allowedByDefault(false).type(Type.WORLD_SETTING)
             .listener(new EnderChestListener())
-            .onClick(new WorldToggleClickListener("ENDER_CHEST"))
             .build();
+
     public static final Flag ENTER_EXIT_MESSAGES = new FlagBuilder().id("ENTER_EXIT_MESSAGES").icon(Material.DIRT).allowedByDefault(true).type(Type.WORLD_SETTING)
             .listener(new EnterExitListener())
-            .onClick(new WorldToggleClickListener("ENTER_EXIT_MESSAGES"))
             .build();
+
     public static final Flag PISTON_PUSH = new FlagBuilder().id("PISTON_PUSH").icon(Material.PISTON_BASE).allowedByDefault(true).type(Type.WORLD_SETTING)
             .listener(new PistonPushListener())
-            .onClick(new WorldToggleClickListener("PISTON_PUSH"))
             .build();
-    static InvincibleVisitorsListener ilv = new InvincibleVisitorsListener();
+
+    private static InvincibleVisitorsListener ilv = new InvincibleVisitorsListener();
     public static final Flag INVINCIBLE_VISITORS = new FlagBuilder().id("INVINCIBLE_VISITORS").icon(Material.DIAMOND_CHESTPLATE).type(Type.WORLD_SETTING)
             .listener(ilv).onClick(ilv).subPanel(true).build();
+
     public static final Flag REMOVE_MOBS = new FlagBuilder().id("REMOVE_MOBS").icon(Material.GLOWSTONE_DUST).type(Type.WORLD_SETTING)
-            .listener(new RemoveMobsListener()).allowedByDefault(true).onClick(new WorldToggleClickListener("REMOVE_MOBS")).build();
+            .listener(new RemoveMobsListener()).allowedByDefault(true).build();
+
     public static final Flag ISLAND_RESPAWN = new FlagBuilder().id("ISLAND_RESPAWN").icon(Material.TORCH).type(Type.WORLD_SETTING)
-            .listener(new IslandRespawnListener()).allowedByDefault(true).onClick(new WorldToggleClickListener("ISLAND_RESPAWN")).build();
+            .listener(new IslandRespawnListener()).allowedByDefault(true).build();
+
     public static final Flag OFFLINE_REDSTONE = new FlagBuilder().id("OFFLINE_REDSTONE").icon(Material.REDSTONE_COMPARATOR).type(Type.WORLD_SETTING)
-            .listener(new OfflineRedstoneListener()).allowedByDefault(true).onClick(new WorldToggleClickListener("OFFLINE_REDSTONE")).build();
+            .listener(new OfflineRedstoneListener()).allowedByDefault(true).build();
+
     public static final Flag CLEAN_SUPER_FLAT = new FlagBuilder().id("CLEAN_SUPER_FLAT").icon(Material.BEDROCK).type(Type.WORLD_SETTING)
-            .listener(new CleanSuperFlatListener()).allowedByDefault(false).onClick(new WorldToggleClickListener("CLEAN_SUPER_FLAT")).build();
+            .listener(new CleanSuperFlatListener()).allowedByDefault(false).build();
+
     /**
      * @return List of all the flags in this class
      */
diff --git a/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListenerTest.java b/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickTest.java
similarity index 96%
rename from src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListenerTest.java
rename to src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickTest.java
index f0f612793..240abbf8e 100644
--- a/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickListenerTest.java
+++ b/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/IslandToggleClickTest.java
@@ -33,10 +33,10 @@ import us.tastybento.bskyblock.util.Util;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({BSkyBlock.class, Util.class })
-public class IslandToggleClickListenerTest {
+public class IslandToggleClickTest {
 
     private IslandWorldManager iwm;
-    private IslandToggleClickListener listener;
+    private IslandToggleClick listener;
     private Panel panel;
     private User user;
     private Flag flag;
@@ -59,7 +59,7 @@ public class IslandToggleClickListenerTest {
         when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
         when(plugin.getIWM()).thenReturn(iwm);
 
-        listener = new IslandToggleClickListener("test");
+        listener = new IslandToggleClick("test");
 
         panel = mock(Panel.class);
         when(panel.getInventory()).thenReturn(mock(Inventory.class));
diff --git a/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListenerTest.java b/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickTest.java
similarity index 96%
rename from src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListenerTest.java
rename to src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickTest.java
index 0398d49c1..e8b9ff235 100644
--- a/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickListenerTest.java
+++ b/src/test/java/us/tastybento/bskyblock/api/flags/clicklisteners/WorldToggleClickTest.java
@@ -29,10 +29,10 @@ import us.tastybento.bskyblock.util.Util;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({BSkyBlock.class, Util.class })
-public class WorldToggleClickListenerTest {
+public class WorldToggleClickTest {
 
     private IslandWorldManager iwm;
-    private WorldToggleClickListener listener;
+    private WorldToggleClick listener;
     private Panel panel;
     private User user;
     private Flag flag;
@@ -52,7 +52,7 @@ public class WorldToggleClickListenerTest {
         when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
         when(plugin.getIWM()).thenReturn(iwm);
 
-        listener = new WorldToggleClickListener("test");
+        listener = new WorldToggleClick("test");
 
         panel = mock(Panel.class);
         when(panel.getInventory()).thenReturn(mock(Inventory.class));