diff --git a/src/config.py b/src/config.py
index b7fafd4..728b8a2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -337,19 +337,19 @@ class Config:
         # Paladin base config
         paladin_base_cfg = dict(self.configs["config"]["parser"]["paladin"])
         if "paladin" in self.configs["custom"]["parser"]:
-            paladin_base_cfg.update(dict(self.configs["custom"]["parser"]["paladin"])) 
+            paladin_base_cfg.update(dict(self.configs["custom"]["parser"]["paladin"]))
         # Hammerdin config
         self.hammerdin = self.configs["config"]["parser"]["hammerdin"]
         if "hammerdin" in self.configs["custom"]["parser"]:
-            self.fohdin.update(self.configs["custom"]["parser"]["fohdin"])
             self.hammerdin.update(self.configs["custom"]["parser"]["hammerdin"])
+        self.hammerdin.update(paladin_base_cfg)
         # FoHdin config
         self.fohdin = dict(self.configs["config"]["parser"]["fohdin"])
         if "fohdin" in self.configs["custom"]["parser"]:
             self.fohdin.update(self.configs["custom"]["parser"]["fohdin"])
         self.fohdin.update(paladin_base_cfg)
 
-        # Assasin config
+        # Assassin config
         self.trapsin = self.configs["config"]["parser"]["trapsin"]
         if "trapsin" in self.configs["custom"]["parser"]:
             self.trapsin.update(self.configs["custom"]["parser"]["trapsin"])