diff --git a/Configuration/FlexForms/Accordion.xml b/Configuration/FlexForms/Accordion.xml
index dd063e32e..2c9161cc5 100644
--- a/Configuration/FlexForms/Accordion.xml
+++ b/Configuration/FlexForms/Accordion.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_bootstrappackage_accordion_item.tt_content = ###THIS_UID###</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">None</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>None</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/BackgroundImage.xml b/Configuration/FlexForms/BackgroundImage.xml
index 3f379bffb..50bb2034b 100644
--- a/Configuration/FlexForms/BackgroundImage.xml
+++ b/Configuration/FlexForms/BackgroundImage.xml
@@ -17,12 +17,12 @@
                             <default></default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.behaviour.cover</numIndex>
-                                    <numIndex index="1">cover</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.behaviour.cover</label>
+                                    <value>cover</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.behaviour.pattern</numIndex>
-                                    <numIndex index="1">pattern</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.behaviour.pattern</label>
+                                    <value>pattern</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -34,7 +34,7 @@
                             <default>0</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.parallax.description</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.parallax.description</label>
                                 </numIndex>
                             </items>
                         </config>
@@ -46,7 +46,7 @@
                             <default>0</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.fade.description</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.fade.description</label>
                                 </numIndex>
                             </items>
                         </config>
@@ -59,20 +59,20 @@
                             <default></default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.none</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.none</label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.blur</numIndex>
-                                    <numIndex index="1">blur</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.blur</label>
+                                    <value>blur</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.grayscale</numIndex>
-                                    <numIndex index="1">grayscale</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.grayscale</label>
+                                    <value>grayscale</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.sepia</numIndex>
-                                    <numIndex index="1">sepia</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:option.background_image.filter.sepia</label>
+                                    <value>sepia</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/CardGroup.xml b/Configuration/FlexForms/CardGroup.xml
index 04067b46e..a2ba6eb3c 100644
--- a/Configuration/FlexForms/CardGroup.xml
+++ b/Configuration/FlexForms/CardGroup.xml
@@ -17,16 +17,16 @@
                             <default>left</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.left</numIndex>
-                                    <numIndex index="1">left</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.left</label>
+                                    <value>left</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.center</numIndex>
-                                    <numIndex index="1">center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.center</label>
+                                    <value>center</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.right</numIndex>
-                                    <numIndex index="1">right</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.card_group.align.right</label>
+                                    <value>right</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -39,20 +39,20 @@
                             <default>2</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>1</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>2</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>3</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>4</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Carousel.xml b/Configuration/FlexForms/Carousel.xml
index a7702ebd9..94f7b535a 100644
--- a/Configuration/FlexForms/Carousel.xml
+++ b/Configuration/FlexForms/Carousel.xml
@@ -16,7 +16,7 @@
                             <default>0</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.autoplay.description</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.autoplay.description</label>
                                 </numIndex>
                             </items>
                         </config>
@@ -40,12 +40,12 @@
                             <default>fade</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.transition.fade</numIndex>
-                                    <numIndex index="1">fade</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.transition.fade</label>
+                                    <value>fade</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.transition.slide</numIndex>
-                                    <numIndex index="1">slide</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.transition.slide</label>
+                                    <value>slide</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -57,7 +57,7 @@
                             <default>1</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.wrap.description</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.wrap.description</label>
                                 </numIndex>
                             </items>
                         </config>
@@ -69,7 +69,7 @@
                             <default>0</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.show_nav_title.description</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:carousel.show_nav_title.description</label>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/IconGroup.xml b/Configuration/FlexForms/IconGroup.xml
index be2db58f1..b0270cc90 100644
--- a/Configuration/FlexForms/IconGroup.xml
+++ b/Configuration/FlexForms/IconGroup.xml
@@ -17,16 +17,16 @@
                             <default>center</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.left</numIndex>
