diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 28a41dfd..ff3e845a 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -74,8 +74,8 @@
 
     // Content elements
 
-    // ======================= Hero Image [begin] ==========================================
-    //  Hero Image CType
+    // ======================= heroImage [begin] ==========================================
+    //  heroImage CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
@@ -89,7 +89,7 @@
     );
     $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['heroImage'] = 'content-elements-heroImage';
 
-    // Hero Image backend fields
+    // heroImage backend fields
     $GLOBALS['TCA']['tt_content']['types']['heroImage'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
@@ -119,9 +119,60 @@
     ];
     $GLOBALS['TCA']['tt_content']['types']['heroImage']['columnsOverrides']['bodytext']['config']['type'] = 'input';
 
-    // Hero Image flexform
+    // heroImage flexform
     $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,heroImage'] = $flexformPath . 'flexform_heroImage.xml';
-    // ======================= Hero Image [end] ==========================================
+    // ======================= heroImage [end] ==========================================
+
+
+
+    // ======================= imageTextLink [begin] ==========================================
+    // imageTextLink CType
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+        'tt_content',
+        'CType',
+        [
+            $contentElementLanguageFilePrefix . 'imageTextLink.title',
+            'imageTextLink',
+            'content-elements-imageTextLink'
+        ],
+        'heroImage',
+        'after'
+    );
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['imageTextLink'] = 'content-elements-imageTextLink';
+
+    // imageTextLink backend fields
+    $GLOBALS['TCA']['tt_content']['types']['imageTextLink'] = [
+        'showitem' => '
+            --div--;' .  $coreLanguageFilePrefix .'general,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
+                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
+                --linebreak--,bodytext;' . $contentElementLanguageFilePrefix . 'imageTextLink.bodytext,
+                --linebreak--,subheader;' . $contentElementLanguageFilePrefix . 'imageTextLink.linkText,
+                --linebreak--,header_link;' . $frontendLanguageFilePrefix . 'header_link_formlabel,
+                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
+
+            --div--;' . $frontendLanguageFilePrefix . 'tabs.media,assets,
+                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
+            --div--;' . $frontendLanguageFilePrefix . 'tabs.images,image,
+                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
+
+            --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
+            --div--;' .  $coreLanguageFilePrefix .'language,
+                --palette--;;language,
+            --div--;' .  $coreLanguageFilePrefix .'access,
+                --palette--;;hidden,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
+            --div--;' .  $coreLanguageFilePrefix .'categories,categories,
+            --div--;' .  $coreLanguageFilePrefix .'notes,rowDescription,
+            --div--;' .  $coreLanguageFilePrefix .'extended,
+        '
+    ];
+
+    // imageTextLink flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,imageTextLink'] = $flexformPath . 'flexform_imageTextLink.xml';
+    // ======================= imageTextLink [end] ==========================================
 
 
 
@@ -135,7 +186,7 @@
             'bigIconTextButton',
             'content-elements-bigIconTextButton'
         ],
-        'heroImage',
+        'imageTextLink',
         'after'
     );
     $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['bigIconTextButton'] = 'content-elements-bigIconTextButton';
@@ -216,35 +267,74 @@
 
 
 
-    // ======================= imageTextLink [begin] ==========================================
-    // imageTextLink CType
+    // ======================= button [begin] ==========================================
+    // button CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'imageTextLink.title',
-            'imageTextLink',
-            'content-elements-imageTextLink'
+            $contentElementLanguageFilePrefix . 'button.title',
+            'button',
+            'content-elements-button'
         ],
         'iconTextButton',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['imageTextLink'] = 'content-elements-imageTextLink';
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['button'] = 'content-elements-button';
 
