diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java
index 7041e15..6893ed8 100644
--- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java
+++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java
@@ -41,7 +41,7 @@ public Inventory getInventory() {
         inv.setItem(5, SpeedInvItems.speed6());
         inv.setItem(6, SpeedInvItems.speed7());
         inv.setItem(7, SpeedInvItems.speed8());
-        inv.setItem(8, MainInvItems.mainMenuReturn());
+        inv.setItem(8, SpeedInvItems.menuReturn());
 
         for (int i = 0; i < 9; ++i) {
             if (inv.getItem(i) == null) {
diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java
index d801415..a034b41 100644
--- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java
+++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java
@@ -1,10 +1,11 @@
 package net.noodles.staffmodegui2.staffmodegui2.Inv;
 
-import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WhitelistInvItems;
+import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WeatherInvItems;
 import net.noodles.staffmodegui2.staffmodegui2.StaffModeGUI2;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -14,17 +15,17 @@
 import org.bukkit.inventory.meta.ItemMeta;
 
 
-public class WhitelistInv implements Listener {
+public class WeatherInv implements Listener {
 
     private StaffModeGUI2 main;
 
-    public WhitelistInv(StaffModeGUI2 main) {
+    public WeatherInv(StaffModeGUI2 main) {
         this.main = main;
         main.getServer().getPluginManager().registerEvents(this, main);
     }
 
     private String getTitle() {
-        return ChatColor.DARK_GRAY + "" + ChatColor.BOLD + "Whitelist Control";
+        return ChatColor.DARK_GRAY + "" + ChatColor.BOLD + "Weather Control";
     }
 
     private int getSize() {
@@ -33,9 +34,10 @@ private int getSize() {
     public Inventory getInventory() {
         Inventory inv = Bukkit.createInventory(null, getSize(), getTitle());
 
-        inv.setItem(2, WhitelistInvItems.whitelistON());
-        inv.setItem(6, WhitelistInvItems.whitelistOFF());
-        inv.setItem(8, WhitelistInvItems.menuReturn());
+        inv.setItem(2, WeatherInvItems.weatherClear());
+        inv.setItem(6, WeatherInvItems.weatherStorm());
+        inv.setItem(8, WeatherInvItems.menuReturn());
+
 
         for (int i = 0; i < 9; ++i) {
             if (inv.getItem(i) == null) {
@@ -67,15 +69,17 @@ public void onInventoryClick(InventoryClickEvent event) {
         if (event.getCurrentItem().getType() == Material.AIR) return;
 
         event.setCancelled(true);
-        if (event.getCurrentItem().isSimilar(WhitelistInvItems.whitelistON())) {
-            Bukkit.getServer().setWhitelist(true);
-            player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("whitelistMenu.messageItemON").replace("&", "§"));
+        if (event.getCurrentItem().isSimilar(WeatherInvItems.weatherClear())) {
+            player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("weatherMenu.weatherClearMessage").replace("&", "§"));
             player.closeInventory();
-        } else if (event.getCurrentItem().isSimilar(WhitelistInvItems.whitelistOFF())) {
-            Bukkit.getServer().setWhitelist(false);
-            player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("whitelistMenu.messageItemOFF").replace("&", "§"));
+            World world = player.getWorld();
+            world.setStorm(false);
+        } else if (event.getCurrentItem().isSimilar(WeatherInvItems.weatherStorm())) {
+            player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("weatherMenu.weatherStormMessage").replace("&", "§"));
             player.closeInventory();
-        } else if (event.getCurrentItem().isSimilar(WhitelistInvItems.menuReturn())) {
+            World world = player.getWorld();
+            world.setStorm(true);
+        } else if (event.getCurrentItem().isSimilar(WeatherInvItems.menuReturn())) {
             player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message1").replace("&", "§"));
             player.openInventory(StaffModeGUI2.getInstance().getServerManagerInv().getInventory());
 
@@ -83,4 +87,4 @@ public void onInventoryClick(InventoryClickEvent event) {
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java
index f2088a1..1af43ed 100644
--- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java
+++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java
@@ -1,7 +1,5 @@
 package net.noodles.staffmodegui2.staffmodegui2.Inv;
 
-import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.ServerManagerInvItems;
-import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WeatherInvItems;
 import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WhitelistInvItems;
 import net.noodles.staffmodegui2.staffmodegui2.StaffModeGUI2;
 import org.bukkit.Bukkit;
@@ -77,7 +75,7 @@ public void onInventoryClick(InventoryClickEvent event) {
             Bukkit.getServer().setWhitelist(false);
             player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("whitelistMenu.messageItemOFF").replace("&", "§"));
             player.closeInventory();
-        } else if (event.getCurrentItem().isSimilar(ServerManagerInvItems.menuReturn())) {
+        } else if (event.getCurrentItem().isSimilar(WhitelistInvItems.menuReturn())) {
             player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message1").replace("&", "§"));
             player.openInventory(StaffModeGUI2.getInstance().getServerManagerInv().getInventory());
 
@@ -85,4 +83,4 @@ public void onInventoryClick(InventoryClickEvent event) {
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 6d5afd9..4963d1f 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -55,7 +55,7 @@ whitelistMenu: # Permission Needed: staffmodegui.whitelistmenu
   loreItemOFF: "&7Click to toggle the whitelist OFF."
   messageItemOFF: "&7You toggled the whitelist OFF."
 #=======================================================
-# Time Menu
+# Time Menu Messages
 timeMenu: # Permission Needed: staffmodegui.timemenu
   title: "&8Time Control"
   lore: "&7Control the server time"
@@ -428,7 +428,7 @@ strengthMenu: #Permission Needed: staffmodegui.strengthmenu
   titleItemStrength4: "&bStrength 4"
   loreItemStrength4: "&7Ability to deal more damage!"
   messageItemStrength4: "&7Strength 4 effect applied!"
-  titleItemStrength5: "&bSStrength 5"
+  titleItemStrength5: "&bStrength 5"
   loreItemStrength5: "&7Ability to deal more damage!"
   messageItemStrength5: "&7Strength 5 effect applied!"
   titleItemStrength6: "&bStrength 6"