diff --git a/src/main/java/net/brennholz/challenges/Challenges.java b/src/main/java/net/brennholz/challenges/Challenges.java
index 26019d5..55cdbcf 100644
--- a/src/main/java/net/brennholz/challenges/Challenges.java
+++ b/src/main/java/net/brennholz/challenges/Challenges.java
@@ -45,13 +45,14 @@
   
   public static Challenges getplugin() { return plugin; }
   
+  
   public void onEnable() {
     plugin = this;
     this.Timer = new Timer_Command();
     this.backpack = new Backpack();
     this.rndDrops = new RandomDrops();
-    getCommand("settings").setExecutor((CommandExecutor)this);
     getCommand("hp").setExecutor(new HP_Command());
+    getCommand("settings").setExecutor(new Settings_Command());
     getCommand("coords").setExecutor(new Coords_Command());
     getCommand("revive").setExecutor(new Revive_Command());
     getCommand("timer").setExecutor(new Timer_Command());
@@ -104,6 +105,8 @@
     this.sbManager = new SBManager();
   }
   
+  
+  
   public void onDisable() {
     this.backpack.saveInventoryToConfig();
     try {
@@ -155,93 +158,7 @@
     } 
   }
   
-  public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-    if (sender instanceof Player) {
-      Player p = (Player)sender;
-      if (args.length == 0) {
-        if (p.hasPermission("challenges.settings.view")) {
-          createGUI(p);
-        } else {
-          p.sendMessage("hast hierfkeine Berechtigung");
-        } 
-      } else if (args.length == 1) {
-        if (args[0].equalsIgnoreCase("get")) {
-          if (p.hasPermission("challenges.settings.get")) {
-            p.sendMessage("Einstellungen");
-            p.sendMessage("Crafting =" + getConfig().getBoolean("craftingtable"));
-            p.sendMessage("Handeln =" + getConfig().getBoolean("allowtrading"));
-            p.sendMessage("bei Fallschaden =" + getConfig().getBoolean("deathonfall"));
-            p.sendMessage("bei Schleichen =" + getConfig().getBoolean("damageonsneak"));
-            p.sendMessage("Schaden bei Schleichen =" + getConfig().getInt("sneakdmg"));
-            p.sendMessage("Drops =" + getConfig().getBoolean("rnddrops"));
-            p.sendMessage("Schaden =" + getConfig().getBoolean("sharedmg"));
-            p.sendMessage("Leben falle =" + getConfig().getBoolean("onelife"));
-            p.sendMessage("in Chat =" + getConfig().getBoolean("dmginchat"));
-            p.sendMessage("=" + getConfig().getBoolean("respawn"));
-          } else {
-            p.sendMessage("hast hierfkeine Berechtigung");
-          } 
-        } else {
-          p.sendMessage("/settings Get/Crafting/Trading/DeathFall/DMGOnSneak/SneakDMG/RndDrops/ShareDMG/Respawn/OneLife/ChatDMG [True/False]");
-        } 
-      } else if (args.length >= 2) {
-        if (p.hasPermission("challenges.settings.modify")) {
-          Boolean Bwert = Boolean.valueOf(Boolean.parseBoolean(args[1]));
-          if (args[0].equalsIgnoreCase("crafting")) {
-            getConfig().set("craftingtable", Bwert);
-            saveConfig();
-            p.sendMessage("Crafting =" + getConfig().getBoolean("craftingtable"));
-          } else if (args[0].equalsIgnoreCase("deathfall")) {
-            getConfig().set("deathonfall", Bwert);
-            saveConfig();
-            p.sendMessage("bei Fallschaden =" + getConfig().getBoolean("deathonfall"));
-          } else if (args[0].equalsIgnoreCase("trading")) {
-            getConfig().set("allowtrading", Bwert);
-            saveConfig();
-            p.sendMessage("Handeln =" + getConfig().getBoolean("allowtrading"));
-          } else if (args[0].equalsIgnoreCase("dmgonsneak")) {
-            getConfig().set("damageonsneak", Bwert);
-            saveConfig();
-            p.sendMessage("bei Schleichen =" + getConfig().getBoolean("damageonsneak"));
-          } else if (args[0].equalsIgnoreCase("sneakdmg")) {
-            Double Dwert = Double.valueOf(Double.parseDouble(args[1]));
-            getConfig().set("sneakdmg", Dwert);
-            saveConfig();
-            p.sendMessage("Schaden bei Schleichen =" + getConfig().getString("sneakdmg"));
-          } else if (args[0].equalsIgnoreCase("rnddrops")) {
-            getConfig().set("rnddrops", Bwert);
-            saveConfig();
-            p.sendMessage("Drops =" + getConfig().getBoolean("rnddrops"));
-          } else if (args[0].equalsIgnoreCase("sharedmg")) {
-            getConfig().set("sharehp", Bwert);
-            saveConfig();
-            p.sendMessage("Schaden =" + getConfig().getBoolean("sharedmg"));
-          } else if (args[0].equalsIgnoreCase("respawn")) {
-            getConfig().set("respawn", Bwert);
-            saveConfig();
-            p.sendMessage("=" + getConfig().getBoolean("respawn"));
-          } else if (args[0].equalsIgnoreCase("onelife")) {
-            getConfig().set("onelife", Bwert);
-            saveConfig();
-            p.sendMessage("Leben falle =" + getConfig().getBoolean("onelife"));
-          } else if (args[0].equalsIgnoreCase("chatdmg")) {
-            getConfig().set("dmginchat", Bwert);
-            saveConfig();
-            p.sendMessage("in Chat =" + getConfig().getBoolean("dmginchat"));
-          } else {
-            p.sendMessage("Parameter!");
-          } 
-        } else {
-          p.sendMessage("hast hierfkeine Berechtigung");
-        } 
-      } else {
-        p.sendMessage("/settings Get/Crafting/Trading/DeathFall/DMGOnSneak/SneakDMG/RndDrops/ShareDMG/Respawn/OneLife/ChatDMG [True/False]");
-      } 
-    } else {
-      sender.sendMessage("Konsolenbefehl!");
-    } 
-    return true;
-  }
+ 
   
   public void createGUI(Player p) {
 	SettingsGUI.setItem(9, addGUIItem(Material.CRAFTING_TABLE, "§6Erlaube Crafting"));
@@ -293,8 +210,10 @@
     return "§cFalse";
   }
   
