diff --git a/content/configuration/images/DETK/detk-before-after-section-text.png b/content/configuration/images/DETK/detk-before-after-section-text.png
new file mode 100644
index 00000000..6f2ee4c7
Binary files /dev/null and b/content/configuration/images/DETK/detk-before-after-section-text.png differ
diff --git a/content/configuration/images/ER_DE2/image4.png b/content/configuration/images/DETK/detk-collapsible-sections.png
similarity index 85%
rename from content/configuration/images/ER_DE2/image4.png
rename to content/configuration/images/DETK/detk-collapsible-sections.png
index 3f6fe5f5..818346fc 100644
Binary files a/content/configuration/images/ER_DE2/image4.png and b/content/configuration/images/DETK/detk-collapsible-sections.png differ
diff --git a/content/configuration/images/DETK/detk-details-panel.png b/content/configuration/images/DETK/detk-details-panel.png
new file mode 100644
index 00000000..6c0cca46
Binary files /dev/null and b/content/configuration/images/DETK/detk-details-panel.png differ
diff --git a/content/configuration/images/ER_DE2/image8.png b/content/configuration/images/DETK/detk-global-filter.png
similarity index 93%
rename from content/configuration/images/ER_DE2/image8.png
rename to content/configuration/images/DETK/detk-global-filter.png
index 76c475b6..68a0d689 100644
Binary files a/content/configuration/images/ER_DE2/image8.png and b/content/configuration/images/DETK/detk-global-filter.png differ
diff --git a/content/configuration/images/ER_DE2/image32.png b/content/configuration/images/DETK/detk-help-panel.png
similarity index 87%
rename from content/configuration/images/ER_DE2/image32.png
rename to content/configuration/images/DETK/detk-help-panel.png
index e24a8b7e..f1798ff4 100644
Binary files a/content/configuration/images/ER_DE2/image32.png and b/content/configuration/images/DETK/detk-help-panel.png differ
diff --git a/content/configuration/images/ER_DE2/image20.png b/content/configuration/images/DETK/detk-legacy-details-popup.png
similarity index 94%
rename from content/configuration/images/ER_DE2/image20.png
rename to content/configuration/images/DETK/detk-legacy-details-popup.png
index d47e7fe5..1f5ed86c 100644
Binary files a/content/configuration/images/ER_DE2/image20.png and b/content/configuration/images/DETK/detk-legacy-details-popup.png differ
diff --git a/content/configuration/images/ER_DE2/image7.png b/content/configuration/images/DETK/detk-legacy-print-buttons.png
similarity index 91%
rename from content/configuration/images/ER_DE2/image7.png
rename to content/configuration/images/DETK/detk-legacy-print-buttons.png
index 35a3ed64..737cf636 100644
Binary files a/content/configuration/images/ER_DE2/image7.png and b/content/configuration/images/DETK/detk-legacy-print-buttons.png differ
diff --git a/content/configuration/images/ER_DE2/image11.png b/content/configuration/images/DETK/detk-legacy-section-filter.png
similarity index 91%
rename from content/configuration/images/ER_DE2/image11.png
rename to content/configuration/images/DETK/detk-legacy-section-filter.png
index e512ef75..50014379 100644
Binary files a/content/configuration/images/ER_DE2/image11.png and b/content/configuration/images/DETK/detk-legacy-section-filter.png differ
diff --git a/content/configuration/images/DETK/detk-legacy-selection-panel.png b/content/configuration/images/DETK/detk-legacy-selection-panel.png
new file mode 100644
index 00000000..8594c204
Binary files /dev/null and b/content/configuration/images/DETK/detk-legacy-selection-panel.png differ
diff --git a/content/configuration/images/ER_DE2/image21.png b/content/configuration/images/DETK/detk-legacy-validation-popup.png
similarity index 89%
rename from content/configuration/images/ER_DE2/image21.png
rename to content/configuration/images/DETK/detk-legacy-validation-popup.png
index 4240be1f..7419c03f 100644
Binary files a/content/configuration/images/ER_DE2/image21.png and b/content/configuration/images/DETK/detk-legacy-validation-popup.png differ
diff --git a/content/configuration/images/ER_DE2/image33.png b/content/configuration/images/DETK/detk-options-menu.png
similarity index 85%
rename from content/configuration/images/ER_DE2/image33.png
rename to content/configuration/images/DETK/detk-options-menu.png
index 777436d4..78c1bd7d 100644
Binary files a/content/configuration/images/ER_DE2/image33.png and b/content/configuration/images/DETK/detk-options-menu.png differ
diff --git a/content/configuration/images/DETK/detk-pivot-categories-as-rows.png b/content/configuration/images/DETK/detk-pivot-categories-as-rows.png
new file mode 100644
index 00000000..f09db95f
Binary files /dev/null and b/content/configuration/images/DETK/detk-pivot-categories-as-rows.png differ
diff --git a/content/configuration/images/DETK/detk-pivot-default.png b/content/configuration/images/DETK/detk-pivot-default.png
new file mode 100644
index 00000000..e310c233
Binary files /dev/null and b/content/configuration/images/DETK/detk-pivot-default.png differ
diff --git a/content/configuration/images/ER_DE2/image27.png b/content/configuration/images/DETK/detk-pivot-move-category.png
similarity index 92%
rename from content/configuration/images/ER_DE2/image27.png
rename to content/configuration/images/DETK/detk-pivot-move-category.png
index 4d9c663c..2939cb9a 100644
Binary files a/content/configuration/images/ER_DE2/image27.png and b/content/configuration/images/DETK/detk-pivot-move-category.png differ
diff --git a/content/configuration/images/DETK/detk-pivot-settings.png b/content/configuration/images/DETK/detk-pivot-settings.png
new file mode 100644
index 00000000..0588b24b
Binary files /dev/null and b/content/configuration/images/DETK/detk-pivot-settings.png differ
diff --git a/content/configuration/images/ER_DE2/image16.png b/content/configuration/images/DETK/detk-section-filter.png
similarity index 89%
rename from content/configuration/images/ER_DE2/image16.png
rename to content/configuration/images/DETK/detk-section-filter.png
index 5274eb1a..d2de6e72 100644
Binary files a/content/configuration/images/ER_DE2/image16.png and b/content/configuration/images/DETK/detk-section-filter.png differ
diff --git a/content/configuration/images/DETK/detk-sections-legacy-app.png b/content/configuration/images/DETK/detk-sections-legacy-app.png
new file mode 100644
index 00000000..1bcb1b58
Binary files /dev/null and b/content/configuration/images/DETK/detk-sections-legacy-app.png differ
diff --git a/content/configuration/images/DETK/detk-sections-new-app.png b/content/configuration/images/DETK/detk-sections-new-app.png
new file mode 100644
index 00000000..1b65bdb1
Binary files /dev/null and b/content/configuration/images/DETK/detk-sections-new-app.png differ
diff --git a/content/configuration/images/DETK/detk-tabs-settings.png b/content/configuration/images/DETK/detk-tabs-settings.png
new file mode 100644
index 00000000..20cf31c4
Binary files /dev/null and b/content/configuration/images/DETK/detk-tabs-settings.png differ
diff --git a/content/configuration/images/DETK/detk-top-bar.png b/content/configuration/images/DETK/detk-top-bar.png
new file mode 100644
index 00000000..4bbf38e2
Binary files /dev/null and b/content/configuration/images/DETK/detk-top-bar.png differ
diff --git a/content/configuration/images/DETK/detk-validation-panel.png b/content/configuration/images/DETK/detk-validation-panel.png
new file mode 100644
index 00000000..34b00989
Binary files /dev/null and b/content/configuration/images/DETK/detk-validation-panel.png differ
diff --git a/content/configuration/images/ER_DE2/image5.png b/content/configuration/images/DETK/detk-vertical-tabs.png
similarity index 92%
rename from content/configuration/images/ER_DE2/image5.png
rename to content/configuration/images/DETK/detk-vertical-tabs.png
index ae2da30b..b0172c90 100644
Binary files a/content/configuration/images/ER_DE2/image5.png and b/content/configuration/images/DETK/detk-vertical-tabs.png differ
diff --git a/content/configuration/images/DETK/detk-view-details-button.png b/content/configuration/images/DETK/detk-view-details-button.png
new file mode 100644
index 00000000..ac98b2db
Binary files /dev/null and b/content/configuration/images/DETK/detk-view-details-button.png differ
diff --git a/content/configuration/images/ER_DE/image1.png b/content/configuration/images/ER_DE/image1.png
deleted file mode 100644
index 2318ade0..00000000
Binary files a/content/configuration/images/ER_DE/image1.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image10.png b/content/configuration/images/ER_DE/image10.png
deleted file mode 100644
index 0ff48f3b..00000000
Binary files a/content/configuration/images/ER_DE/image10.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image11.png b/content/configuration/images/ER_DE/image11.png
deleted file mode 100644
index 508400da..00000000
Binary files a/content/configuration/images/ER_DE/image11.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image12.png b/content/configuration/images/ER_DE/image12.png
deleted file mode 100644
index c473012b..00000000
Binary files a/content/configuration/images/ER_DE/image12.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image13.png b/content/configuration/images/ER_DE/image13.png
deleted file mode 100644
index c78cc1da..00000000
Binary files a/content/configuration/images/ER_DE/image13.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image14.png b/content/configuration/images/ER_DE/image14.png
deleted file mode 100644
index 09ef47cb..00000000
Binary files a/content/configuration/images/ER_DE/image14.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image15.png b/content/configuration/images/ER_DE/image15.png
deleted file mode 100644
index f5b22121..00000000
Binary files a/content/configuration/images/ER_DE/image15.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image16.png b/content/configuration/images/ER_DE/image16.png
deleted file mode 100644
index 5699ed84..00000000
Binary files a/content/configuration/images/ER_DE/image16.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image17.png b/content/configuration/images/ER_DE/image17.png
deleted file mode 100644
index 1fa2c656..00000000
Binary files a/content/configuration/images/ER_DE/image17.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image18.png b/content/configuration/images/ER_DE/image18.png
deleted file mode 100644
index c7e0191f..00000000
Binary files a/content/configuration/images/ER_DE/image18.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image19.png b/content/configuration/images/ER_DE/image19.png
deleted file mode 100644
index 89c9a710..00000000
Binary files a/content/configuration/images/ER_DE/image19.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image2.png b/content/configuration/images/ER_DE/image2.png
deleted file mode 100644
index a9152b33..00000000
Binary files a/content/configuration/images/ER_DE/image2.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image20.png b/content/configuration/images/ER_DE/image20.png
deleted file mode 100644
index b33166cf..00000000
Binary files a/content/configuration/images/ER_DE/image20.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image21.png b/content/configuration/images/ER_DE/image21.png
deleted file mode 100644
index 5a225310..00000000
Binary files a/content/configuration/images/ER_DE/image21.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image22.png b/content/configuration/images/ER_DE/image22.png
deleted file mode 100644
index ad1e1363..00000000
Binary files a/content/configuration/images/ER_DE/image22.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image23.png b/content/configuration/images/ER_DE/image23.png
deleted file mode 100644
index 7de1f7b7..00000000
Binary files a/content/configuration/images/ER_DE/image23.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image24.png b/content/configuration/images/ER_DE/image24.png
deleted file mode 100644
index 2e395667..00000000
Binary files a/content/configuration/images/ER_DE/image24.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image25.png b/content/configuration/images/ER_DE/image25.png
deleted file mode 100644
index 845df8cf..00000000
Binary files a/content/configuration/images/ER_DE/image25.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image26.png b/content/configuration/images/ER_DE/image26.png
deleted file mode 100644
index aed7318a..00000000
Binary files a/content/configuration/images/ER_DE/image26.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image27.png b/content/configuration/images/ER_DE/image27.png
deleted file mode 100644
index 4b0cadce..00000000
Binary files a/content/configuration/images/ER_DE/image27.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image28.png b/content/configuration/images/ER_DE/image28.png
deleted file mode 100644
index b2e348a6..00000000
Binary files a/content/configuration/images/ER_DE/image28.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image29.png b/content/configuration/images/ER_DE/image29.png
deleted file mode 100644
index 0e961774..00000000
Binary files a/content/configuration/images/ER_DE/image29.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image3.png b/content/configuration/images/ER_DE/image3.png
deleted file mode 100644
index 907b8969..00000000
Binary files a/content/configuration/images/ER_DE/image3.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image30.png b/content/configuration/images/ER_DE/image30.png
deleted file mode 100644
index 035cb22a..00000000
Binary files a/content/configuration/images/ER_DE/image30.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image31.png b/content/configuration/images/ER_DE/image31.png
deleted file mode 100644
index 92f27362..00000000
Binary files a/content/configuration/images/ER_DE/image31.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image32.png b/content/configuration/images/ER_DE/image32.png
deleted file mode 100644
index abcc7151..00000000
Binary files a/content/configuration/images/ER_DE/image32.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image33.png b/content/configuration/images/ER_DE/image33.png
deleted file mode 100644
index ea400fe8..00000000
Binary files a/content/configuration/images/ER_DE/image33.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image34.png b/content/configuration/images/ER_DE/image34.png
deleted file mode 100644
index 3002cc6f..00000000
Binary files a/content/configuration/images/ER_DE/image34.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image35.png b/content/configuration/images/ER_DE/image35.png
deleted file mode 100644
index 2d3dd38e..00000000
Binary files a/content/configuration/images/ER_DE/image35.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image36.png b/content/configuration/images/ER_DE/image36.png
deleted file mode 100644
index e965077d..00000000
Binary files a/content/configuration/images/ER_DE/image36.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image37.png b/content/configuration/images/ER_DE/image37.png
deleted file mode 100644
index b0c2aaef..00000000
Binary files a/content/configuration/images/ER_DE/image37.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image38.png b/content/configuration/images/ER_DE/image38.png
deleted file mode 100644
index dcce7421..00000000
Binary files a/content/configuration/images/ER_DE/image38.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image39.png b/content/configuration/images/ER_DE/image39.png
deleted file mode 100644
index cee2c13c..00000000
Binary files a/content/configuration/images/ER_DE/image39.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image4.png b/content/configuration/images/ER_DE/image4.png
deleted file mode 100644
index 8f2261f8..00000000
Binary files a/content/configuration/images/ER_DE/image4.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image40.png b/content/configuration/images/ER_DE/image40.png
deleted file mode 100644
index 943f2039..00000000
Binary files a/content/configuration/images/ER_DE/image40.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image41.png b/content/configuration/images/ER_DE/image41.png
deleted file mode 100644
index 6322431d..00000000
Binary files a/content/configuration/images/ER_DE/image41.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image42.png b/content/configuration/images/ER_DE/image42.png
deleted file mode 100644
index 755e4fc0..00000000
Binary files a/content/configuration/images/ER_DE/image42.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image43.png b/content/configuration/images/ER_DE/image43.png
deleted file mode 100644
index e9a054cc..00000000
Binary files a/content/configuration/images/ER_DE/image43.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image44.png b/content/configuration/images/ER_DE/image44.png
deleted file mode 100644
index 707e3119..00000000
Binary files a/content/configuration/images/ER_DE/image44.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image45.png b/content/configuration/images/ER_DE/image45.png
deleted file mode 100644
index 0e923c36..00000000
Binary files a/content/configuration/images/ER_DE/image45.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image5.png b/content/configuration/images/ER_DE/image5.png
deleted file mode 100644
index 9a63fc58..00000000
Binary files a/content/configuration/images/ER_DE/image5.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image6.png b/content/configuration/images/ER_DE/image6.png
deleted file mode 100644
index 1d1e810a..00000000
Binary files a/content/configuration/images/ER_DE/image6.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image7.png b/content/configuration/images/ER_DE/image7.png
deleted file mode 100644
index d3cab1c8..00000000
Binary files a/content/configuration/images/ER_DE/image7.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image8.png b/content/configuration/images/ER_DE/image8.png
deleted file mode 100644
index 0367693d..00000000
Binary files a/content/configuration/images/ER_DE/image8.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE/image9.png b/content/configuration/images/ER_DE/image9.png
deleted file mode 100644
index e1b22ff2..00000000
Binary files a/content/configuration/images/ER_DE/image9.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image1.png b/content/configuration/images/ER_DE2/image1.png
deleted file mode 100644
index 56745fa5..00000000
Binary files a/content/configuration/images/ER_DE2/image1.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image10.png b/content/configuration/images/ER_DE2/image10.png
deleted file mode 100644
index fcbeebf8..00000000
Binary files a/content/configuration/images/ER_DE2/image10.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image12.png b/content/configuration/images/ER_DE2/image12.png
deleted file mode 100644
index 6e5a4638..00000000
Binary files a/content/configuration/images/ER_DE2/image12.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image13.png b/content/configuration/images/ER_DE2/image13.png
deleted file mode 100644
index 2049b6b7..00000000
Binary files a/content/configuration/images/ER_DE2/image13.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image14.png b/content/configuration/images/ER_DE2/image14.png
deleted file mode 100644
index e5c07cc4..00000000
Binary files a/content/configuration/images/ER_DE2/image14.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image15.png b/content/configuration/images/ER_DE2/image15.png
deleted file mode 100644
index cdbec661..00000000
Binary files a/content/configuration/images/ER_DE2/image15.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image17.png b/content/configuration/images/ER_DE2/image17.png
deleted file mode 100644
index d28cd6df..00000000
Binary files a/content/configuration/images/ER_DE2/image17.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image18.png b/content/configuration/images/ER_DE2/image18.png
deleted file mode 100644
index 9b575e79..00000000
Binary files a/content/configuration/images/ER_DE2/image18.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image19.png b/content/configuration/images/ER_DE2/image19.png
deleted file mode 100644
index 223531b6..00000000
Binary files a/content/configuration/images/ER_DE2/image19.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image2.png b/content/configuration/images/ER_DE2/image2.png
deleted file mode 100644
index 3f52ebbf..00000000
Binary files a/content/configuration/images/ER_DE2/image2.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image22.png b/content/configuration/images/ER_DE2/image22.png
deleted file mode 100644
index 1295b602..00000000
Binary files a/content/configuration/images/ER_DE2/image22.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image23.png b/content/configuration/images/ER_DE2/image23.png
deleted file mode 100644
index 33185bdd..00000000
Binary files a/content/configuration/images/ER_DE2/image23.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image24.png b/content/configuration/images/ER_DE2/image24.png
deleted file mode 100644
index b69c929f..00000000
Binary files a/content/configuration/images/ER_DE2/image24.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image25.png b/content/configuration/images/ER_DE2/image25.png
deleted file mode 100644
index 75a2fd45..00000000
Binary files a/content/configuration/images/ER_DE2/image25.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image26.png b/content/configuration/images/ER_DE2/image26.png
deleted file mode 100644
index d88337d0..00000000
Binary files a/content/configuration/images/ER_DE2/image26.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image28.png b/content/configuration/images/ER_DE2/image28.png
deleted file mode 100644
index 30f674e6..00000000
Binary files a/content/configuration/images/ER_DE2/image28.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image29.png b/content/configuration/images/ER_DE2/image29.png
deleted file mode 100644
index 17c6f818..00000000
Binary files a/content/configuration/images/ER_DE2/image29.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image3.png b/content/configuration/images/ER_DE2/image3.png
deleted file mode 100644
index 9ce9eb17..00000000
Binary files a/content/configuration/images/ER_DE2/image3.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image30.png b/content/configuration/images/ER_DE2/image30.png
deleted file mode 100644
index 6115d3d0..00000000
Binary files a/content/configuration/images/ER_DE2/image30.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image31.png b/content/configuration/images/ER_DE2/image31.png
deleted file mode 100644
index c0d4c357..00000000
Binary files a/content/configuration/images/ER_DE2/image31.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image34.png b/content/configuration/images/ER_DE2/image34.png
deleted file mode 100644
index b0042fa5..00000000
Binary files a/content/configuration/images/ER_DE2/image34.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image35.png b/content/configuration/images/ER_DE2/image35.png
deleted file mode 100644
index 4fb9c606..00000000
Binary files a/content/configuration/images/ER_DE2/image35.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image36.png b/content/configuration/images/ER_DE2/image36.png
deleted file mode 100644
index f064b6ff..00000000
Binary files a/content/configuration/images/ER_DE2/image36.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image45.png b/content/configuration/images/ER_DE2/image45.png
deleted file mode 100644
index 0e923c36..00000000
Binary files a/content/configuration/images/ER_DE2/image45.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image6.png b/content/configuration/images/ER_DE2/image6.png
deleted file mode 100644
index a1c8fbb8..00000000
Binary files a/content/configuration/images/ER_DE2/image6.png and /dev/null differ
diff --git a/content/configuration/images/ER_DE2/image9.png b/content/configuration/images/ER_DE2/image9.png
deleted file mode 100644
index 57f0950d..00000000
Binary files a/content/configuration/images/ER_DE2/image9.png and /dev/null differ
diff --git a/content/configuration/images/MAINT_MM/mm-all-metadata.png b/content/configuration/images/MAINT_MM/mm-all-metadata.png
new file mode 100644
index 00000000..482e28c7
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-all-metadata.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-bulk-selection-bar.png b/content/configuration/images/MAINT_MM/mm-bulk-selection-bar.png
new file mode 100644
index 00000000..073ba4bc
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-bulk-selection-bar.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-bulk-sharing-dialog.png b/content/configuration/images/MAINT_MM/mm-bulk-sharing-dialog.png
new file mode 100644
index 00000000..27050759
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-bulk-sharing-dialog.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-data-set-actions-menu.png b/content/configuration/images/MAINT_MM/mm-data-set-actions-menu.png
new file mode 100644
index 00000000..c30b2906
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-data-set-actions-menu.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-data-set-form-sections.png b/content/configuration/images/MAINT_MM/mm-data-set-form-sections.png
new file mode 100644
index 00000000..a137b05b
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-data-set-form-sections.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-data-set-validation.png b/content/configuration/images/MAINT_MM/mm-data-set-validation.png
new file mode 100644
index 00000000..ea8d06d0
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-data-set-validation.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-download-dialog.png b/content/configuration/images/MAINT_MM/mm-download-dialog.png
new file mode 100644
index 00000000..8646104f
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-download-dialog.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-list-toolbar.png b/content/configuration/images/MAINT_MM/mm-list-toolbar.png
new file mode 100644
index 00000000..9e0d2655
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-list-toolbar.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-manage-view-columns.png b/content/configuration/images/MAINT_MM/mm-manage-view-columns.png
new file mode 100644
index 00000000..4d583770
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-manage-view-columns.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-manage-view-filters.png b/content/configuration/images/MAINT_MM/mm-manage-view-filters.png
new file mode 100644
index 00000000..d259191c
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-manage-view-filters.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-merge-authority.png b/content/configuration/images/MAINT_MM/mm-merge-authority.png
new file mode 100644
index 00000000..5650d75c
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-merge-authority.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-move-org-units.png b/content/configuration/images/MAINT_MM/mm-move-org-units.png
new file mode 100644
index 00000000..b136305a
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-move-org-units.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-org-units-list.png b/content/configuration/images/MAINT_MM/mm-org-units-list.png
new file mode 100644
index 00000000..7b960628
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-org-units-list.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-overview.png b/content/configuration/images/MAINT_MM/mm-overview.png
new file mode 100644
index 00000000..5651a191
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-overview.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-row-actions-menu.png b/content/configuration/images/MAINT_MM/mm-row-actions-menu.png
new file mode 100644
index 00000000..7fe541e5
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-row-actions-menu.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-show-details.png b/content/configuration/images/MAINT_MM/mm-show-details.png
new file mode 100644
index 00000000..24a67352
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-show-details.png differ
diff --git a/content/configuration/images/MAINT_MM/mm-transfer-list.png b/content/configuration/images/MAINT_MM/mm-transfer-list.png
new file mode 100644
index 00000000..ede5b2fb
Binary files /dev/null and b/content/configuration/images/MAINT_MM/mm-transfer-list.png differ
diff --git a/content/configuration/transition_kit_de.md b/content/configuration/transition_kit_de.md
index ae2dc877..94123433 100644
--- a/content/configuration/transition_kit_de.md
+++ b/content/configuration/transition_kit_de.md
@@ -1,297 +1,275 @@
-# Transition Kit from Old Data Entry App (Legacy App) to New Data Entry App (Aggregate data)
+# Transition Kit - Legacy Data Entry app to the new Data Entry app (aggregate data) { #detk_transition_kit }
-- [Transition Kit from Old Data Entry App (Legacy App) to New Data Entry App (Aggregate data)](#transition-kit-from-old-data-entry-app-legacy-app-to-new-data-entry-app-aggregate-data)
- - [Introduction](#introduction)
- - [Benefits in brief](#benefits-in-brief)
- - [Feature comparison of Old (Legacy App) vs. New App.](#feature-comparison-of-old-legacy-app-vs-new-app)
- - [Feature comparison of Legacy App vs. New App Details with Screenshots](#feature-comparison-of-legacy-app-vs-new-app-details-with-screenshots)
- - [Initial Interface Review](#initial-interface-review)
- - [Option Menu Use/Function](#option-menu-usefunction)
- - [Sections and Filters](#sections-and-filters)
- - [Sections](#sections)
- - [Filters](#filters)
- - [Run Validation](#run-validation)
- - [Data Element Details](#data-element-details)
- - [New Features for Version - 42](#new-features-for-version---42)
- - [Pivot options in aggregate datasets sections](#pivot-options-in-aggregate-datasets-sections)
- - [Default](#default)
- - [Pivot](#pivot)
- - [Move a category to rows](#move-a-category-to-rows)
- - [Content displayed before/after section](#content-displayed-beforeafter-section)
- - [Moving a Dataset from the Legacy (Old App) to the New App](#moving-a-dataset-from-the-legacy-old-app-to-the-new-app)
- - [Review Current Configuration](#review-current-configuration)
- - [Understand Changes](#understand-changes)
- - [Prepare for Migration](#prepare-for-migration)
- - [Limitations of New App](#limitations-of-new-app)
- - [Use cases](#use-cases)
- - [Default form:](#default-form)
- - [Section form](#section-form)
+## Introduction { #detk_introduction }
+This transition kit is designed to support DHIS2 users and implementers in moving from the legacy aggregate data entry app to the new data entry app. It provides practical guidance, highlights key differences, and outlines updated workflows to ensure a smooth transition.
-## Introduction
+The goal is to help users adapt quickly and efficiently to the new interface and functionalities introduced in the latest DHIS2 versions, while maintaining reporting continuity.
-This transition kit is designed to support DHIS2 users and implementers in moving from the legacy aggregate Data Entry app to the New Data Entry App. It provides practical guidance, highlights key differences, and outlines updated workflows to ensure a smooth transition.
+## Benefits in brief { #detk_benefits }
-The goal is to help users adapt quickly and efficiently to the new interface and functionalities introduced in the latest DHIS2 versions, while maintaining **data quality and reporting continuity**.
+1. **One selection bar:** Data set, organisation unit, period and section are chosen from one bar at the top of the screen.
+2. **Detailed data element information:** View code, data element ID, category option combo ID, and last updated details.
+3. **Configurable forms:** Supports default, section and HTML-based forms.
+4. **Offline functionality:** Values are saved on your computer and sync automatically when you reconnect. Validation, history and the audit log need a connection.
+5. **Save status for each cell:** Each cell shows if its value is saved, waiting to sync, invalid (not saved), has a comment or is locked. Open **Options** > **Help** to see what each colour means.
+6. **Validation side panel:** Interactive side panels with categorized alerts (High / Medium / Low).
+7. **Active development:** The new app is still being developed and maintained. The legacy app is not.
+8. **Keyboard navigation:** Move between cells with Tab and the arrow keys and open the details panel with ctrl+enter (cmd+enter on Mac).
-## Benefits in brief
-
-1. **Modern and user-friendly interface:** More intuitive layout, improved navigation, and responsive design.
-2. **Detailed data element information:** Includes code, data element ID, category option combo ID, and last updated details.
-3. **Support for configurable forms**(default, section, and HTML-based).
-4. **Offline functionality** (especially via DHIS2 Android).
-5. **Enhanced validation and feedback**: Interactive side panels with categorized alerts.
-6. **Active development and support:** Unlike the deprecated legacy app, the new app is continuously improved and maintained.
-7. **Accessibility enhancements**: Better keyboard navigation and usability for a wider range of users.
-
-## Feature comparison of Old (Legacy App) vs. New App.
-
-
-| **Features** | **Old App (Legacy App)** | **New App** |
-|-------------------------|---------------------------------------|--------------------------------------------------------------|
-| **Interface** | Dataset & Period on right; OU on left | OU, Dataset, Period all selected from persistent top bar |
-| **Menus** | Top-right corner | Options button (includes Help) |
-| **Sections/Filters** | Visible after period selection | Available directly at top bar |
-| **Data element filter** | Limited to one section at a time | Global filter across sections; can narrow to one section |
-| **Run validation** | Button at top right menu; opens popup | Bottom of form; interactive side panel with categorized alerts |
-| **Data element details**| Popup window for comments/follow-up | Inline side panel; comments, audit history, legends available |
-
-## Feature comparison of Legacy App vs. New App Details with Screenshots
+> **Important**
+>
+> **Why this matters for implementers:** The new app keeps all selections in one bar, shows validation results next to the form, and is the version that is still being developed. Training and support effort should go to the new app.
+>
+> *As of DHIS2 version 43, the legacy app is no longer supported and can not be accessed in DHIS2.*
-### Initial Interface Review
+## Feature comparison of the legacy app and the new app { #detk_feature_comparison }
-**New App**: Organisation unit, dataset, and period selected from a persistent top bar. Modern, user-friendly design with improved usability.
+| Feature | Legacy app | New app |
+|:--|:----|:----|
+| Interface | Data set and period selectors are in a green box on the middle-left side of the screen. Organisation unit (OU) is on the left panel. | OU, data set and period are all selected from a persistent top bar. The top bar stays in place when you scroll down the page. |
+| Menus | Individual buttons in the top-right corner (Run validation, Print form, Print blank form) and at the bottom of the data entry page (Complete, Incomplete, Run validation). | Top-right **Options** button with a dropdown menu: Print form with values, Print empty form, and Help. The bottom of the page has buttons to mark the form complete or incomplete and to run validation. |
+| Sections/Filters | Displayed in a green box on the mid-left panel after period selection. | Available directly on the top bar after period selection. |
+| Data element filter | Each section has its own data element search bar that works only within that section. | In addition to the section filter, a global search bar filters by data element across all sections. |
+| Run validation | Buttons at the top-right and lower mid-left side. Opens a popup listing validation errors. | Button at the bottom of the form. Opens an interactive side panel with alerts grouped as high, medium and low. |
+| Data element details | Double-click a data cell to open a popup window for comments, follow-up and last updated information. | Select **View details** from the lower-left panel (above Run validation and Mark incomplete) to open a side panel with follow-up, comments, minimum and maximum limits, history and audit log. |
+| Organisation unit list | All organisation units are shown, including ones the data set is not assigned to. | Only organisation units assigned to the selected data set are shown. |
+| Invalid values | A popup message says the value is invalid. | The cell turns red and the value is not saved. The bottom bar shows how many invalid values were not saved. |
+| Additional selections | Shown as extra dropdowns in the selection box. | Shown as extra dropdowns at the end of the top bar, after Period. |
- Note: In the new app, the Dataset must be chosen before the Organisation Unit.This order is intentional, it helps filter available organisation units to only those assigned to the selected dataset, reducing user errors during data entry.
+## Feature comparison in detail, with screenshots { #detk_feature_details }
+### User interface { #detk_user_interface }
-**Legacy App**: Organisation Unit on left panel, dataset selected separately. Outdated interface and workflows.
+**New app:**
-
+The data set, organisation unit, reporting period, and section are selected from a single top bar. This compact layout brings the selection controls together, making it easier to see and change the current data entry context.
-### Option Menu Use/Function
+
-
+**Legacy app:**
-**New App**
-* **Print form with values**: Prints the current data entry form including all entered data values. Useful for reviews, audits, or physical record-keeping.
-* **Print empty form**: Prints a blank version of the dataset form. Useful for offline data collection or field distribution.
-* **Help:** Opens documentation or guidance related to the Data Entry App. Supports users in understanding the interface and resolving issues.
+Users select the organisation unit from the hierarchy on the left, then choose the data set and reporting period in the selection panel above the form. The **Filter on section** option allows users to display a specific section.
- Note : The new Help button opens a legend explaining the meaning of cell colors and icons; for example, red indicates an unsaved value.It also lists available keyboard shortcuts, helping users navigate and enter data more quickly.
+
-
+> **Tip**
+>
+> In the new app, the data set must be chosen before the organisation unit. This order is intentional. It filters the available organisation units to only those assigned to the selected data set.
-**Legacy App** The Print form and Print blank form button is available at the extreme right top corner.
+### Options menu { #detk_options_menu }
-
+**New app:**
-### Sections and Filters
+- **Print form with values:** Prints the current data entry form including all entered data values. Useful for reviews, audits, or physical record-keeping.
+- **Print empty form:** Prints a blank version of the data set form. Useful for offline data collection or field distribution.
+- **Help:** Opens a side panel with guidance on the data entry app, including what the colour coding of the cells means and the keyboard shortcuts you can use. See the figure below.
-#### Sections
+
-Both are supported with section forms where you can select the section of the form.
+{ width=40% }
-**New App:** Sections displayed on the top bar after data set, org unit and period have been selected;
+**Legacy app:** The **Print form** and **Print blank form** buttons are in the top-right corner.
-**Legacy App:** Section forms only available after selecting the period
+
-**Benefit**: Greater efficiency when working with large/complex forms.
+### Sections and filters { #detk_sections_filters }
-
+#### Sections { #detk_sections }
->Note
-> In the **Legacy App,** the data element filter was limited to one section at a time. This meant that if you wanted to find a data element, you had to first navigate to the specific section where it was located (filtering worked only within that active section).
->
-> In the **New App**, the filter is global across all sections and can be applied to one section at a time. This means you can search for any data element from the top filter bar, and it will display results across the entire form, regardless of which section the element belongs to.
->
-> Additionally, when a specific section is open, the filter can be used to narrow down elements within that section alone. This dual functionality offers flexibility and significantly improves efficiency, especially when working with large or complex forms.
+Both apps support section forms, where you can select the section of the form.
+**New app:** Sections are displayed on the top bar after the data set, organisation unit and period have been selected.
-#### Filters
+
-**New App:** The filter is global across all sections and can be applied to one section at a time. This means you can search for any data element from the top filter bar, and it will display results across the entire form, regardless of which section the element belongs to.
+**Legacy app:** The section selector is fixed to the top area after the data set, organisation unit and period have been selected.
-Additionally, when a specific section is open, the filter can be used to narrow down elements within that section alone. This dual functionality offers flexibility and significantly improves efficiency, especially when working with large or complex forms.
+
-
-
+#### Filters { #detk_filters }
-**Legacy App:** The data element filter was limited to one section at a time. This meant that if you wanted to find a data element, you had to first navigate to the specific section where it was located (filtering worked only within that active section).
+**New app:** The filter is global across all sections and can also be applied to one section at a time. You can search for any data element from the top filter bar, and it will display results across the entire form, regardless of which section the element belongs to.
-
+When working within a specific section, the section filter narrows down elements within that section. This helps when navigating large or complex forms.
-### Run Validation
+> **Tip**
+>
+> Show users how the global filter quickly narrows data elements across the whole form or within a single section. Encourage them to use the filter instead of scrolling to speed up data entry.
-**New App:** Validation results shown in a **side panel**, grouped into categories: High, Medium, Low. Alerts are summarized for easier review.
+
-
+
-**Legacy App**:The ‘Run Validation’ button is located in the bottom-left corner. When clicked validation results appear in a side panel, grouped into High, Medium, and Low categories, with alerts summarized for easier review.
+**Legacy app:** The data element filter was limited to one section at a time. To find a data element, you had to first navigate to the section where it was located.
- Note: The side panel groups validation alerts by severity. Review High alerts first and use the panel to quickly move between issues without losing their place in the form.
+
-
+### Run validation { #detk_run_validation }
-### Data Element Details
+**New app:** The **Run validation** button is in the bottom-left corner. When selected, validation results appear in a side panel, grouped into High, Medium, and Low, with alerts summarized for easier review. The group comes from the Importance set on each validation rule (High, Medium or Low).
-**New App:** Clicking a data cell shows its details in the lower-left section, with a View Details button. This opens a side panel where users can add comments, mark items for follow-up, and view audit history and legends. Keeping all related information in one place gives a clearer, more organized view of each data item. Hide Details closes the panel.
+> **Tip**
+>
+> Show users how the side panel groups validation alerts by severity. Encourage them to review High alerts first and use the panel to move between issues without losing their place in the form.
-
-
+
-**Legacy App:** When a user **double-clicked on a data cell** in the Data Entry app (Aggregate), a **popup window** opened.
+**Legacy app:** The **Run validation** button is in both the top-right menu bar and the bottom of the form. When selected, it opens a window that either shows validation errors or a "Validation Result" message saying the form passed validation.
-This popup allowed users to:
+
-* Enter or edit a value
-* Add a comment related to the specific data value
-* View or update the last updated date
-* See who last edited the value
+### Data element details { #detk_data_element_details }
-
+**New app:** Selecting a data cell shows the **View details** button in the lower-left section. This opens a side panel where users can mark the value for follow-up, add comments, set minimum and maximum limits (depending on their authority), and see the data element ID, category option combination ID, history and audit log. **Hide details** closes the panel.
-## New Features for Version - 42
+> **Tip**
+>
+> Demonstrate how the View details panel keeps all information for a data item in one place. Show how users can manage data for specific cells from the panel.
-### Pivot options in aggregate datasets sections
+
-These pivot tables control how data elements and category option combos are displayed within a section of a dataset.
+
-**Configuring Pivot Options for a Data Set**
+**Legacy app:** When a user double-clicks a data cell, a popup window opens. The popup allowed users to add a comment, mark the value for follow-up, set minimum and maximum limits (depending on their authority), and see the data element history, the audit trail and who last updated the value.
-1. Open the data set - Navigate to the data set you have created and to which you’ve already assigned data elements.
-2. Go to 'Manage Sections' - In the data set settings, click on Manage Sections to organize how your form is structured.
-3. Select 'Pivot Options' - Inside the section management view, choose Pivot Options to define how your data will be displayed in analytics.
-4. Choose the layout based on your design
-5. Configure the pivot options (e.g. whether data elements appear as rows or columns) according to the reporting design and data structure you need.
+{ width=50% }
-#### Default
-By default, data elements are arranged in rows, while categories (disaggregation dimensions) are displayed in columns.
+### Other changes users should know { #detk_other_changes }
-
+- **Keyboard shortcuts:**
+ - tab or arrow-down moves to the next cell
+ - shift+tab or arrow-up moves to the previous cell.
+ - ctrl+enter (cmd+enter on Mac) opens the details panel.
+- **Completing a form:** Use **Mark complete** in the bottom bar when all intended data is entered. Use **Mark incomplete** to reopen it.
+- **Minimum and maximum limits:** Set from the details panel. This needs the right user authority, and the limits apply to everyone who uses the data set. *It is recommended you set this system wide in bulk rather then one by one via data entry.*
+- **History and audit log:** History shows the last 12 values. The audit log shows who changed a value and when. Both are closed by default and open when you click them.
+- **Follow-up:** Values marked for follow-up appear in the Data Quality app.
+- **Working offline:** Open the app while online so forms download. Data entered offline syncs when you reconnect. Validation, history and the audit log need a connection.
-
+## New features { #detk_new_features }
-#### Pivot
+The new app introduces new features that make data entry forms easier to use and configure. These updates improve layout flexibility and reduce the need for custom HTML forms.
-Categories as rows, data elements as columns
- * Useful when there are **many data elements** and few categories
- * Makes the form **more compact horizontally**
-
- 
+Implementers can now use built-in options such as configurable section layouts, pivot display settings, vertical tabs, collapsible sections, and custom form titles to create clearer forms.
-#### Move a category to rows
+This matters because custom forms do not work in the DHIS2 Android app. Section forms with these options are the alternative. Test each option in the Android app before relying on it.
-* It is a hybrid layout
-* One category dimension is moved to rows
-* It helps to give more control when the dataset is large.
+> **Tip**
+>
+> Many layouts that once required custom HTML forms can now be created using built-in options. If users enter data on Android, test each option in the Android app first.
- 
- 
+### Collapsible sections { #detk_collapsible_sections }
-#### Content displayed before/after section
+**New app:** Collapsible sections are built into the data entry layout. They work automatically and do not require any configuration. They help organise long forms and reduce scrolling.
-You can add HTML-based instructions, notes, or links that appear above or below the section form — useful for guidance or data entry rules.
+
+### Vertical tabs { #detk_vertical_tabs }
-
-
+**New app:** Sections can be shown as tabs, either horizontal or vertical, instead of on one page.
-## Moving a Dataset from the Legacy (Old App) to the New App
+To show sections as tabs:
-### Review Current Configuration
+1. In the Metadata Management app, open the data set.
+2. Go to the **Form** section.
+3. Under **Display options** > **Section layout**, select **Tabs: Show one tab for each section**.
+4. Select **Horizontal tabs** or **Vertical tabs**.
+5. Click **Save**.
-* Data elements and category combinations
-* Custom or section forms (Check if using Java script)
-* Validation rules
-* Indicators
+
-### Understand Changes
+
-* Interface - The user interface is different
-* Custom forms - using Java script are no longer supported but HTML is supported
-* Section forms - are supported but can have different style with use of pivot - style options
-* Filtering - Improved filter and search feature
+### Pivot display settings for sections { #detk_pivot_display }
-### Prepare for Migration
+This setting lets you choose how data elements and categories are arranged in each section: what appears in rows and what appears in columns.
-* Redesign custom forms without using Java script
-* Re - adjust the section forms
-* Test all the forms in New App
+To configure the pivot options for a section:
-## Limitations of New App
+1. In the Metadata Management app, open the data set you want to change. It must already have data elements assigned.
+2. Go to the **Form** section.
+3. Click the options menu (**...**) next to the section you want to change, then click **Edit**.
+4. Under **Display options** > **Display mode**, select how you want the section to show.
+5. Click **Save section**.
-| **Limitations** | **Alternative/Workaround** |
-|----------------------------------|-----------------------------------------------------------|
-| No JavaScript support in custom forms | Use indicators for calculations and validations for logic checks |
-| No enhanced styling | Use HTML (only simple table layouts) |
+
-## Use cases
+The display modes are:
-Below are the practical examples showing how forms behave in the **Legacy Data Entry App** compared to the **New Data Entry App**.
+- **Default:** Data elements as rows and categories (disaggregation dimensions) as columns. This is the default layout.
-### Default form:
+ 
-1. Interface
-
- **Legacy App**
- - Organisation unit selected from left-hand panel; dataset separately
- - Outdated layout, harder to navigate between forms
+- **Pivot:** Categories as rows, data elements as columns.
+ - Useful when there are many data elements and few categories.
+ - Makes the form more compact horizontally.
- **New App**
- - Organisation unit, dataset, and period all selected from the **persistent top bar**.
- - Modern, cleaner layout for faster switching.
-
-
+ 
-1. Organization unit
+- **Move a category to rows:** A hybrid layout.
+ - One category dimension is moved to rows.
+ - Gives more control when the data set is large.
- **Legacy App**: All OUs displayed, even if the dataset is not assigned (inactive ones appear greyed).
+ 
- **New App**: Only OUs assigned to the form are enabled
-
-
+### Content displayed before or after a section { #detk_before_after_section }
-1. Error Display:
+You can add instructions, notes, or links that appear above or below a section. Markdown formatted text is supported. Use this to highlight key information and direct users to additional resources.
- **Legacy App**: AError shown in popup messages
+To add the text, open the section editor as described in [Pivot display settings for sections](#detk_pivot_display). Under **Display options**, fill in **Content to display before a section** or **Content to display after a section**, then click **Save section**. The section editor screenshot above shows these fields.
- **New App**: Errors displayed inline within the form, with clearer indicators
+
- 
- 
+## Switching a data set to the new app { #detk_switching }
-2. Run validation interface
+Switching a data set from the legacy app to the new app is usually straightforward. Both apps use the same data set and the same data values. Review existing data set configurations, custom forms, validation rules, and workflows before switching.
- **Legacy App**: “Run Validation” button in top-right menu; results in a popup.
+Some existing configurations may behave differently in the new app, so test each data set before switching.
- **New App**:Validation button at the bottom of the form; results appear in a side panel, grouped into High / Medium / Low.
+### Review the current configuration { #detk_review_configuration }
- 
- 
+Before switching a data set, review:
-### Section form
+- Data elements and category combinations
+- Custom or section forms
+- JavaScript used in custom forms
+- Validation rules
+- Indicators
+- Existing data entry workflows and reporting requirements
-1. Interface
-
- **Legacy App**: Sections appear only after period selection
+### Understand the changes { #detk_understand_changes }
- **New App**:Section tabs are visible at the top bar immediately
+- **Interface:** Organisation unit, data set and period are selected from the persistent top bar.
+- **Custom forms:** HTML-based custom forms are supported. For existing JavaScript-based custom forms, check compatibility with the Custom Forms plugin before switching.
+- **Section forms:** Section forms are supported, with additional layout options such as pivot configurations, vertical tabs, and collapsible sections.
+- **Filtering:** A global filter is added on top of the section filter.
+- **Validation:** Validation results are shown in a side panel next to the form.
- 
- 
+### Prepare for migration { #detk_prepare_migration }
-2. Filter section
+- Review the existing data set configuration and identify any custom JavaScript dependencies.
+- Decide if existing custom forms can be used with the Custom Forms plugin or should be changed to section forms.
+- Review and adjust section layouts where required.
+- If possible, use section forms for new or redesigned forms. They are easier to maintain than custom forms.
+- Test validation rules, indicators, calculations, and data entry workflows.
+- Test the complete data set in the new app before switching users to the new workflow.
+- Where applicable, test the data set on both web and Android.
- **Legacy App**: Filter applies to one section at a time
+> **Tip**
+>
+> Encourage implementers to walk through each data set in the new app before switching over. Pay attention to custom forms, JavaScript dependencies, section layouts, validation, and calculations. Testing with real users helps find workflow or usability issues before rollout.
- **New App**:Global filter across all sections, plus ability to narrow to a single section.
- 
- 
+## Limitations of the new app { #detk_limitations }
-3. New features
- * Row/Column Switching for categories (e.g., “Communicable immunizable” dataset section).
- * Not available in Legacy App.
- * Makes large forms easier to read horizontally or vertically.
- 
+| Limitation | Consideration |
+|:--|:----|
+| JavaScript custom forms | The Custom Forms plugin provides JavaScript support in the new app. Existing JavaScript forms should still be reviewed and tested for compatibility. |
+| Custom styling | Review existing custom HTML/CSS and confirm that it displays as expected in the new app. |
+| Multiple organisation unit entry | This functionality was not rebuilt in the new app. Consider this when assessing data sets that depend on this workflow. |
+> **Note**
+>
+> **Custom forms and JavaScript:** JavaScript support for legacy custom forms is provided through the Custom Forms plugin included with Data Entry app version 102.0.0 and later. To enable support, upgrade the Data Entry app to version 102.0.0 or later in the App Management app. Then test existing custom forms for compatibility.
+>
+> For more information, see [Support for JavaScript in custom forms](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/maintaining-the-system/support-for-javascript-in-custom-forms.html).
diff --git a/content/configuration/transition_kit_maintenance_to_mm.md b/content/configuration/transition_kit_maintenance_to_mm.md
new file mode 100644
index 00000000..1b3ec59c
--- /dev/null
+++ b/content/configuration/transition_kit_maintenance_to_mm.md
@@ -0,0 +1,208 @@
+# Transition Kit - Maintenance app to the Metadata Management app { #mmchg_whats_changed }
+
+## Who is this transition kit for? { #mmchg_audience }
+
+If you configure metadata in DHIS2 and you are used to the Maintenance app, then note that the Metadata Management app replaces it. This page lists what is new, what works differently, and what you still need the Maintenance app for.
+
+- The Metadata Management app is installed from the DHIS2 App Hub.
+- It works with DHIS2 version 41 and above.
+- It is released continuously. New sections and features arrive often, so update the app from the App Hub before you report something as missing or non-functional.
+- The maintenance app is no longer being supported, so plan accordingly
+
+> **Note**
+>
+> This page covers the differences between the maintenance app and the metadata management app. For full instructions, see [Configure metadata (Metadata Management app)](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-metadata-management-app.html).
+
+## The Metadata Management app { #mmchg_overview }
+
+The left sidebar lists every metadata object you can manage in this app. The overview page shows a card for each object type, with **Add new** and **Manage** buttons.
+
+
+
+## Summary of changes (when compared to the maintenance app) { #mmchg_summary }
+
+| Function | Maintenance app | Metadata Management app | Status |
+|---|---|---|---|
+| Create metadata | Plus button, bottom right corner | New bottom in top menu | Changed |
+| Edit, clone, delete, translate, sharing settings, show details | Options menu on each object | Options menu (**...**) on each object | Same |
+| See who created or last updated an object | Only shows dates in details panel | Shows dates and user in details panel | Changed |
+| Choose which columns a list shows | Gear icon at top right of list > **Manage columns** | **Manage View** > **Columns** tab | Changed |
+| Choose filters to apply to your current view of the metadata | Not available | **Manage View** > **Filters** tab | New |
+| Download metadata from a list | Gear icon at top right of list > **Download** | **Download** button above the list | Changed |
+| Search across all metadata types at once | Not available | **All metadata** view | New |
+| Change sharing, download or delete many objects at once | Not available | Select objects in the list, then use the bar above the list | New |
+| Merge duplicate objects | Not available | Merge screen (needs a merge authority) | New |
+| Set compulsory data elements for a data set | Data set options menu > **Edit compulsory data elements** | Data set form > **Validation** section | Changed |
+| Add many objects to a group, or one object to many groups | Separate **Edit multiple object groups** screen | Edit from the object or from the group | Changed |
+| Download a default data entry form as PDF | Data set options menu > **Get PDF for data entry** | Not in the data set options menu | Not available |
+| Push reports (push analysis) | Available | Not available | Use the Maintenance app |
+| External map layers | Available | Not available, planned to move to the Maps app | Use the Maintenance app |
+
+## What's new { #mmchg_new }
+
+### All metadata view { #mmchg_all_metadata }
+
+Search for a keyword across many metadata types from one screen.
+
+1. In the sidebar, click **Metadata Overview** > **All metadata**.
+2. Type a keyword in the search box. Results are grouped by metadata type, with the number of matches.
+3. Use the metadata types dropdown to narrow the results.
+4. Expand a type to see the first five matches. Click **Load more** to see more.
+
+
+
+### Bulk actions: sharing, download and delete { #mmchg_bulk_actions }
+
+Select several objects in a list with the checkboxes. A bar appears above the list with **Update sharing**, **Download**, **Delete** and **Deselect all**.
+
+
+
+**Update sharing** opens a dialog where you add sharing settings for users, user groups and public access. The changes apply to all selected objects.
+
+
+
+> **Note**
+>
+> Editing or removing existing sharing settings in bulk is not yet available; however further improvements are planned.
+
+> **Warning**
+>
+> **Delete** in the bulk bar deletes all selected objects. Deleting metadata cannot be undone. Metadata dependencies, or metadata that has data associated with it, will still give warnings and/or errors when using this option to delete.
+
+### Custom filters on each list { #mmchg_list_filters }
+
+Each list has a search bar (name, code or ID) and filters for that object type. For example, data elements can be filtered by domain type, value type, data set, category combination and data element group.
+
+
+
+You choose which filters to show with **Manage View** > **Filters**.
+
+### Merge duplicate metadata { #mmchg_merge }
+
+Merge combines duplicate objects into one. All references to the source objects move to the target object. The source objects and data can be kept or deleted depending on user selection.
+
+- You can merge the following metadata objects: categories, category combinations, category option combinations, category options, data elements, indicators, indicator types and organisation units.
+- Each object type has its own merge authority. For example, category options and categories each have their own seperate merge authority. Without it, the merge page shows an error. In order for a user to perform that merge, assign the user authority to a user role assigned to them.
+
+>**Caution**
+>
+>It is recommended that a seperate merge role is created to allow for explicit control over who has these authorites.
+
+
+
+> **Warning**
+>
+> Merging cannot be undone. Back up your database before you merge.
+
+For the full procedure, see [Merge](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-metadata-management-app.html#mm_common_actions_merge).
+
+## What works differently { #mmchg_changed }
+
+### Details panel { #mmchg_details_panel }
+
+Click the details icon (**i**) on a row to open the details panel on the right. It shows the code, who created the object, who last updated it, the ID and the API URL. Click **Edit** to open the object.
+
+
+
+### Options menu { #mmchg_options_menu }
+
+Click the options menu (**...**) on a row for **Edit**, **Clone**, **Show details**, **Sharing settings**, **Translate** and **Delete**.
+
+
+
+### Lists: columns, filters and download { #mmchg_lists }
+
+Column and filter settings are under the **Manage View** button above the list.
+
+1. Click **Manage View**.
+2. Select the **Columns** tab to choose columns, or the **Filters** tab to choose filters.
+3. Move items between the available and selected lists with the arrow buttons. Use the up and down arrows to change the order.
+4. Click **Update view**. Click **Reset to default** to go back to the default view.
+
+> **Note**
+>
+> Your choices only change your own view. They do not edit metadata or affect other users.
+
+
+
+
+
+**Download** is a separate button above the list. You choose:
+
+- Compression: Zip, Gzip or Uncompressed
+- What to include: all objects, only selected objects, or only objects that match the active filters
+- Whether to include user sharing settings
+
+
+
+### Assigning items with the transfer list { #mmchg_transfer_list }
+
+Many forms use a two-panel list to assign items, for example data elements to a data element group.
+
+- **Show only unassigned items** hides items that already belong to another group.
+- Each panel has its own filter box.
+- **Add new** opens a form to create a missing item without leaving the current form. **Refresh list** reloads the available items.
+
+
+
+### Group membership { #mmchg_group_membership }
+
+The Maintenance app had a separate screen for editing groups in bulk. The Metadata Management app does not have this screen. Instead:
+
+- One object into many groups: open the object (for example a data element) and assign it to groups.
+- Many objects into one group: open the group (for example a data element group) and assign the members.
+
+### Data set form { #mmchg_data_set_form }
+
+The data set form is split into sections, listed on the left: **Setup**, **Data**, **Periods**, **Validation**, **Organisation Units**, **Form** and **Advanced**. Click a section name to jump to it.
+
+
+
+The **Validation** section ("Validation and limitations") has:
+
+- the approval workflow for the data set
+- the rules for completing a form, for example "Completing requires passing validation"
+- the number of days after the period to qualify for on-time submission
+- the compulsory data elements, which used to be a separate action in the options menu
+
+
+
+The data set options menu does not have a **Get PDF for data entry** option.
+
+
+
+### Organisation units { #mmchg_org_units }
+
+The organisation unit list shows the hierarchy. Click the arrow next to an organisation unit to show its children.
+
+
+
+To move organisation units:
+
+1. In the sidebar, click **Organisation units** > **Hierarchy operations**.
+2. On the left, select the organisation units to move.
+3. On the right, select the new parent.
+4. Click **Move**. All descendants move with them.
+
+
+
+### Programs and data approval { #mmchg_programs_approval }
+
+Programs and data approval are in the app's sidebar. They are documented separately.
+
+## What you still need the Maintenance app for { #mmchg_maintenance_still_needed }
+
+| Task | Why | What to do |
+|---|---|---|
+| Push reports | Not available in the Metadata Management app | Keep using the Maintenance app. See [Manage push reports](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-maintenance-app.html#manage_push_report). |
+| External map layers | Planned to move to the Maps app | Keep using the Maintenance app until then. See [Manage external map layers](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-maintenance-app.html#manage_external_maplayer). |
+| PDF data entry forms | Not in the data set options menu | Keep using the maintenance app. See [Download forms as PDF.](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-maintenance-app.html#download_defaultform_pdf) |
+
+> **Important**
+>
+> Do not uninstall or hide the Maintenance app if your instance uses any of these.
+
+## Related pages { #mmchg_related }
+
+- [Configure metadata (Metadata Management app)](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-metadata-management-app.html)
+- [Configure metadata (Maintenance app)](https://docs.dhis2.org/en/use/user-guides/dhis-core-version-master/configuring-the-system/metadata-maintenance-app.html)
diff --git a/implementation_section_index.yml b/implementation_section_index.yml
index ef6d9ec0..6d1eee99 100644
--- a/implementation_section_index.yml
+++ b/implementation_section_index.yml
@@ -66,6 +66,8 @@ Configuration:
- Transition Kits:
- Event Reports to Line Listing: '@github(dhis2/dhis2-docs-implementation, content/configuration/transition_kit_er_to_ll.md, master)'
- Tracker Capture to Capture: '@github(dhis2/dhis2-docs-implementation, content/configuration/transition_kit_tc_to_c.md, master)'
+ - Data Entry - Legacy to New: '@github(dhis2/dhis2-docs-implementation, content/configuration/transition_kit_de.md, master)'
+ - Maintenance to Metadata Management: '@github(dhis2/dhis2-docs-implementation, content/configuration/transition_kit_maintenance_to_mm.md, master)'
Data Use:
- Data Visualization: '@github(dhis2/dhis2-docs-implementation, content/data-use/data-visualization.md, master)'
Health: