diff --git a/app_data/sheets/template/app_menu.json b/app_data/sheets/template/app_menu.json
index edd3136..c6443f1 100644
--- a/app_data/sheets/template/app_menu.json
+++ b/app_data/sheets/template/app_menu.json
@@ -178,6 +178,26 @@
       ],
       "_nested_name": "button_campaigns"
     },
+    {
+      "type": "button",
+      "name": "button_themes",
+      "value": "Themes",
+      "_translations": {
+        "value": {}
+      },
+      "action_list": [
+        {
+          "trigger": "click",
+          "action_id": "go_to",
+          "args": [
+            "/themes"
+          ],
+          "_raw": "click | go_to:/themes",
+          "_cleaned": "click | go_to:/themes"
+        }
+      ],
+      "_nested_name": "button_themes"
+    },
     {
       "type": "button",
       "name": "button_reset",
diff --git a/app_data/sheets/template/component_demo/comp_data_items.json b/app_data/sheets/template/component_demo/comp_data_items.json
index 35987b4..db8e9c6 100644
--- a/app_data/sheets/template/component_demo/comp_data_items.json
+++ b/app_data/sheets/template/component_demo/comp_data_items.json
@@ -33,7 +33,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_4.id_@item.id",
+          "_nested_name": "data_items.id_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -53,7 +53,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_4.id_@item.id",
+                "fullExpression": "data_items.id_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -75,7 +75,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_4.text_completed_@item.id",
+          "_nested_name": "data_items.text_completed_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -95,7 +95,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_4.text_completed_@item.id",
+                "fullExpression": "data_items.text_completed_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -131,7 +131,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_4.toggle_button_@item.id",
+          "_nested_name": "data_items.toggle_button_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -173,7 +173,7 @@
             },
             "_nested_name": [
               {
-                "fullExpression": "data_items_4.toggle_button_@item.id",
+                "fullExpression": "data_items.toggle_button_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -193,8 +193,8 @@
           }
         }
       ],
-      "name": "data_items_4",
-      "_nested_name": "data_items_4",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -234,7 +234,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_7.id_@item.id",
+          "_nested_name": "data_items.id_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -254,7 +254,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_7.id_@item.id",
+                "fullExpression": "data_items.id_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -276,7 +276,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_7.text_completed_@item.id",
+          "_nested_name": "data_items.text_completed_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -296,7 +296,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_7.text_completed_@item.id",
+                "fullExpression": "data_items.text_completed_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -314,8 +314,8 @@
           }
         }
       ],
