diff --git a/app/config.php b/app/config.php
index 337d4ce..fac17c9 100644
--- a/app/config.php
+++ b/app/config.php
@@ -1,11 +1,17 @@
 <?php
 
 function createContext(): Context {
-    // Load configuration
-    $configFile = file_exists(__DIR__ . '/../custom/config.ini')
-        ? __DIR__ . '/../custom/config.ini'
-        : __DIR__ . '/config.ini';
-    $config = parse_ini_file($configFile, true);
+    // Load configuration with fallback: custom -> default
+    $defaultConfig = __DIR__ . '/default/config.ini';
+    $customConfig = __DIR__ . '/../custom/config.ini';
+    
+    // Start with default config
+    $config = file_exists($defaultConfig) ? parse_ini_file($defaultConfig, true) : [];
+    
+    // Merge with custom config if it exists
+    if (file_exists($customConfig)) {
+        $config = array_replace_recursive($config, parse_ini_file($customConfig, true) ?: []);
+    }
 
     // Load global plugins
     getPluginManager()->loadGlobalPlugins($config);