-                                    <numIndex index="1">left</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.left</label>
+                                    <value>left</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.center</numIndex>
-                                    <numIndex index="1">center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.center</label>
+                                    <value>center</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.right</numIndex>
-                                    <numIndex index="1">right</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.align.right</label>
+                                    <value>right</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -39,24 +39,24 @@
                             <default>auto</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.columns.auto</numIndex>
-                                    <numIndex index="1">auto</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.columns.auto</label>
+                                    <value>auto</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>1</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>2</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>3</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>4</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -69,28 +69,28 @@
                             <default>left-center</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.left-top</numIndex>
-                                    <numIndex index="1">left-top</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.left-top</label>
+                                    <value>left-top</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.left-center</numIndex>
-                                    <numIndex index="1">left-center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.left-center</label>
+                                    <value>left-center</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.right-top</numIndex>
-                                    <numIndex index="1">right-top</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.right-top</label>
+                                    <value>right-top</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.right-center</numIndex>
-                                    <numIndex index="1">right-center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.right-center</label>
+                                    <value>right-center</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.above</numIndex>
-                                    <numIndex index="1">above</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.above</label>
+                                    <value>above</value>
                                 </numIndex>
                                 <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.below</numIndex>
-                                    <numIndex index="1">below</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:content_element.icon_group.icon_position.below</label>
+                                    <value>below</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/MenuCard.xml b/Configuration/FlexForms/MenuCard.xml
index eb0ebd3af..ef294c876 100644
--- a/Configuration/FlexForms/MenuCard.xml
+++ b/Configuration/FlexForms/MenuCard.xml
@@ -17,16 +17,16 @@
                             <default>left</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.left</numIndex>
-                                    <numIndex index="1">left</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.left</label>
+                                    <value>left</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.center</numIndex>
-                                    <numIndex index="1">center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.center</label>
+                                    <value>center</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.right</numIndex>
-                                    <numIndex index="1">right</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.card.align.right</label>
+                                    <value>right</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -39,20 +39,20 @@
                             <default>2</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>1</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>2</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>3</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>4</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/MenuThumbnail.xml b/Configuration/FlexForms/MenuThumbnail.xml
index e30b5507c..4bd697554 100644
--- a/Configuration/FlexForms/MenuThumbnail.xml
+++ b/Configuration/FlexForms/MenuThumbnail.xml
@@ -17,16 +17,16 @@
                             <default>left</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.left</numIndex>
-                                    <numIndex index="1">left</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.left</label>
+                                    <value>left</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.center</numIndex>
-                                    <numIndex index="1">center</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.center</label>
+                                    <value>center</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.right</numIndex>
-                                    <numIndex index="1">right</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:menu.thumbnail.align.right</label>
+                                    <value>right</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -39,20 +39,20 @@
                             <default>2</default>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>1</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>2</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>3</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>4</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Tab.xml b/Configuration/FlexForms/Tab.xml
index d78f6a132..51b5aabcd 100644
--- a/Configuration/FlexForms/Tab.xml
+++ b/Configuration/FlexForms/Tab.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_bootstrappackage_tab_item.tt_content = ###THIS_UID###</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label></label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Timeline.xml b/Configuration/FlexForms/Timeline.xml
index ebc4fc7c9..16166584e 100644
--- a/Configuration/FlexForms/Timeline.xml
+++ b/Configuration/FlexForms/Timeline.xml
@@ -17,12 +17,12 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:timeline.sorting.desc</numIndex>
-                                    <numIndex index="1">date desc</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:timeline.sorting.desc</label>
+                                    <value>date desc</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:timeline.sorting.asc</numIndex>
-                                    <numIndex index="1">date asc</numIndex>
+                                    <label>LLL:EXT:bootstrap_package/Resources/Private/Language/Backend.xlf:timeline.sorting.asc</label>
+                                    <value>date asc</value>
                                 </numIndex>
                             </items>
                         </config>