-    // imageTextLink backend fields
-    $GLOBALS['TCA']['tt_content']['types']['imageTextLink'] = [
+    // button backend fields
+    $GLOBALS['TCA']['tt_content']['types']['button'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
-                --linebreak--,bodytext;' . $contentElementLanguageFilePrefix . 'imageTextLink.bodytext,
-                --linebreak--,subheader;' . $contentElementLanguageFilePrefix . 'imageTextLink.linkText,
+                header;' . $contentElementLanguageFilePrefix . 'button.header_label,
                 --linebreak--,header_link;' . $frontendLanguageFilePrefix . 'header_link_formlabel,
                 --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
 
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.media,assets,
-                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.images,image,
+            --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
+            --div--;' .  $coreLanguageFilePrefix .'language,
+                --palette--;;language,
+            --div--;' .  $coreLanguageFilePrefix .'access,
+                --palette--;;hidden,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
+            --div--;' .  $coreLanguageFilePrefix .'categories,categories,
+            --div--;' .  $coreLanguageFilePrefix .'notes,rowDescription,
+            --div--;' .  $coreLanguageFilePrefix .'extended,
+        '
+    ];
+
+    // button flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,button'] = $flexformPath . 'flexform_button.xml';
+    // ======================= button [end] ==========================================
+
+
+
+    // ======================= BootstrapSlider [begin] ==========================================
+    // BootstrapSlider CType
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+        'tt_content',
+        'CType',
+        [
+            $contentElementLanguageFilePrefix . 'bootstrap.slider.title',
+            'contentElementBootstrapSlider',
+            'content-elements-contentElementSlider'
+        ],
+        'button',
+        'after'
+    );
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['contentElementBootstrapSlider'] = 'content-elements-contentElementSlider';
+
+    // BootstrapSlider backend fields
+    $GLOBALS['TCA']['tt_content']['types']['contentElementBootstrapSlider'] = [
+        'showitem' => '
+            --div--;' .  $coreLanguageFilePrefix .'general,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
+                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
+
+            --div--;' . $contentElementLanguageFilePrefix . 'bootstrap.slider.tabs.slides,image,
                 --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
@@ -261,36 +351,38 @@
         '
     ];
 
-    // imageTextLink flexform
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,imageTextLink'] = $flexformPath . 'flexform_imageTextLink.xml';
-    // ======================= imageTextLink [end] ==========================================
+    // BootstrapSlider flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,contentElementBootstrapSlider'] = $flexformPath . 'flexform_bootstrapSlider.xml';
+    // ======================= BootstrapSlider [end] ==========================================
 
 
-    // TODO change button.header_label
-    // ======================= button [begin] ==========================================
-    // button CType
+
+    // ======================= contentElementSlider [begin] ==========================================
+    // contentElementSlider CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'button.title',
-            'button',
-            'content-elements-button'
+            $contentElementLanguageFilePrefix . 'slider.title',
+            'contentElementSlider',
+            'content-elements-contentElementSlider'
         ],
-        'imageTextLink',
+        'contentElementBootstrapSlider',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['button'] = 'content-elements-button';
+	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['contentElementSlider'] = 'content-elements-contentElementSlider';
 
-    // button backend fields
-    $GLOBALS['TCA']['tt_content']['types']['button'] = [
+    // contentElementSlider backend fields
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $contentElementLanguageFilePrefix . 'button.header_label,
-                --linebreak--,header_link;' . $frontendLanguageFilePrefix . 'header_link_formlabel,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
                 --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
 
+            --div--;' . $contentElementLanguageFilePrefix . 'slider.tabs.slides,image,
+                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
+
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
@@ -305,9 +397,20 @@
         '
     ];
 
-    // button flexform
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,button'] = $flexformPath . 'flexform_button.xml';
-    // ======================= button [end] ==========================================
+    // contentElementSlider flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,contentElementSlider'] = $flexformPath . 'flexform_slider.xml';
+    // ======================= contentElementSlider [end] ==========================================
+
+
+    // Override foreign_types for contentElementSlider so we can add a custom palette
+    // columnsOverrides doens't seem to be correct if irre children are collapsed when tt_content record is opened
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['appearance']['collapseAll'] = 0;
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'] = '--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;sliderPalette, --palette--;;imageoverlayPalette, --palette--;;filePalette';
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['1']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['2']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['3']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['4']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
+    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['5']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
 
 
 
@@ -321,7 +424,7 @@
             'quote',
             'content-elements-quote'
         ],
-        'button',
+        'contentElementSlider',
         'after'
     );
     $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['quote'] = 'content-elements-quote';
@@ -355,33 +458,30 @@
 
 
 
