diff --git a/modules/themeconfigurator/themeconfigurator.php b/modules/themeconfigurator/themeconfigurator.php
index cd7231ed9..495168377 100644
--- a/modules/themeconfigurator/themeconfigurator.php
+++ b/modules/themeconfigurator/themeconfigurator.php
@@ -80,7 +80,7 @@ class ThemeConfigurator extends Module
             !$this->registerHook('displayBackOfficeHeader') ||
 			
 			!Configuration::updateValue('PS_TC_THEMES', serialize($themes_colors)) ||
-			!Configuration::updateValue('PS_TC_THEMES_FONTS', serialize($themes_fonts)))
+			!Configuration::updateValue('PS_TC_FONTS', serialize($themes_fonts)))
 			return false;
 
 		return true;
@@ -147,9 +147,7 @@ class ThemeConfigurator extends Module
 				if (Tools::isSubmit('submitLiveConfigurator'))
 				{
 					Configuration::updateValue('PS_TC_THEME', Tools::getValue('theme'));
-					Configuration::updateValue('PS_TC_TEXT_PAGE_FONT', Tools::getValue('text-page-font'));
-					Configuration::updateValue('PS_TC_TEXT_MENU_FONT', Tools::getValue('text-menu-font'));
-					Configuration::updateValue('PS_TC_PRODUCT_NAME_FONT', Tools::getValue('product-name-font'));
+					Configuration::updateValue('PS_TC_FONT', Tools::getValue('font'));
 				}
 
 				$this->context->controller->addCSS($this->_path.'css/live_configurator.css');
@@ -157,7 +155,7 @@ class ThemeConfigurator extends Module
 
 				$this->smarty->assign(array(
 					'themes' => unserialize(Configuration::get('PS_TC_THEMES')),
-					'themes_fonts' => unserialize(Configuration::get('PS_TC_THEMES_FONTS')),
+					'fonts' => unserialize(Configuration::get('PS_TC_FONTS')),
 					'advertisement_image' => $this->_path.'/img/'.$this->context->language->iso_code.'/advertisement.png',
 					'advertisement_text'  => $this->l('Over 500+ PrestaShop Premium Templates! Browse Now!')
 				));
diff --git a/modules/themeconfigurator/views/templates/hook/live_configurator.tpl b/modules/themeconfigurator/views/templates/hook/live_configurator.tpl
index 6fec5fb49..19e2e6e29 100644
--- a/modules/themeconfigurator/views/templates/hook/live_configurator.tpl
+++ b/modules/themeconfigurator/views/templates/hook/live_configurator.tpl
@@ -61,8 +61,8 @@
 		</div>
 		<div id="font-box">
 			<p>{l s='Global' mod='themeconfigurator'}</p>
-			<select name="text-page-font" class="font-list">
-				{foreach $themes_fonts as $key => $font}
+			<select name="font" class="font-list">
+				{foreach $fonts as $key => $font}
 				<option value="{$key}">{$font}</option>
 				{/foreach}
 			</select>