diff --git a/site/plugins/admin/app/Controllers/SettingsController.php b/site/plugins/admin/app/Controllers/SettingsController.php
index c43c3931..8c59d055 100644
--- a/site/plugins/admin/app/Controllers/SettingsController.php
+++ b/site/plugins/admin/app/Controllers/SettingsController.php
@@ -37,8 +37,8 @@ class SettingsController extends Controller
         }
 
         $themes = [];
-        foreach ($this->registry->get('themes') as $theme) {
-            $themes[] = $theme['name'];
+        foreach ($this->registry->get('themes') as $key => $theme) {
+            $themes[$key] = $theme['name'];
         }
 
         $available_locales = Filesystem::listContents(PATH['plugins'] . '/admin/lang/');
diff --git a/site/plugins/admin/views/templates/system/settings/index.html b/site/plugins/admin/views/templates/system/settings/index.html
index 24733ffa..339e8510 100644
--- a/site/plugins/admin/views/templates/system/settings/index.html
+++ b/site/plugins/admin/views/templates/system/settings/index.html
@@ -362,7 +362,7 @@
                             <label for="cache[driver]">{{ tr('admin_cache_driver') }}</label>
                             <select id="systemSettingsSystemCacheDriver" name="cache[driver]" class="form-control" required="required">
                                 {% for key, value in cache_driver %}
-                                    <option value="{{ key }}" {% if key == entries.main %}selected{% endif %}>{{ value }}</option>
+                                    <option value="{{ key }}" {% if key == registry.settings.cache.driver %}selected{% endif %}>{{ value }}</option>
                                 {% endfor %}
                             </select>
                         </div>
@@ -509,7 +509,7 @@
             <a class="nav-link" id="pills-error-tab" data-toggle="pill" href="#pills-error" role="tab" aria-controls="pills-error" aria-selected="true"><i class="fas fa-exclamation-circle"></i> {{ tr('admin_error_404_page') }}</a>
             <a class="nav-link" id="pills-twig-tab" data-toggle="pill" href="#pills-twig" role="tab" aria-controls="pills-twig" aria-selected="true"><i class="fas fa-pencil-ruler"></i> {{ tr('admin_twig_templating') }}</a>
             <a class="nav-link" id="pills-debugging-tab" data-toggle="pill" href="#pills-debugging" role="tab" aria-controls="pills-debugging" aria-selected="true"><i class="fas fa-tools"></i> {{ tr('admin_debugging') }}</a>
-            <a class="nav-link" id="pills-slim-tab" data-toggle="pill" href="#pills-slim" role="tab" aria-controls="pills-slim" aria-selected="true"><i class="fas fa-cogs"></i> {{ tr('admin_slim') }}</a>
+            <a class="nav-link" id="pills-slim-tab" data-toggle="pill" href="#pills-slim" role="tab" aria-controls="pills-slim" aria-selected="true"><i class="fas fa-cogs"></i> {{ tr('admin_system') }}</a>
             <a class="nav-link" id="pills-cache-tab" data-toggle="pill" href="#pills-cache" role="tab" aria-controls="pills-cache" aria-selected="true"><i class="fas fa-clone"></i> {{ tr('admin_cache') }}</a>
             <a class="nav-link" id="pills-slug-tab" data-toggle="pill" href="#pills-slug" role="tab" aria-controls="pills-slug" aria-selected="true"><i class="fas fa-link"></i> {{ tr('admin_slug') }}</a>
             <a class="nav-link" id="pills-admin-tab" data-toggle="pill" href="#pills-admin" role="tab" aria-controls="pills-admin" aria-selected="true"><i class="fab fa-fort-awesome"></i> {{ tr('admin_admin_panel') }}</a>