-    // ======================= BootstrapSlider [begin] ==========================================
-    // TODO change name (contentElementBootstrapSlider & content-elements-contentElementSlider)
-    // BootstrapSlider CType
+    // ======================= logoCarousel [begin] ==========================================
+    // logoCarousel CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'bootstrap.slider.title',
-            'contentElementBootstrapSlider',
-            'content-elements-contentElementSlider'
+            $contentElementLanguageFilePrefix . 'logoCarousel.title',
+            'logoCarousel',
+            'content-elements-logoCarousel'
         ],
         'quote',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['contentElementBootstrapSlider'] = 'content-elements-contentElementSlider';
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['logoCarousel'] = 'content-elements-logoCarousel';
 
-    // BootstrapSlider backend fields
-    // TODO (bootstrap.slider.tabs.slides,image)
-    $GLOBALS['TCA']['tt_content']['types']['contentElementBootstrapSlider'] = [
+    // logoCarousel backend fields
+    $GLOBALS['TCA']['tt_content']['types']['logoCarousel'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
                 header;' . $frontendLanguageFilePrefix . 'header_formlabel,
-                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
 
-            --div--;' . $contentElementLanguageFilePrefix . 'bootstrap.slider.tabs.slides,image,
-                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
+            --div--;' . $contentElementLanguageFilePrefix . 'logoCarousel.tabs.logos,image,
+                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageMaxSize,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
@@ -397,36 +497,35 @@
         '
     ];
 
-    // BootstrapSlider flexform
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,contentElementBootstrapSlider'] = $flexformPath . 'flexform_bootstrapSlider.xml';
-    // ======================= BootstrapSlider [end] ==========================================
+    // logoCarousel flexform
+    // ======================= logoCarousel [end] ==========================================
 
 
 
-    // ======================= logoCarousel [begin] ==========================================
-    // logoCarousel CType
+    // ======================= responsiveVideo [begin] ==========================================
+    // responsiveVideo CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'logoCarousel.title',
-            'logoCarousel',
-            'content-elements-logoCarousel'
+            $contentElementLanguageFilePrefix . 'responsiveVideo.title',
+            'responsiveVideo',
+            'content-elements-responsiveVideo'
         ],
-        'contentElementBootstrapSlider',
+        'logoCarousel',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['logoCarousel'] = 'content-elements-logoCarousel';
+	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['responsiveVideo'] = 'content-elements-responsiveVideo';
 
-    // logoCarousel backend fields
-    $GLOBALS['TCA']['tt_content']['types']['logoCarousel'] = [
+
+    // responsiveVideo backend fields
+    $GLOBALS['TCA']['tt_content']['types']['responsiveVideo'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
 
-            --div--;' . $contentElementLanguageFilePrefix . 'logoCarousel.tabs.logos,image,
-                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageMaxSize,
+            --div--;' . $contentElementLanguageFilePrefix . 'responsiveVideo.tabs.video,assets,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
@@ -442,33 +541,35 @@
         '
     ];
 
-    // logoCarousel flexform
-    // ======================= logoCarousel [end] ==========================================
+    // responsiveVideo flexform
+    // ======================= responsiveVideo [end] ==========================================
 
 
 
-    // ======================= socialIcons [begin] ==========================================
-    // socialIcons CType
+    // ======================= fullWidthImage [begin] ==========================================
+    // fullWidthImage CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'socialIcons.title',
-            'socialIcons',
-            'content-elements-socialIcons'
+            $contentElementLanguageFilePrefix . 'fullWidthImage.title',
+            'fullWidthImage',
+            'content-elements-fullWidthImage'
         ],
-        'logoCarousel',
+        'responsiveVideo',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['socialIcons'] = 'content-elements-socialIcons';
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['fullWidthImage'] = 'content-elements-fullWidthImage';
 