-      "name": "data_items_7",
-      "_nested_name": "data_items_7",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "parameter_list": {
           "filter": [
@@ -351,10 +351,9 @@
     {
       "type": "button",
       "name": "data_list_set",
-      "value": "Set data list",
-      "_translations": {
-        "value": {}
-      },
+      "value": [
+        "Set data list"
+      ],
       "action_list": [
         {
           "trigger": "click",
@@ -388,10 +387,9 @@
     {
       "type": "button",
       "name": "data_list_unset",
-      "value": "Unset data list",
-      "_translations": {
-        "value": {}
-      },
+      "value": [
+        "Unset data list"
+      ],
       "action_list": [
         {
           "trigger": "click",
@@ -436,7 +434,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_13.id_@item.id",
+          "_nested_name": "data_items.id_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -456,7 +454,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_13.id_@item.id",
+                "fullExpression": "data_items.id_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -478,7 +476,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_13.text_completed_@item.id",
+          "_nested_name": "data_items.text_completed_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -498,7 +496,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_13.text_completed_@item.id",
+                "fullExpression": "data_items.text_completed_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -516,8 +514,8 @@
           }
         }
       ],
-      "name": "data_items_13",
-      "_nested_name": "data_items_13",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -582,7 +580,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_16.mark_uncompleted_button"
+          "_nested_name": "data_items.mark_uncompleted_button"
         },
         {
           "type": "button",
@@ -603,7 +601,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_16.toggle_all_button",
+          "_nested_name": "data_items.toggle_all_button",
           "_dynamicFields": {
             "action_list": {
               "0": {
@@ -645,8 +643,8 @@
           }
         }
       ],
-      "name": "data_items_16",
-      "_nested_name": "data_items_16",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -683,7 +681,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_19.id_@item.id",
+          "_nested_name": "data_items.id_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -703,7 +701,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.id_@item.id",
+                "fullExpression": "data_items.id_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -725,7 +723,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_19.index_@item._index",
+          "_nested_name": "data_items.index_@item._index",
           "_dynamicFields": {
             "name": [
               {
@@ -745,7 +743,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.index_@item._index",
+                "fullExpression": "data_items.index_@item._index",
                 "matchedExpression": "@item._index",
                 "type": "item",
                 "fieldName": "_index"
@@ -767,7 +765,7 @@
           "_translations": {
             "value": {}
           },
-          "_nested_name": "data_items_19.text_completed_@item.id",
+          "_nested_name": "data_items.text_completed_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -787,7 +785,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.text_completed_@item.id",
+                "fullExpression": "data_items.text_completed_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -824,7 +822,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_19.index_1_button_@item.id",
+          "_nested_name": "data_items.index_1_button_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -836,7 +834,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.index_1_button_@item.id",
+                "fullExpression": "data_items.index_1_button_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -870,7 +868,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_19.index_plus_1_button_@item.id",
+          "_nested_name": "data_items.index_plus_1_button_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -912,7 +910,7 @@
             },
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.index_plus_1_button_@item.id",
+                "fullExpression": "data_items.index_plus_1_button_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -951,7 +949,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_19.id_button_@item.id",
+          "_nested_name": "data_items.id_button_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -963,7 +961,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.id_button_@item.id",
+                "fullExpression": "data_items.id_button_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -997,7 +995,7 @@
               }
             }
           ],
-          "_nested_name": "data_items_19.id_button_@item.id",
+          "_nested_name": "data_items.id_button_@item.id",
           "_dynamicFields": {
             "name": [
               {
@@ -1009,7 +1007,7 @@
             ],
             "_nested_name": [
               {
-                "fullExpression": "data_items_19.id_button_@item.id",
+                "fullExpression": "data_items.id_button_@item.id",
                 "matchedExpression": "@item.id",
                 "type": "item",
                 "fieldName": "id"
@@ -1024,8 +1022,8 @@
           }
         }
       ],
-      "name": "data_items_19",
-      "_nested_name": "data_items_19",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -1057,8 +1055,8 @@
       "_translations": {
         "value": {}
       },
-      "name": "title_22",
-      "_nested_name": "title_22"
+      "name": "title",
+      "_nested_name": "title"
     },
     {
       "type": "data_items",
@@ -1076,8 +1074,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_1",
-              "_nested_name": "data_items_23.display_group_1.text_1",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1100,8 +1098,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_2",
-              "_nested_name": "data_items_23.display_group_1.text_2",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1124,8 +1122,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_3",
-              "_nested_name": "data_items_23.display_group_1.text_3",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1148,8 +1146,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_4",
-              "_nested_name": "data_items_23.display_group_1.text_4",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1172,8 +1170,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_5",
-              "_nested_name": "data_items_23.display_group_1.text_5",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1191,8 +1189,8 @@
               }
             }
           ],
-          "name": "display_group_1",
-          "_nested_name": "data_items_23.display_group_1"
+          "name": "display_group",
+          "_nested_name": "data_items.display_group"
         },
         {
           "type": "button",
@@ -1212,8 +1210,8 @@
               }
             }
           ],
-          "name": "button_2",
-          "_nested_name": "data_items_23.button_2",
+          "name": "button",
+          "_nested_name": "data_items.button",
           "_dynamicFields": {
             "action_list": {
               "0": {
@@ -1255,8 +1253,8 @@
           }
         }
       ],
