diff --git a/src/nginxconfig/generators/conf/general.conf.js b/src/nginxconfig/generators/conf/general.conf.js
index b3ce8cc..a1f32f2 100644
--- a/src/nginxconfig/generators/conf/general.conf.js
+++ b/src/nginxconfig/generators/conf/general.conf.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
diff --git a/src/nginxconfig/i18n/de/templates/global_sections/performance.js b/src/nginxconfig/i18n/de/templates/global_sections/performance.js
index 4d044d3..8561498 100644
--- a/src/nginxconfig/i18n/de/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/de/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Gzip Komprimierung',
     enableGzipCompression: `${common.enable} Gzip Komprimierung`,
     brotliCompression: 'Brotli Komprimierung',
diff --git a/src/nginxconfig/i18n/en/templates/global_sections/performance.js b/src/nginxconfig/i18n/en/templates/global_sections/performance.js
index 992ecb7..0bd4eb9 100644
--- a/src/nginxconfig/i18n/en/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/en/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -28,7 +28,7 @@ import common from '../../common';
 
 export default {
     disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    enableDisableHtmlCaching: 'disable HTML caching',
     gzipCompression: 'Gzip compression',
     enableGzipCompression: `${common.enable} gzip compression`,
     brotliCompression: 'Brotli compression',
diff --git a/src/nginxconfig/i18n/es/templates/global_sections/performance.js b/src/nginxconfig/i18n/es/templates/global_sections/performance.js
index 99d5aef..3b42872 100644
--- a/src/nginxconfig/i18n/es/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/es/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {    
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Compresión Gzip',
     enableGzipCompression: `${common.enable} compresión gzip`,
     brotliCompression: 'Compresión Brotli',
@@ -40,6 +40,5 @@ export default {
     expirationForMedia: 'Expiración para media',
     expirationForSvgs: 'Expiración para SVGs',
     expirationForFonts: 'Expiración para fuentes',
-
     performance: 'Rendimiento',
 };
diff --git a/src/nginxconfig/i18n/fr/templates/global_sections/performance.js b/src/nginxconfig/i18n/fr/templates/global_sections/performance.js
index c8627eb..40a75f9 100644
--- a/src/nginxconfig/i18n/fr/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/fr/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Compression Gzip',
     enableGzipCompression: `${common.enable} la compression gzip`,
     brotliCompression: 'Compression Brotli',
diff --git a/src/nginxconfig/i18n/pl/templates/global_sections/performance.js b/src/nginxconfig/i18n/pl/templates/global_sections/performance.js
index 729d22e..45429f8 100644
--- a/src/nginxconfig/i18n/pl/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/pl/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Kompresja gzip',
     enableGzipCompression: `${common.enable} kompresję gzip`,
     brotliCompression: 'Kompresja brotli',
diff --git a/src/nginxconfig/i18n/pt-br/templates/global_sections/performance.js b/src/nginxconfig/i18n/pt-br/templates/global_sections/performance.js
index 476dd3e..abbb9ad 100644
--- a/src/nginxconfig/i18n/pt-br/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/pt-br/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching',  // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching',  // TODO: translate
     gzipCompression: 'Compressão Gzip',
     enableGzipCompression: `${common.enable} compressão gzip`,
     brotliCompression: 'Compressão Brotli',
diff --git a/src/nginxconfig/i18n/ru/templates/global_sections/performance.js b/src/nginxconfig/i18n/ru/templates/global_sections/performance.js
index 3a5f9b1..95f8c7e 100644
--- a/src/nginxconfig/i18n/ru/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/ru/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Gzip сжатие',
     enableGzipCompression: `${common.enable} gzip сжатие`,
     brotliCompression: 'Brotli сжатие',
diff --git a/src/nginxconfig/i18n/zh-cn/templates/global_sections/performance.js b/src/nginxconfig/i18n/zh-cn/templates/global_sections/performance.js
index cea2001..5b493ae 100644
--- a/src/nginxconfig/i18n/zh-cn/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -28,7 +28,7 @@ import common from '../../common';
 
 export default {
     disableHtmlCaching: '禁用 HTML 缓存',
-    enableChangesTakeEffect: '禁用 HTML 缓存',
+    enableDisableHtmlCaching: '禁用 HTML 缓存',
     gzipCompression: 'Gzip 压缩',
     enableGzipCompression: `${common.enable} Gzip 压缩`,
     brotliCompression: 'Brotli 压缩',
diff --git a/src/nginxconfig/i18n/zh-tw/templates/global_sections/performance.js b/src/nginxconfig/i18n/zh-tw/templates/global_sections/performance.js
index 1b453da..5522481 100644
--- a/src/nginxconfig/i18n/zh-tw/templates/global_sections/performance.js
+++ b/src/nginxconfig/i18n/zh-tw/templates/global_sections/performance.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,8 +27,8 @@ THE SOFTWARE.
 import common from '../../common';
 
 export default {
-    disableHtmlCaching: 'Disable HTML caching',
-    enableChangesTakeEffect: 'disable HTML caching',
+    disableHtmlCaching: 'Disable HTML caching', // TODO: translate
+    enableDisableHtmlCaching: 'disable HTML caching', // TODO: translate
     gzipCompression: 'Gzip 壓縮',
     enableGzipCompression: `${common.enable}Gzip壓縮`,
     brotliCompression: 'Brotli 壓縮',
diff --git a/src/nginxconfig/templates/global_sections/performance.vue b/src/nginxconfig/templates/global_sections/performance.vue
index 69592db..04ed37b 100644
--- a/src/nginxconfig/templates/global_sections/performance.vue
+++ b/src/nginxconfig/templates/global_sections/performance.vue
@@ -26,8 +26,6 @@ THE SOFTWARE.
 
 <template>
     <div>
-
-
         <div class="field is-horizontal">
             <div class="field-label">
                 <label class="label">{{ $t('templates.globalSections.performance.disableHtmlCaching') }}</label>
@@ -37,7 +35,7 @@ THE SOFTWARE.
                     <div :class="`control${disableHtmlCachingChanged ? ' is-changed' : ''}`">
                         <div class="checkbox">
                             <PrettyCheck v-model="disableHtmlCaching" class="p-default p-curve p-fill p-icon">
-                                {{ $t('templates.globalSections.performance.enableChangesTakeEffect') }}
+                                {{ $t('templates.globalSections.performance.enableDisableHtmlCaching') }}
                             </PrettyCheck>
                         </div>
                     </div>
@@ -146,8 +144,23 @@ THE SOFTWARE.
             </div>
         </div>
 
-
-
+        <div class="field is-horizontal">
+            <div class="field-label">
+                <label class="label">{{ $t('templates.globalSections.performance.expirationForFonts') }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div :class="`control${fontsExpirationChanged ? ' is-changed' : ''}`">
+                        <input
+                            v-model="fontsExpiration"
+                            class="input"
+                            type="text"
+                            :placeholder="$props.data.fontsExpiration.default"
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -159,7 +172,7 @@ THE SOFTWARE.
 
     const defaults = {
         disableHtmlCaching: {
-            default: true,
+            default: false,
             enabled: true,
         },
         gzipCompression: {
diff --git a/src/nginxconfig/util/angular_backwards_compatibility.js b/src/nginxconfig/util/angular_backwards_compatibility.js
index 1ab946b..117d6fd 100644
--- a/src/nginxconfig/util/angular_backwards_compatibility.js
+++ b/src/nginxconfig/util/angular_backwards_compatibility.js
@@ -45,7 +45,6 @@ const globalMap = {
 
     python_server:              ['python', 'pythonServer'],
 
-    disableHtmlCaching:         ['performance', 'disableHtmlCaching', oldBool],
     gzip:                       ['performance', 'gzipCompression', oldBool],
     brotli:                     ['performance', 'brotliCompression', oldBool],
     expires_assets:             ['performance', 'assetsExpiration'],
diff --git a/src/nginxconfig/util/types_extensions.js b/src/nginxconfig/util/types_extensions.js
index 1f3b569..9682e66 100644
--- a/src/nginxconfig/util/types_extensions.js
+++ b/src/nginxconfig/util/types_extensions.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -37,5 +37,5 @@ export const extensions = {
         'docx?|dotx?|docm|dotm|' +
         'xlsx?|xltx?|xlsm|xltm|' +
         'pptx?|potx?|pptm|potm|ppsx?',
-    html: 'html',
+    html: 'html?',
 };