-    // socialIcons backend fields
-    $GLOBALS['TCA']['tt_content']['types']['socialIcons'] = [
+    // fullWidthImage backend fields
+    $GLOBALS['TCA']['tt_content']['types']['fullWidthImage'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
-                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
+
+            --div--;' . $contentElementLanguageFilePrefix . 'fullWidthImage.tabs.image,image,
+                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
@@ -484,33 +585,33 @@
         '
     ];
 
-    // socialIcons flexform
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,socialIcons'] = $flexformPath . 'flexform_socialIcons.xml';
-    // ======================= socialIcons [end] ==========================================
+    // fullWidthImage flexform
+    // ======================= fullWidthImage [end] ==========================================
 
 
 
-    // ======================= copyrightText [begin] ==========================================
-    // copyrightText CType
+    // ======================= socialIcons [begin] ==========================================
+    // socialIcons CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'copyrightText.title',
-            'copyrightText',
-            'content-elements-copyrightText'
+            $contentElementLanguageFilePrefix . 'socialIcons.title',
+            'socialIcons',
+            'content-elements-socialIcons'
         ],
-        'socialIcons',
+        'fullWidthImage',
         'after'
     );
-    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['copyrightText'] = 'content-elements-copyrightText';
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['socialIcons'] = 'content-elements-socialIcons';
 
-    // copyrightText backend fields
-    $GLOBALS['TCA']['tt_content']['types']['copyrightText'] = [
+    // socialIcons backend fields
+    $GLOBALS['TCA']['tt_content']['types']['socialIcons'] = [
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
+                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
@@ -526,8 +627,9 @@
         '
     ];
 
-    // copyrightText flexform
-    // ======================= copyrightText [end] ==========================================
+    // socialIcons flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,socialIcons'] = $flexformPath . 'flexform_socialIcons.xml';
+    // ======================= socialIcons [end] ==========================================
 
 
 
@@ -541,7 +643,7 @@
             'contacts',
             'content-elements-contacts'
         ],
-        'copyrightText',
+        'socialIcons',
         'after'
     );
     $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['contacts'] = 'content-elements-contacts';
@@ -551,7 +653,7 @@
         'showitem' => '
             --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header_formlabel,
+                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
 
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
@@ -572,176 +674,79 @@
 
 
 
-
-
-
-    // "contentElementSlider"
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'tt_content',
-        'CType',
-        [
-            $contentElementLanguageFilePrefix . 'slider.title',
-            'contentElementSlider',
-            'content-elements-contentElementSlider'
-        ],
-        'accordion',
-        'after'
-    );
-	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['contentElementSlider'] = 'content-elements-contentElementSlider';
-
-
-
-
-
-    // TODO check all image and media fields and enable crop fn
-    // TODO imageSize;imageMaxSize
-
-    // "tabs"
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'tt_content',
-        'CType',
-        [
-            $contentElementLanguageFilePrefix . 'tabs.title',
-            'tabs',
-            'content-elements-tabs'
-        ],
-        'quote',
-        'after'
-    );
-	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['tabs'] = 'content-elements-tabs';
-
-    // TODO rename !!!
-    // "fullWidthImage"
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'tt_content',
-        'CType',
-        [
-            $contentElementLanguageFilePrefix . 'fullWidthImage.title',
-            'fullWidthImage',
-            'content-elements-fullWidthImage'
-        ],
-        'tabs',
-        'after'
-    );
-	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['fullWidthImage'] = 'content-elements-fullWidthImage';
-
-    // TODO check if needed
-    // "responsiveVideo"
+    // ======================= copyrightText [begin] ==========================================
+    // copyrightText CType
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
         'tt_content',
         'CType',
         [
-            $contentElementLanguageFilePrefix . 'responsiveVideo.title',
-            'responsiveVideo',
-            'content-elements-responsiveVideo'
+            $contentElementLanguageFilePrefix . 'copyrightText.title',
+            'copyrightText',
+            'content-elements-copyrightText'
         ],
-        'fullWidthImage',
+        'contacts',
         'after'
     );
-	$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['responsiveVideo'] = 'content-elements-responsiveVideo';
-
-
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['copyrightText'] = 'content-elements-copyrightText';
 