-      "name": "data_items_23",
-      "_nested_name": "data_items_23",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -1292,13 +1290,15 @@
       "_translations": {
         "value": {}
       },
-      "name": "title_25",
-      "_nested_name": "title_25"
+      "name": "title",
+      "_nested_name": "title"
     },
     {
       "type": "data_items",
       "value": "@data.comp_data_items_list",
-      "parameter_list": {},
+      "parameter_list": {
+        "filter": "!@item.completed"
+      },
       "rows": [
         {
           "type": "display_group",
@@ -1309,8 +1309,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_1",
-              "_nested_name": "data_items_26.display_group_1.text_1",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1333,8 +1333,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_2",
-              "_nested_name": "data_items_26.display_group_1.text_2",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1357,8 +1357,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_3",
-              "_nested_name": "data_items_26.display_group_1.text_3",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1381,8 +1381,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_4",
-              "_nested_name": "data_items_26.display_group_1.text_4",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1405,8 +1405,8 @@
               "_translations": {
                 "value": {}
               },
-              "name": "text_5",
-              "_nested_name": "data_items_26.display_group_1.text_5",
+              "name": "text",
+              "_nested_name": "data_items.display_group.text",
               "_dynamicFields": {
                 "value": [
                   {
@@ -1424,8 +1424,8 @@
               }
             }
           ],
-          "name": "display_group_1",
-          "_nested_name": "data_items_26.display_group_1"
+          "name": "display_group",
+          "_nested_name": "data_items.display_group"
         },
         {
           "type": "button",
@@ -1445,8 +1445,8 @@
               }
             }
           ],
-          "name": "button_2",
-          "_nested_name": "data_items_26.button_2",
+          "name": "button",
+          "_nested_name": "data_items.button",
           "_dynamicFields": {
             "action_list": {
               "0": {
@@ -1488,8 +1488,8 @@
           }
         }
       ],
-      "name": "data_items_26",
-      "_nested_name": "data_items_26",
+      "name": "data_items",
+      "_nested_name": "data_items",
       "_dynamicFields": {
         "value": [
           {
@@ -1498,11 +1498,24 @@
             "type": "data",
             "fieldName": "comp_data_items_list"
           }
-        ]
+        ],
+        "parameter_list": {
+          "filter": [
+            {
+              "fullExpression": "!@item.completed",
+              "matchedExpression": "!@item.completed",
+              "type": "item",
+              "fieldName": "completed"
+            }
+          ]
+        }
       },
       "_dynamicDependencies": {
         "@data.comp_data_items_list": [
           "value"
+        ],
+        "!@item.completed": [
+          "parameter_list.filter"
         ]
       }
     }
