diff --git a/site/plugins/admin/app/Controllers/SettingsController.php b/site/plugins/admin/app/Controllers/SettingsController.php
index f2af0eb3..cd89b27d 100644
--- a/site/plugins/admin/app/Controllers/SettingsController.php
+++ b/site/plugins/admin/app/Controllers/SettingsController.php
@@ -20,7 +20,7 @@ class SettingsController extends Controller
 
        $themes = [];
        foreach (Filesystem::listContents(PATH['themes']) as $theme) {
-           if ($theme['type'] == 'dir' && Filesystem::has($theme['path'] . '/' . $theme['dirname'] . '.yaml')) {
+           if ($theme['type'] == 'dir' && Filesystem::has($theme['path'] . '/' . $theme['dirname'] . '.json')) {
                $themes[$theme['dirname']] = $theme['dirname'];
            }
        }
@@ -29,7 +29,7 @@ class SettingsController extends Controller
        $system_locales = $this->plugins->getLocales();
        $locales = [];
        foreach ($available_locales as $locale) {
-           if ($locale['type'] == 'file' && $locale['extension'] == 'yaml') {
+           if ($locale['type'] == 'file' && $locale['extension'] == 'json') {
                $locales[$locale['basename']] = $system_locales[$locale['basename']]['nativeName'];
            }
        }
@@ -92,7 +92,7 @@ class SettingsController extends Controller
         Arr::set($data, 'entries.media.upload_images_width', (int) $data['entries']['media']['upload_images_width']);
         Arr::set($data, 'entries.media.upload_images_height', (int) $data['entries']['media']['upload_images_height']);
 
-        if (Filesystem::write(PATH['config']['site'] . '/settings.yaml', YamlParser::encode(array_merge($this->registry->get('settings'), $data)))) {
+        if (Filesystem::write(PATH['config']['site'] . '/settings.json', JsonParser::encode(array_merge($this->registry->get('settings'), $data)))) {
             $this->flash->addMessage('success', __('admin_message_settings_saved'));
         } else {
             $this->flash->addMessage('success', __('admin_message_settings_was_not_saved'));