-    //
-    // Types
-    //
-    // "contentElementSlider"
-    $GLOBALS['TCA']['tt_content']['types']['contentElementSlider'] = [
+    // copyrightText backend fields
+    $GLOBALS['TCA']['tt_content']['types']['copyrightText'] = [
         'showitem' => '
+            --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
                 header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
-                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
-            --div--;' . $contentElementLanguageFilePrefix . 'slider.tabs.slides,image,
+
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-                --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
-                hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
+            --div--;' .  $coreLanguageFilePrefix .'language,
+                --palette--;;language,
+            --div--;' .  $coreLanguageFilePrefix .'access,
+                --palette--;;hidden,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
+            --div--;' .  $coreLanguageFilePrefix .'categories,categories,
+            --div--;' .  $coreLanguageFilePrefix .'notes,rowDescription,
+            --div--;' .  $coreLanguageFilePrefix .'extended,
         '
     ];
 
-// Override foreign_types for contentElementSlider so we can add a custom palette
-// columnsOverrides doens't seem to be correct if irre children are collapsed when tt_content record is opened
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['appearance']['collapseAll'] = 0;
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'] = '--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;sliderPalette, --palette--;;imageoverlayPalette, --palette--;;filePalette';
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['1']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['2']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['3']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['4']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
-$GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['5']['showitem'] = $GLOBALS['TCA']['tt_content']['types']['contentElementSlider']['columnsOverrides']['image']['config']['foreign_types']['0']['showitem'];
+    // copyrightText flexform
+    // ======================= copyrightText [end] ==========================================
 
 
 
-    // "divider"
-    $GLOBALS['TCA']['tt_content']['types']['div'] = [
-        'showitem' => '
-                --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
-                header;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header.ALT.div_formlabel,
-                tx_themes_icon,rowDescription,
-                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
-                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
-                layout;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:layout_formlabel,wrapper,wrapper_margin_top,
-                wrapper_margin_bottom,--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.appearanceLinks;appearanceLinks,
-                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
-                hidden;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:field.default.hidden,
-                --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
-                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended,
-                --div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category,categories,
-                tx_themes_variants,tx_themes_behaviour,tx_themes_responsive,
-                --div--;LLL:EXT:gridelements/Resources/Private/Language/locallang_db.xlf:gridElements,
-                tx_gridelements_container,tx_gridelements_columns
-        '
-    ];
 
-    // "fullWidthImage"
-    $GLOBALS['TCA']['tt_content']['types']['fullWidthImage'] = [
-        'showitem' => '
-                --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
-                header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
-            --div--;' . $contentElementLanguageFilePrefix . 'fullWidthImage.tabs.image,image,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-                --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-                --palette--;' . $contentElementLanguageFilePrefix . 'tt_content.palette.imageSize;imageSize,
-                --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
-                hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
-                --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
-        '
-    ];
 
-    // "responsiveVideo"
-    $GLOBALS['TCA']['tt_content']['types']['responsiveVideo'] = [
+
+    // ======================= divider [begin] ==========================================
+    // divider CType
+
+    // divider backend fields
+    $GLOBALS['TCA']['tt_content']['types']['div'] = [
         'showitem' => '
+            --div--;' .  $coreLanguageFilePrefix .'general,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
                 header;' . $frontendLanguageFilePrefix . 'header.ALT.div_formlabel,
-            --div--;' . $contentElementLanguageFilePrefix . 'responsiveVideo.tabs.video,media,
+
+                --linebreak--,pi_flexform;' . $contentElementLanguageFilePrefix . 'tt_content.tabs.settings,
+
             --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-                --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
+                --palette--;' . $frontendLanguageFilePrefix . 'palette.frames;frames,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.appearanceLinks;appearanceLinks,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
-                hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
+            --div--;' .  $coreLanguageFilePrefix .'language,
+                --palette--;;language,
+            --div--;' .  $coreLanguageFilePrefix .'access,
+                --palette--;;hidden,
                 --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
-            --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
+            --div--;' .  $coreLanguageFilePrefix .'categories,categories,
+            --div--;' .  $coreLanguageFilePrefix .'notes,rowDescription,
+            --div--;' .  $coreLanguageFilePrefix .'extended,
         '
     ];
 
-
-
-    //
-    // Flexforms
-    //
-
-    // "divider"
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,div'] = 'FILE:EXT:theme_t3kit/Configuration/FlexForms/flexform_div.xml';
-
-
-    // "contentElementSlider"
-    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,contentElementSlider'] = 'FILE:EXT:theme_t3kit/Configuration/FlexForms/flexform_slider.xml';
-
+    // divider flexform
+    $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['config']['ds']['*,div'] = $flexformPath . 'flexform_div.xml';
+    // ======================= divider [end] ==========================================