diff --git a/collapsiblock.module b/collapsiblock.module
index c5ef666..99519a0 100644
--- a/collapsiblock.module
+++ b/collapsiblock.module
@@ -61,9 +61,9 @@ function collapsiblock_page_attachments(array &$attachments) {
   $theme_name = \Drupal::theme()->getActiveTheme()->getName();
 
   // Theme settings.
-  $collapsiblock_title = !empty(theme_get_setting('title', $theme_name)) ? theme_get_setting('title', $theme_name) : $default_config->get('title');
-  $collapsiblock_block = !empty(theme_get_setting('block', $theme_name)) ? theme_get_setting('block', $theme_name) : $default_config->get('block');
-  $collapsiblock_content = !empty(theme_get_setting('content', $theme_name)) ? theme_get_setting('content', $theme_name) : $default_config->get('content');
+  $collapsiblock_title = !empty(theme_get_setting('collapsiblock_title', $theme_name)) ? theme_get_setting('collapsiblock_title', $theme_name) : $default_config->get('title');
+  $collapsiblock_block = !empty(theme_get_setting('collapsiblock_block', $theme_name)) ? theme_get_setting('collapsiblock_block', $theme_name) : $default_config->get('block');
+  $collapsiblock_content = !empty(theme_get_setting('collapsiblock_content', $theme_name)) ? theme_get_setting('collapsiblock_content', $theme_name) : $default_config->get('content');
 
   // Load all blocks.
   $blocks = Block::loadMultiple();
@@ -95,7 +95,8 @@ function collapsiblock_page_attachments(array &$attachments) {
  */
 function collapsiblock_form_system_theme_settings_alter(&$form, FormStateInterface $form_state) {
   $default_config = \Drupal::config('collapsiblock.settings');
-  $theme_name = \Drupal::theme()->getActiveTheme()->getName();
+  $build_info = $form_state->getBuildInfo();
+  $theme_name = $build_info['args'][0];
 
   // Add new fields for default settings.
   $form['collapsiblock'] = [
@@ -109,12 +110,12 @@ function collapsiblock_form_system_theme_settings_alter(&$form, FormStateInterfa
   $form['collapsiblock']['collapsiblock_block'] = [
     '#type' => 'textfield',
     '#title' => t('Block'),
-    '#default_value' => !empty(theme_get_setting('collapsiblock_block', $theme_name)) ? theme_get_setting('collapsiblock_block', $theme_name) : $default_config->get('title'),
+    '#default_value' => !empty(theme_get_setting('collapsiblock_block', $theme_name)) ? theme_get_setting('collapsiblock_block', $theme_name) : $default_config->get('block'),
   ];
   $form['collapsiblock']['collapsiblock_title'] = [
     '#type' => 'textfield',
     '#title' => t('Title'),
-    '#default_value' => !empty(theme_get_setting('collapsiblock_title', $theme_name)) ? theme_get_setting('collapsiblock_title', $theme_name) : $default_config->get('block'),
+    '#default_value' => !empty(theme_get_setting('collapsiblock_title', $theme_name)) ? theme_get_setting('collapsiblock_title', $theme_name) : $default_config->get('title'),
   ];
 
   $form['collapsiblock']['collapsiblock_content'] = [