+  
+  
   @SuppressWarnings("deprecation")
-private Material getgrDye(String gr) {
+  private Material getgrDye(String gr) {
     ItemStack mat = new ItemStack(Material.GRAY_DYE);
     World wld = Bukkit.getWorlds().get(0);
     if (wld.getGameRuleValue(gr).equals("true")) {
@@ -305,6 +224,8 @@
     return mat.getType();
   }
   
+  
+  
   @SuppressWarnings("deprecation")
 private String getgrBool(String gr) {
     World wld = Bukkit.getWorlds().get(0);
@@ -315,6 +236,8 @@
     return "§7Unknown";
   }
   
+ 
+  
   private ItemStack addGUIItem(Material mat, String name, String... lore) {
     ItemStack item = new ItemStack(mat, 1);
     ItemMeta meta = item.getItemMeta();
diff --git a/src/main/java/net/brennholz/challenges/Settings_Command.java b/src/main/java/net/brennholz/challenges/Settings_Command.java
new file mode 100644
index 0000000..a103e0e
--- /dev/null
+++ b/src/main/java/net/brennholz/challenges/Settings_Command.java
@@ -0,0 +1,101 @@
+package net.brennholz.challenges;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class Settings_Command implements CommandExecutor {
+
+	private Challenges chl = Challenges.getplugin();
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		if (sender instanceof Player) {
+			Player p = (Player) sender;
+			if (args.length == 0) {
+				if (p.hasPermission("challenges.settings.view")) {
+					chl.createGUI(p);
+				} else {
+					p.sendMessage("hast hierfkeine Berechtigung");
+				}
+			} else if (args.length == 1) {
+				if (args[0].equalsIgnoreCase("get")) {
+					if (p.hasPermission("challenges.settings.get")) {
+						p.sendMessage("Einstellungen");
+						p.sendMessage("Crafting =" + chl.getConfig().getBoolean("craftingtable"));
+						p.sendMessage("Handeln =" + chl.getConfig().getBoolean("allowtrading"));
+						p.sendMessage("bei Fallschaden =" + chl.getConfig().getBoolean("deathonfall"));
+						p.sendMessage("bei Schleichen =" + chl.getConfig().getBoolean("damageonsneak"));
+						p.sendMessage("Schaden bei Schleichen =" + chl.getConfig().getInt("sneakdmg"));
+						p.sendMessage("Drops =" + chl.getConfig().getBoolean("rnddrops"));
+						p.sendMessage("Schaden =" + chl.getConfig().getBoolean("sharedmg"));
+						p.sendMessage("Leben falle =" + chl.getConfig().getBoolean("onelife"));
+						p.sendMessage("in Chat =" + chl.getConfig().getBoolean("dmginchat"));
+						p.sendMessage("=" + chl.getConfig().getBoolean("respawn"));
+					} else {
+						p.sendMessage("hast hierfkeine Berechtigung");
+					}
+				} else {
+					p.sendMessage("/settings Get/Crafting/Trading/DeathFall/DMGOnSneak/SneakDMG/RndDrops/ShareDMG/Respawn/OneLife/ChatDMG [True/False]");
+				}
+			} else if (args.length >= 2) {
+				if (p.hasPermission("challenges.settings.modify")) {
+					Boolean Bwert = Boolean.valueOf(Boolean.parseBoolean(args[1]));
+					if (args[0].equalsIgnoreCase("crafting")) {
+						chl.getConfig().set("craftingtable", Bwert);
+						chl.saveConfig();
+						p.sendMessage("Crafting =" + chl.getConfig().getBoolean("craftingtable"));
+					} else if (args[0].equalsIgnoreCase("deathfall")) {
+						chl.getConfig().set("deathonfall", Bwert);
+						chl.saveConfig();
+						p.sendMessage("bei Fallschaden =" + chl.getConfig().getBoolean("deathonfall"));
+					} else if (args[0].equalsIgnoreCase("trading")) {
+						chl.getConfig().set("allowtrading", Bwert);
+						chl.saveConfig();
+						p.sendMessage("Handeln =" + chl.getConfig().getBoolean("allowtrading"));
+					} else if (args[0].equalsIgnoreCase("dmgonsneak")) {
+						chl.getConfig().set("damageonsneak", Bwert);
+						chl.saveConfig();
+						p.sendMessage("bei Schleichen =" + chl.getConfig().getBoolean("damageonsneak"));
+					} else if (args[0].equalsIgnoreCase("sneakdmg")) {
+						Double Dwert = Double.valueOf(Double.parseDouble(args[1]));
+						chl.getConfig().set("sneakdmg", Dwert);
+						chl.saveConfig();
+						p.sendMessage("Schaden bei Schleichen =" + chl.getConfig().getString("sneakdmg"));
+					} else if (args[0].equalsIgnoreCase("rnddrops")) {
+						chl.getConfig().set("rnddrops", Bwert);
+						chl.saveConfig();
+						p.sendMessage("Drops =" + chl.getConfig().getBoolean("rnddrops"));
+					} else if (args[0].equalsIgnoreCase("sharedmg")) {
+						chl.getConfig().set("sharehp", Bwert);
+						chl.saveConfig();
+						p.sendMessage("Schaden =" + chl.getConfig().getBoolean("sharedmg"));
+					} else if (args[0].equalsIgnoreCase("respawn")) {
+						chl.getConfig().set("respawn", Bwert);
+						chl.saveConfig();
+						p.sendMessage("=" + chl.getConfig().getBoolean("respawn"));
+					} else if (args[0].equalsIgnoreCase("onelife")) {
+						chl.getConfig().set("onelife", Bwert);
+						chl.saveConfig();
+						p.sendMessage("Leben falle =" + chl.getConfig().getBoolean("onelife"));
+					} else if (args[0].equalsIgnoreCase("chatdmg")) {
+						chl.getConfig().set("dmginchat", Bwert);
+						chl.saveConfig();
+						p.sendMessage("in Chat =" + chl.getConfig().getBoolean("dmginchat"));
+					} else {
+						p.sendMessage("Parameter!");
+					}
+				} else {
+					p.sendMessage("hast hierfkeine Berechtigung");
+				}
+			} else {
+				p.sendMessage(
+						"/settings Get/Crafting/Trading/DeathFall/DMGOnSneak/SneakDMG/RndDrops/ShareDMG/Respawn/OneLife/ChatDMG [True/False]");
+			}
+		} else {
+			sender.sendMessage("Konsolenbefehl!");
+		}
+		return true;
+	}
+}