diff --git a/app_data/sheets/template/debug_list_parsing.json b/app_data/sheets/template/debug_list_parsing.json
index b7af4a8..3009dd5 100644
--- a/app_data/sheets/template/debug_list_parsing.json
+++ b/app_data/sheets/template/debug_list_parsing.json
@@ -4,28 +4,77 @@
   "status": "released",
   "rows": [
     {
-      "text": "answer_list_1",
-      "image_asset": "name:option_1 | text: option_1_text; \nname:option_2 | text: option_2_text;\nname:option_3 | text: option_3_text;\nname:option_4 | text: option_4_text;\nname:option_5 | text: option_5_text;\nname:option_6 | text: option_6_text",
+      "name": "answer_list_1",
+      "value": [
+        {
+          "name": "option_1",
+          "text": "option_1_text"
+        },
+        {
+          "name": "option_2",
+          "text": "option_2_text"
+        },
+        {
+          "name": "option_3",
+          "text": "option_3_text"
+        },
+        {
+          "name": "option_4",
+          "text": "option_4_text"
+        },
+        {
+          "name": "option_5",
+          "text": "option_5_text"
+        },
+        {
+          "name": "option_6",
+          "text": "option_6_text"
+        }
+      ],
       "type": "set_variable",
-      "name": "set_variable",
-      "_nested_name": "set_variable"
+      "_nested_name": "answer_list_1"
     },
     {
-      "text": "answer_1_list",
-      "image_asset": "name:option_1 | text: option_1_text; \nname:option_2 | text: option_2_text;\nname:option_3 | text: option_3_text;\nname:option_4 | text: option_4_text;\nname:option_5 | text: option_5_text;\nname:option_6 | text: option_6_text",
+      "name": "answer_1_list",
+      "value": [
+        {
+          "name": "option_1",
+          "text": "option_1_text"
+        },
+        {
+          "name": "option_2",
+          "text": "option_2_text"
+        },
+        {
+          "name": "option_3",
+          "text": "option_3_text"
+        },
+        {
+          "name": "option_4",
+          "text": "option_4_text"
+        },
+        {
+          "name": "option_5",
+          "text": "option_5_text"
+        },
+        {
+          "name": "option_6",
+          "text": "option_6_text"
+        }
+      ],
       "type": "set_variable",
-      "name": "set_variable",
-      "_nested_name": "set_variable"
+      "_nested_name": "answer_1_list"
     },
     {
-      "id": "text",
-      "text": "show_answer_list_1",
-      "image_asset": "answer_list_1: @local.answer_list_1",
-      "type": "set_variable",
-      "name": "set_variable",
-      "_nested_name": "set_variable",
+      "type": "text",
+      "name": "show_answer_list_1",
+      "value": "answer_list_1: @local.answer_list_1",
+      "_translations": {
+        "value": {}
+      },
+      "_nested_name": "show_answer_list_1",
       "_dynamicFields": {
-        "image_asset": [
+        "value": [
           {
             "fullExpression": "answer_list_1: @local.answer_list_1",
             "matchedExpression": "@local.answer_list_1",
@@ -36,19 +85,20 @@
       },
       "_dynamicDependencies": {
         "@local.answer_list_1": [
-          "image_asset"
+          "value"
         ]
       }
     },
     {
-      "id": "text",
-      "text": "show_answer_1_list",
-      "image_asset": "answer_1_list: @local.answer_1_list",
-      "type": "set_variable",
-      "name": "set_variable",
-      "_nested_name": "set_variable",
+      "type": "text",
+      "name": "show_answer_1_list",
+      "value": "answer_1_list: @local.answer_1_list",
+      "_translations": {
+        "value": {}
+      },
+      "_nested_name": "show_answer_1_list",
       "_dynamicFields": {
-        "image_asset": [
+        "value": [
           {
             "fullExpression": "answer_1_list: @local.answer_1_list",
             "matchedExpression": "@local.answer_1_list",
@@ -59,7 +109,7 @@
       },
       "_dynamicDependencies": {
         "@local.answer_1_list": [
-          "image_asset"
+          "value"
         ]
       }
     }
diff --git a/config.ts b/config.ts
index 8e450b7..dbda869 100644
--- a/config.ts
+++ b/config.ts
@@ -15,7 +15,7 @@ config.web.favicon_asset = "images/icons/favicon.svg";
 
 config.git = {
   content_repo: "https://github.com/IDEMSInternational/app-debug-content.git",
-  content_tag_latest: "1.2.12",
+  content_tag_latest: "1.2.13",
 };
 
 config.app_data.output_path = "./app_data";
@@ -54,7 +54,7 @@ config.app_config.APP_SIDEMENU_DEFAULTS.title = "Debug App";
 config.app_config.APP_SKINS.defaultSkinName = SKINS.defaultSkin.name
 config.app_config.APP_SKINS.available = [SKINS.defaultSkin, SKINS.debug]
 
-config.app_config.APP_THEMES.available = ["default", "professional"]
+config.app_config.APP_THEMES.available = ["default", "professional","pfr"]
 config.app_config.APP_THEMES.defaultThemeName = "default"
 
 config.app_config.TASKS.enabled = true