diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11b76869..46bfd3bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,6 +254,7 @@ qt5_wrap_ui(UI src/mainwindow.ui
     src/cdlgmdfinfourl.ui
     src/cdlgmdffilefirmware.ui
     src/cdlgmdffilevideo.ui
+    src/cdlgmdffilemanual.ui
     src/cdlgmdfvaluelist.ui
     src/cdlgeditmap.ui
     src/cdlgmdfmanufacturer.ui
@@ -519,6 +520,45 @@ add_executable(${PROJECT_NAME}
     src/cdlgmdfcontactlist.cpp 
     src/cdlgmdfcontactlist.h
 
+    build/ui_cdlgmdfbootloader.h
+    src/cdlgmdfbootloader.ui
+    src/cdlgmdfbootloader.cpp 
+    src/cdlgmdfbootloader.h
+
+    build/ui_cdlgmdffilepicture.h
+    src/cdlgmdffilepicture.ui
+    src/cdlgmdffilepicture.cpp 
+    src/cdlgmdffilepicture.h
+
+    build/ui_cdlgmdffilevideo.h
+    src/cdlgmdffilevideo.ui
+    src/cdlgmdffilevideo.cpp 
+    src/cdlgmdffilevideo.h
+
+    build/ui_cdlgmdffilesetup.h
+    src/cdlgmdffilesetup.ui
+    src/cdlgmdffilesetup.cpp 
+    src/cdlgmdffilesetup.h
+
+    build/ui_cdlgmdffilemanual.h
+    src/cdlgmdffilemanual.ui
+    src/cdlgmdffilemanual.cpp
+    src/cdlgmdffilemanual.h
+
+    build/ui_cdlgmdffilefirmware.h
+    src/cdlgmdffilefirmware.ui
+    src/cdlgmdffilefirmware.cpp
+    src/cdlgmdffilefirmware.h
+
+    build/ui_cdlgmdffiledriver.h
+    src/cdlgmdffiledriver.ui
+    src/cdlgmdffiledriver.cpp
+    src/cdlgmdffiledriver.h
+
+    build/ui_cdlgmdffile.h
+    src/cdlgmdffile.ui
+    src/cdlgmdffile.cpp
+    src/cdlgmdffile.h
 
     ${VSCP_PATH}/src/vscp/common/version.h
     ${VSCP_PATH}/src/vscp/common/vscp.h
diff --git a/mdf/beijing_2.xml b/mdf/beijing_2.xml
index eed50608..b2062df9 100644
--- a/mdf/beijing_2.xml
+++ b/mdf/beijing_2.xml
@@ -86,116 +86,116 @@
 		Picture 1 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing2.png" 
+	<picture name="aaaaaa" path="http://www.grodansparadis.com/beijing/images/beijing2.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 2 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing3.png" 
+	<picture name="bbbbbbb" path="http://www.grodansparadis.com/beijing/images/beijing3.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 3 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing4.png" 
+	<picture name="ccccccc" path="http://www.grodansparadis.com/beijing/images/beijing4.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 4 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing5.png" 
+	<picture name="ddddddd" path="http://www.grodansparadis.com/beijing/images/beijing5.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 5 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing6.png" 
+	<picture name="eeeeeee" path="http://www.grodansparadis.com/beijing/images/beijing6.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 6 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing7.png" 
+	<picture name="ffffff" path="http://www.grodansparadis.com/beijing/images/beijing7.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 7 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing8.png" 
+	<picture name="ggggggg" path="http://www.grodansparadis.com/beijing/images/beijing8.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 8 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing9.png" 
+	<picture name="hhhhhh" path="http://www.grodansparadis.com/beijing/images/beijing9.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 9 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing10.png" 
+	<picture name="iiiiiiiiii" path="http://www.grodansparadis.com/beijing/images/beijing10.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 10 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing11.png" 
+	<picture name="jjjjjjjjjjj" path="http://www.grodansparadis.com/beijing/images/beijing11.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 11 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing11_connectors.png" 
+	<picture name="kkkkkkkkkk" path="http://www.grodansparadis.com/beijing/images/beijing11_connectors.png" 
 		format="png" >
 		<description lang="en" >
 		Picture of Beijing module connectors.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing12.png" 
+	<picture name="llllllll" path="http://www.grodansparadis.com/beijing/images/beijing12.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 12 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing13.png" 
+	<picture name="mmmmmmmmmmm" path="http://www.grodansparadis.com/beijing/images/beijing13.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 13 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing14.png" 
+	<picture name="nnnnnnnnnn" path="http://www.grodansparadis.com/beijing/images/beijing14.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 14 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing15.png" 
+	<picture name="oooooooooooooo" path="http://www.grodansparadis.com/beijing/images/beijing15.png" 
 		format="png" >
 		<description lang="en" >
 		Picture 15 of Beijing module.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing15_terminal_block.png" 
+	<picture name="ppppppp" path="http://www.grodansparadis.com/beijing/images/beijing15_terminal_block.png" 
 		format="png" >
 		<description lang="en" >
 		Picture of Beijing module terminal block.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing_sch_rev_B.png" 
+	<picture name="qqqqqqqqq" path="http://www.grodansparadis.com/beijing/images/beijing_sch_rev_B.png" 
 		format="png" >
 		<description lang="en" >
 		Beijing schema for reversion B.
 		</description>
 	</picture>
-	<picture path="http://www.grodansparadis.com/beijing/images/beijing_brd_rev_B.png" 
+	<picture name="rrrrrrrrrrrr" path="http://www.grodansparadis.com/beijing/images/beijing_brd_rev_B.png" 
 		format="png" >
 		<description lang="en" >
 		Beijing PCB board layout for reversion B.
 		</description>
 	</picture>
 	
-  <video path="https://www.youtube.com/watch?v=T6eMvXFfOrU"
+  <video name="video1" path="https://www.youtube.com/watch?v=T6eMvXFfOrU"
     format="mpeg4" >
     <description lang="en" >
 		Metallica 2023-06-18 - Ullevi, Gothenburg, Sweden 
diff --git a/src/cdlgmdfbootloader.cpp b/src/cdlgmdfbootloader.cpp
new file mode 100644
index 00000000..f9f27e76
--- /dev/null
+++ b/src/cdlgmdfbootloader.cpp
@@ -0,0 +1,276 @@
+// cdlgmdfbootloader.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdfbootloader.h"
+#include "ui_cdlgmdfbootloader.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfBootLoader::CDlgMdfBootLoader(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfBootLoader)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // Fill combo with predefined bootloader algorithms (vscp.h)
+  ui->comboBoxAlgorithm->addItem("VSCP", VSCP_BOOTLOADER_VSCP); // VSCP boot loader algorithm
+  ui->comboBoxAlgorithm->addItem("PIC1", VSCP_BOOTLOADER_PIC1); //  PIC algorithm 0
+  ui->comboBoxAlgorithm->addItem("Reserved (0x02)", 2);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x03)", 3);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x04)", 4);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x05)", 5);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x06)", 6);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x07)", 7);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x08)", 8);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x09)", 9);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0A)", 10);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0B)", 11);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0C)", 12);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0D)", 13);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0E)", 14);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x0F)", 15);
+  ui->comboBoxAlgorithm->addItem("AVR1", VSCP_BOOTLOADER_AVR1); //  AVR algorithm 0
+  ui->comboBoxAlgorithm->addItem("Reserved (0x11)", 0x11);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x12)", 0x12);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x13)", 0x13);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x14)", 0x14);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x15)", 0x15);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x16)", 0x16);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x17)", 0x17);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x18)", 0x18);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x19)", 0x19);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x1A)", 0x1A);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x1B)", 0x1B);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x1C)", 0x1C);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x1D)", 0x1D);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x1E)", 0x1E);
+  ui->comboBoxAlgorithm->addItem("NXP1", VSCP_BOOTLOADER_LPC1);            //  NXP/Philips/Freescale algorithm 0
+  ui->comboBoxAlgorithm->addItem("Reserved (0x21)", 0x21);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x22)", 0x22);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x23)", 0x23);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x24)", 0x24);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x25)", 0x25);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x26)", 0x26);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x27)", 0x27);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x28)", 0x28);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x29)", 0x29);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x2A)", 0x2A);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x2B)", 0x2B);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x2C)", 0x2C);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x2D)", 0x2D);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x2E)", 0x2E);
+  ui->comboBoxAlgorithm->addItem("ST", VSCP_BOOTLOADER_ST);                //  ST STR algorithm 0
+  ui->comboBoxAlgorithm->addItem("Reserved (0x31)", 0x31);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x32)", 0x32);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x33)", 0x33);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x34)", 0x34);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x35)", 0x35);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x36)", 0x36);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x37)", 0x37);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x38)", 0x38);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x39)", 0x39);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x3A)", 0x3A);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x3B)", 0x3B);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x3C)", 0x3C);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x3D)", 0x3D);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x3E)", 0x3E);
+  ui->comboBoxAlgorithm->addItem("FREESCALE", VSCP_BOOTLOADER_FREESCALE);  //  Freescale Kinetics algorithm 0
+  ui->comboBoxAlgorithm->addItem("Reserved (0x41)", 0x41);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x42)", 0x42);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x43)", 0x43);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x44)", 0x44);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x45)", 0x45);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x46)", 0x46);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x47)", 0x47);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x48)", 0x48);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x49)", 0x49);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x4A)", 0x4A);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x4B)", 0x4B);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x4C)", 0x4C);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x4D)", 0x4D);
+  ui->comboBoxAlgorithm->addItem("Reserved (0x4E)", 0x4E);
+  ui->comboBoxAlgorithm->addItem("ESP", VSCP_BOOTLOADER_ESP);              //  Espressif algorithm 0
+  for ( int i=0x51; i<VSCP_BOOTLOADER_NONE0; i++) {
+    QString str = QString("Reserved 0x%d").arg(i, 2, 16);
+    ui->comboBoxAlgorithm->addItem(str, i);
+  }
+  ui->comboBoxAlgorithm->addItem("User 0", VSCP_BOOTLOADER_NONE0);         //  Used defined bootloader 0
+  ui->comboBoxAlgorithm->addItem("User 1", VSCP_BOOTLOADER_NONE1);         //  Used defined bootloader 1
+  ui->comboBoxAlgorithm->addItem("User 2", VSCP_BOOTLOADER_NONE2);         //  Used defined bootloader 2
+  ui->comboBoxAlgorithm->addItem("User 3", VSCP_BOOTLOADER_NONE3);         //  Used defined bootloader 3
+  ui->comboBoxAlgorithm->addItem("User 4", VSCP_BOOTLOADER_NONE4);         //  Used defined bootloader 4
+  ui->comboBoxAlgorithm->addItem("User 5", VSCP_BOOTLOADER_NONE5);         //  Used defined bootloader 5
+  ui->comboBoxAlgorithm->addItem("User 6", VSCP_BOOTLOADER_NONE6);         //  Used defined bootloader 6
+  ui->comboBoxAlgorithm->addItem("User 7", VSCP_BOOTLOADER_NONE7);         //  Used defined bootloader 7
+  ui->comboBoxAlgorithm->addItem("User 8", VSCP_BOOTLOADER_NONE8);         //  Used defined bootloader 8
+  ui->comboBoxAlgorithm->addItem("User 9", VSCP_BOOTLOADER_NONE9);         //  Used defined bootloader 9
+  ui->comboBoxAlgorithm->addItem("User 10", VSCP_BOOTLOADER_NONE10);       //  Used defined bootloader 10
+  ui->comboBoxAlgorithm->addItem("User 11", VSCP_BOOTLOADER_NONE11);       //  Used defined bootloader 11
+  ui->comboBoxAlgorithm->addItem("User 12", VSCP_BOOTLOADER_NONE12);       // Used defined bootloader 12
+  ui->comboBoxAlgorithm->addItem("User 13", VSCP_BOOTLOADER_NONE13);       //  Used defined bootloader 13
+  ui->comboBoxAlgorithm->addItem("User 14", VSCP_BOOTLOADER_NONE14);       //  Used defined bootloader 14
+  ui->comboBoxAlgorithm->addItem("No bootloader", VSCP_BOOTLOADER_NONE15); //  No bootloader available
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfBootLoader::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfBootLoader::~CDlgMdfBootLoader()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfBootLoader::initDialogData(const CMDF_Object* pmdfobj, mdf_bootloader_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_pbootinfo = (CMDF_BootLoaderInfo*)pmdfobj;
+
+  ui->editBlockSize->setText(QString::number(m_pbootinfo->getBlockSize()));
+  ui->editBlockCount->setText(QString::number(m_pbootinfo->getBlockCount()));
+  ui->comboBoxAlgorithm->setCurrentIndex(m_pbootinfo->getAlgorithm());
+
+  switch (index) {
+    case index_bootloader_blockcount:
+      ui->editBlockCount->setFocus();
+      break;
+
+    case index_bootloader_algorithm:
+      ui->comboBoxAlgorithm->setFocus();
+      break;
+
+    case index_bootloader_blocksize:
+    default:
+      ui->editBlockSize->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfBootLoader::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// getBlocksize
+//
+
+uint32_t
+CDlgMdfBootLoader::getBlockSize(void)
+{
+  return (vscp_readStringValue(ui->editBlockSize->text().toStdString()));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setBlocksize
+//
+
+void
+CDlgMdfBootLoader::setBlockSize(uint32_t blocksize)
+{
+  QString str = QString::number(blocksize);
+  ui->editBlockSize->setText(str);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfBootLoader::accept()
+{
+  std::string str;
+  if (nullptr != m_pbootinfo) {
+
+    str = ui->editBlockSize->text().toStdString();
+    m_pbootinfo->setBlocksize(vscp_readStringValue(str));
+
+    str = ui->editBlockCount->text().toStdString();
+    m_pbootinfo->setBlockCount(vscp_readStringValue(str));
+
+    // m_pbootinfo->setModuleLevel(ui->comboModuleLevel->currentIndex());
+
+    int idx = ui->comboBoxAlgorithm->currentIndex(); //  ->text().toStdString();
+    m_pbootinfo->setAlgorithm(idx);
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdfbootloader.h b/src/cdlgmdfbootloader.h
new file mode 100644
index 00000000..5aeea9ec
--- /dev/null
+++ b/src/cdlgmdfbootloader.h
@@ -0,0 +1,110 @@
+// cdlgmdfbootloader.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFBOOTLOADER_H
+#define CDLGMDFBOOTLOADER_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_bootloader_index {
+  index_bootloader_none = 0,
+  index_bootloader_blocksize,
+  index_bootloader_blockcount,
+  index_bootloader_algorithm,
+} mdf_bootloader_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_BOOTLOADER_BLOCKSIZE tr("Block size : ")
+#define PREFIX_MDF_BOOTLOADER_NUMBER_OF_BLOCKS tr("Number of blocks: ")
+#define PREFIX_MDF_BOOTLOADER_ALGORITHM tr("Algorithm: ")
+
+namespace Ui {
+class CDlgMdfBootLoader;
+}
+
+class CDlgMdfBootLoader : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfBootLoader(QWidget* parent = nullptr);
+  ~CDlgMdfBootLoader();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_bootloader_index index = index_bootloader_blocksize);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setBlockSize(uint32_t size);
+  uint32_t getBlockSize(void);
+
+  /*!
+      GUID getter/setters
+  */
+  void setNumberOfBlocks(uint32_t nob);
+  uint32_t getNumberOfBlocks(void);
+
+  /*!
+      GUID getter/setters
+  */
+  void setAlgorithm(uint16_t nAlgorithm);
+  uint16_t getAlgorithm(void);
+
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfBootLoader* ui;
+  CMDF_BootLoaderInfo* m_pbootinfo;
+};
+
+#endif // CDLGMDFBOOTLOADER_H
diff --git a/src/cdlgmdfbootloader.ui b/src/cdlgmdfbootloader.ui
index c754aca4..1f91271e 100644
--- a/src/cdlgmdfbootloader.ui
+++ b/src/cdlgmdfbootloader.ui
@@ -7,17 +7,17 @@
     <x>0</x>
     <y>0</y>
     <width>604</width>
-    <height>147</height>
+    <height>158</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Bootloader info</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>110</y>
+     <y>120</y>
      <width>581</width>
      <height>32</height>
     </rect>
@@ -35,13 +35,29 @@
   <widget class="QWidget" name="formLayoutWidget">
    <property name="geometry">
     <rect>
-     <x>9</x>
-     <y>9</y>
+     <x>10</x>
+     <y>10</y>
      <width>581</width>
-     <height>95</height>
+     <height>101</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Algorithm</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="comboBoxAlgorithm">
+      <item>
+       <property name="text">
+        <string>VSCP</string>
+       </property>
+      </item>
+     </widget>
+    </item>
     <item row="1" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
@@ -50,7 +66,7 @@
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+     <widget class="QLineEdit" name="editBlockSize">
       <property name="text">
        <string>0x1000</string>
       </property>
@@ -64,31 +80,64 @@
      </widget>
     </item>
     <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+     <widget class="QLineEdit" name="editBlockCount">
       <property name="text">
        <string>10</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Algorithm</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>VSCP</string>
-       </property>
-      </item>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfBootLoader</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>125</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>73</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfBootLoader</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>125</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>73</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>helpRequested()</signal>
+   <receiver>CDlgMdfBootLoader</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>125</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>73</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffile.cpp b/src/cdlgmdffile.cpp
new file mode 100644
index 00000000..34220e2c
--- /dev/null
+++ b/src/cdlgmdffile.cpp
@@ -0,0 +1,505 @@
+// cdlgmdffile.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilepicture.h"
+#include "cdlgmdffilevideo.h"
+#include "cdlgmdffilefirmware.h"
+#include "cdlgmdffiledriver.h"
+#include "cdlgmdffilesetup.h"
+#include "cdlgmdffilemanual.h"
+
+#include "cdlgmdffile.h"
+#include "ui_cdlgmdffile.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFile::CDlgMdfFile(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFile)
+{
+  ui->setupUi(this);
+
+  m_type = mdf_type_unknown;
+  m_pmdf = nullptr;
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFile::~CDlgMdfFile()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFile::initDialogData(const CMDF_Object* pmdfobj, mdf_record_type type, int index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_type = type;
+  m_pmdf = (CMDF*)pmdfobj;
+
+  connect(ui->btnAddFile, &QToolButton::clicked, this, &CDlgMdfFile::addFileItem);
+  connect(ui->btnEditFile, &QToolButton::clicked, this, &CDlgMdfFile::editFileItem);
+  connect(ui->btnDupFile, &QToolButton::clicked, this, &CDlgMdfFile::dupFileItem);
+  connect(ui->btnDelFile, &QToolButton::clicked, this, &CDlgMdfFile::deleteFileItem);
+
+  switch (type) {
+
+    case mdf_type_picture: {
+      setWindowTitle(tr("Picture files"));
+      ui->comboFileType->setCurrentIndex(index_picture);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getPictureCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Picture* pPictureObj;
+
+      do {
+        pPictureObj = m_pmdf->getPictureObj(index);
+        if (nullptr != pPictureObj) {
+          ui->listFile->addItem(QString("Picture %1 - ").arg(index) + pPictureObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pPictureObj);
+    } break;
+
+    case mdf_type_picture_item:
+      setWindowTitle(tr("Picture files"));
+      break;
+
+    case mdf_type_video: {
+      setWindowTitle(tr("Video files"));
+      ui->comboFileType->setCurrentIndex(index_video);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getVideoCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Video* pVideoObj;
+
+      do {
+        pVideoObj = m_pmdf->getVideoObj(index);
+        if (nullptr != pVideoObj) {
+          ui->listFile->addItem(QString("Video %1 - ").arg(index) + pVideoObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pVideoObj);
+    } break;
+
+    case mdf_type_video_item: {
+      setWindowTitle(tr("Video files"));
+    } break;
+
+    case mdf_type_firmware: {
+      setWindowTitle(tr("Firmware files"));
+      ui->comboFileType->setCurrentIndex(index_firmware);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getFirmwareCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Firmware* pFirmwareObj;
+
+      do {
+        pFirmwareObj = m_pmdf->getFirmwareObj(index);
+        if (nullptr != pFirmwareObj) {
+          ui->listFile->addItem(QString("Firmware %1 - ").arg(index) + pFirmwareObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pFirmwareObj);
+    } break;
+
+    case mdf_type_firmware_item:
+      setWindowTitle(tr("Firmware files"));
+      break;
+
+    case mdf_type_driver: {
+      setWindowTitle(tr("Driver files"));
+      ui->comboFileType->setCurrentIndex(index_driver);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getDriverCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Driver* pDriverObj;
+
+      do {
+        pDriverObj = m_pmdf->getDriverObj(index);
+        if (nullptr != pDriverObj) {
+          ui->listFile->addItem(QString("Driver %1 - ").arg(index) + pDriverObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pDriverObj);
+    } break;
+
+    case mdf_type_driver_item:
+      setWindowTitle(tr("Driver files"));
+      break;
+
+    case mdf_type_setup: {
+      setWindowTitle(tr("Setup script files"));
+      ui->comboFileType->setCurrentIndex(index_setup);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getSetupCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Setup* pSetupObj;
+
+      do {
+        pSetupObj = m_pmdf->getSetupObj(index);
+        if (nullptr != pSetupObj) {
+          ui->listFile->addItem(QString("Setup %1 - ").arg(index) + pSetupObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pSetupObj);
+    } break;
+
+    case mdf_type_setup_item:
+      setWindowTitle(tr("Setup script files"));
+      break;
+
+    case mdf_type_manual: {
+      setWindowTitle(tr("Manual files"));
+      ui->comboFileType->setCurrentIndex(index_manual);
+      ui->comboFileType->setEnabled(false);
+
+      // Return if noting to render
+      if (!m_pmdf->getManualCount()) {
+        return;
+      }
+
+      int index = 0;
+      CMDF_Manual* pManualObj;
+
+      do {
+        pManualObj = m_pmdf->getManualObj(index);
+        if (nullptr != pManualObj) {
+          ui->listFile->addItem(QString("Manual %1 - ").arg(index) + pManualObj->getName().c_str());
+        }
+
+        index++;
+      } while (nullptr != pManualObj);
+    } break;
+
+    case mdf_type_manual_item:
+      setWindowTitle(tr("Manual files"));
+      break;
+  }
+
+  // ui->editName->setText(m_pfile->getName().c_str());
+  // ui->editUrl->setText(m_pfile->getUrl().c_str());
+  // ui->editType->setText(m_pfile->getType().c_str());
+  // ui->editOs->setText(m_pfile->getOS().c_str());
+  // ui->editArchitecture->setText(m_pfile->getArchitecture().c_str());
+  // ui->editOsVersion->setText(m_pfile->getOSVer().c_str());
+  // ui->editVersion->setText(m_pfile->getVersion().c_str());
+
+  // QDate dd = QDate::fromString(m_pfile->getDate().c_str(),"YY-MM_DD");
+  // ui->date->setDate(dd);
+
+  // switch (index) {
+  //   case index_file_name:
+  //     ui->editName->setFocus();
+  //     break;
+
+  //   case index_file_url:
+  //     ui->editUrl->setFocus();
+  //     break;
+
+  //   case index_file_type:
+  //     ui->editType->setFocus();
+  //     break;
+
+  //   case index_file_os:
+  //     ui->editOs->setFocus();
+  //     break;
+
+  //   case index_file_architecture:
+  //     ui->editArchitecture->setFocus();
+  //     break;
+
+  //   case index_file_os_version:
+  //     ui->editOsVersion->setFocus();
+  //     break;
+
+  //   case index_file_date:
+  //     ui->date->setFocus();
+  //     break;
+
+  //   case index_file_version:
+  //     ui->editVersion->setFocus();
+  //     break;
+
+  //   case index_file_none:
+  //   default:
+  //     ui->editName->setFocus();
+  //     break;
+  // }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFile::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// addFileItem
+//
+
+void
+CDlgMdfFile::addFileItem(void)
+{
+  switch (m_type) {
+
+    case mdf_type_picture: {
+      CMDF_Picture *pobj = m_pmdf->getPictureObj(ui->listFile->currentRow());
+      CDlgMdfFilePicture dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+    case mdf_type_video: {
+      CMDF_Video *pobj = m_pmdf->getVideoObj(ui->listFile->currentRow());
+      CDlgMdfFileVideo dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+    case mdf_type_firmware: {
+      CMDF_Firmware *pobj = m_pmdf->getFirmwareObj(ui->listFile->currentRow());
+      CDlgMdfFileFirmware dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+
+    case mdf_type_driver: {
+      CMDF_Driver *pobj = m_pmdf->getDriverObj(ui->listFile->currentRow());
+      CDlgMdfFileDriver dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+    case mdf_type_setup: {
+      CMDF_Setup *pobj = m_pmdf->getSetupObj(ui->listFile->currentRow());
+      CDlgMdfFileSetup dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+    case mdf_type_manual: {
+      CMDF_Manual *pobj = m_pmdf->getManualObj(ui->listFile->currentRow());
+      CDlgMdfFileManual dlg(this);
+      dlg.initDialogData(pobj /*, &selstr*/);
+      if (QDialog::Accepted == dlg.exec()) {
+        // ui->listDescription->clear();
+        // fillDescription();
+      }
+    } break;
+
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// editFileItem
+//
+
+void
+CDlgMdfFile::editFileItem(void)
+{
+  // if (-1 != ui->listDescription->currentRow()) {
+
+  //   // Save the row
+  //   int idx = ui->listDescription->currentRow();
+
+  //   QListWidgetItem* pitem = ui->listDescription->currentItem();
+  //   QString selstr         = pitem->text().split('_').first().left(2);
+
+  //   CDlgMdfDescription dlg(this);
+  //   dlg.initDialogData(m_pitemobj->getMapDescription(), &selstr);
+  //   if (QDialog::Accepted == dlg.exec()) {
+  //     ui->listDescription->clear();
+  //     fillDescription();
+  //     ui->listDescription->setCurrentRow(idx);
+  //   }
+  // }
+  // else {
+  //   QMessageBox::warning(this, tr("vscpworks+"), tr("An item must be selected"), QMessageBox::Ok);
+  // }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// dupFileItem
+//
+
+void
+CDlgMdfFile::dupFileItem(void)
+{
+  // if (-1 != ui->listDescription->currentRow()) {
+  //   CDlgMdfDescription dlg(this);
+  //   dlg.initDialogData(m_pitemobj->getMapDescription());
+  //   if (QDialog::Accepted == dlg.exec()) {
+  //     ui->listDescription->clear();
+  //     fillDescription();
+  //   }
+  // }
+  // else {
+  //   QMessageBox::warning(this, tr("vscpworks+"), tr("An item must be selected"), QMessageBox::Ok);
+  // }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// deleteFileItem
+//
+
+void
+CDlgMdfFile::deleteFileItem(void)
+{
+  // if (-1 != ui->listDescription->currentRow()) {
+
+  //   // Save the row
+  //   int idx = ui->listDescription->currentRow();
+
+  //   QListWidgetItem* pitem = ui->listDescription->currentItem();
+  //   QString selstr         = pitem->text().split('_').first().left(2);
+
+  //   m_pitemobj->getMapDescription()->erase(selstr.toStdString());
+  //   ui->listDescription->clear();
+  //   fillDescription();
+  // }
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFile::accept()
+{
+  std::string str;
+  if (nullptr != m_pmdf) {
+
+    /*  str = ui->editBlockSize->text().toStdString();
+     m_pbootinfo->setBlocksize(vscp_readStringValue(str));
+
+     str = ui->editBlockCount->text().toStdString();
+     m_pbootinfo->setBlockCount(vscp_readStringValue(str));
+
+     // m_pbootinfo->setModuleLevel(ui->comboModuleLevel->currentIndex());
+
+     int idx = ui->comboBoxAlgorithm->currentIndex(); //  ->text().toStdString();
+     m_pbootinfo->setAlgorithm(idx); */
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffile.h b/src/cdlgmdffile.h
new file mode 100644
index 00000000..c432ade1
--- /dev/null
+++ b/src/cdlgmdffile.h
@@ -0,0 +1,95 @@
+// cdlgmdffile.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFILE_H
+#define CDLGMDFFILE_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+
+
+namespace Ui {
+class CDlgMdfFile;
+}
+
+class CDlgMdfFile : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFile(QWidget* parent = nullptr);
+  ~CDlgMdfFile();
+
+  const int index_picture = 0;
+  const int index_video = 1;
+  const int index_firmware = 2;
+  const int index_driver = 3;
+  const int index_setup = 4;
+  const int index_manual = 5;
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index Selected file item
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_record_type type, int index = 0);
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+
+
+public slots:
+
+  // File item buttons
+  void addFileItem(void);
+  void editFileItem(void);
+  void dupFileItem(void);
+  void deleteFileItem(void);
+
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFile* ui;
+
+  mdf_record_type m_type;
+  CMDF* m_pmdf;
+};
+
+#endif // CDLGMDFFILE_H
diff --git a/src/cdlgmdffile.ui b/src/cdlgmdffile.ui
index ce520757..fa6c20d6 100644
--- a/src/cdlgmdffile.ui
+++ b/src/cdlgmdffile.ui
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CDlgMdfBit</class>
- <widget class="QDialog" name="CDlgMdfBit">
+ <class>CDlgMdfFile</class>
+ <widget class="QDialog" name="CDlgMdfFile">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>597</width>
-    <height>320</height>
+    <width>660</width>
+    <height>386</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Contact</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>280</y>
-     <width>591</width>
+     <x>10</x>
+     <y>350</y>
+     <width>641</width>
      <height>32</height>
     </rect>
    </property>
@@ -37,8 +37,8 @@
     <rect>
      <x>9</x>
      <y>9</y>
-     <width>581</width>
-     <height>261</height>
+     <width>641</width>
+     <height>331</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
@@ -50,132 +50,180 @@
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QComboBox" name="comboBox">
+     <widget class="QComboBox" name="comboFileType">
       <item>
        <property name="text">
-        <string>Value</string>
+        <string>Picture</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Value List</string>
+        <string>Video</string>
        </property>
       </item>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Name</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
-      <property name="text">
-       <string>name-of-bit</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>Pos</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_2">
-      <property name="text">
-       <string>0</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label_4">
-      <property name="text">
-       <string>Width</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
-      <property name="text">
-       <string>1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="label_5">
-      <property name="text">
-       <string>Default</string>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
-      <property name="text">
-       <string>true</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_7">
-      <property name="text">
-       <string>Min</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
-      <property name="text">
-       <string>0</string>
-      </property>
-     </widget>
-    </item>
-    <item row="6" column="0">
-     <widget class="QLabel" name="label_6">
-      <property name="text">
-       <string>Max</string>
-      </property>
-     </widget>
-    </item>
-    <item row="6" column="1">
-     <widget class="QLineEdit" name="lineEdit_5">
-      <property name="text">
-       <string>1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="7" column="1">
-     <widget class="QComboBox" name="comboBox_2">
       <item>
        <property name="text">
-        <string>Read/Write</string>
+        <string>Firmware</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Read Only</string>
+        <string>Driver</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Write Only</string>
+        <string>Setup Script</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Manual</string>
        </property>
       </item>
      </widget>
     </item>
-    <item row="7" column="0">
-     <widget class="QLabel" name="label_8">
+    <item row="1" column="0">
+     <widget class="QLabel" name="label_3">
       <property name="text">
-       <string>Access</string>
+       <string>Files</string>
       </property>
      </widget>
     </item>
+    <item row="1" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QListWidget" name="listFile"/>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QToolButton" name="btnAddFile">
+            <property name="toolTip">
+             <string>Add description item</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="vscpworks.qrc">
+              <normaloff>:/add.png</normaloff>:/add.png</iconset>
+            </property>
+            <property name="shortcut">
+             <string>Ctrl+A</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="btnEditFile">
+            <property name="toolTip">
+             <string>Edit description item</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="vscpworks.qrc">
+              <normaloff>:/pencil.svg</normaloff>:/pencil.svg</iconset>
+            </property>
+            <property name="shortcut">
+             <string>Ctrl+E</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="btnDupFile">
+            <property name="toolTip">
+             <string>Duplicate description item</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="vscpworks.qrc">
+              <normaloff>:/images/svg/copy.svg</normaloff>:/images/svg/copy.svg</iconset>
+            </property>
+            <property name="shortcut">
+             <string>Ctrl+D</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="btnDelFile">
+            <property name="toolTip">
+             <string>Delete Description item</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="vscpworks.qrc">
+              <normaloff>:/remove.png</normaloff>:/remove.png</iconset>
+            </property>
+            <property name="shortcut">
+             <string>Ctrl+X</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
  </widget>
- <resources/>
- <connections/>
+ <resources>
+  <include location="vscpworks.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFile</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>325</x>
+     <y>505</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>329</x>
+     <y>263</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFile</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>325</x>
+     <y>505</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>329</x>
+     <y>263</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffiledriver.cpp b/src/cdlgmdffiledriver.cpp
new file mode 100644
index 00000000..91481c69
--- /dev/null
+++ b/src/cdlgmdffiledriver.cpp
@@ -0,0 +1,347 @@
+// cdlgmdfdriver.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffiledriver.h"
+#include "ui_cdlgmdffiledriver.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFileDriver::CDlgMdfFileDriver(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFileDriver)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+ 
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFileDriver::~CDlgMdfFileDriver()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFileDriver::initDialogData(const CMDF_Object* pmdfobj, mdf_driver_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_pdriver = (CMDF_Driver*)pmdfobj;
+
+  ui->editName->setText(m_pdriver->getName().c_str());
+  ui->editUrl->setText(m_pdriver->getUrl().c_str());
+  ui->editType->setText(m_pdriver->getType().c_str());
+  ui->editOs->setText(m_pdriver->getOS().c_str());
+  ui->editArchitecture->setText(m_pdriver->getArchitecture().c_str());
+  ui->editOsVersion->setText(m_pdriver->getOSVer().c_str());
+  ui->editVersion->setText(m_pdriver->getVersion().c_str());
+
+  QDate dd = QDate::fromString(m_pdriver->getDate().c_str(),"YY-MM_DD");
+  ui->date->setDate(dd); 
+
+
+  switch (index) {
+    case index_driver_name:
+      ui->editName->setFocus();
+      break;
+
+    case index_driver_url:
+      ui->editUrl->setFocus();
+      break;
+
+    case index_driver_type:
+      ui->editType->setFocus();
+      break;  
+
+    case index_driver_os:
+      ui->editOs->setFocus();
+      break;
+
+    case index_driver_architecture:
+      ui->editArchitecture->setFocus();
+      break;  
+
+    case index_driver_os_version:
+      ui->editOsVersion->setFocus();
+      break;  
+
+    case index_driver_date:
+      ui->date->setFocus();
+      break;  
+
+    case index_driver_version:
+      ui->editVersion->setFocus();
+      break;  
+
+    case index_driver_none:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFileDriver::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFileDriver::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileDriver::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFileDriver::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFileDriver::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setType
+//
+
+void
+CDlgMdfFileDriver::setType(const QString& name)
+{
+  ui->editType->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getType
+//
+
+QString
+CDlgMdfFileDriver::getType(void)
+{
+  return ui->editType->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setOs
+//
+
+void
+CDlgMdfFileDriver::setOs(const QString& name)
+{
+  ui->editOs->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getOs
+//
+
+QString
+CDlgMdfFileDriver::getOs(void)
+{
+  return ui->editOs->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setArchitecture
+//
+
+void
+CDlgMdfFileDriver::setArchitecture(const QString& name)
+{
+  ui->editArchitecture->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getArchitecture
+//
+
+QString
+CDlgMdfFileDriver::getArchitecture(void)
+{
+  return ui->editArchitecture->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setOsVersion
+//
+
+void
+CDlgMdfFileDriver::setOsVersion(const QString& name)
+{
+  ui->editOsVersion->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getOsVersion
+//
+
+QString
+CDlgMdfFileDriver::getOsVersion(void)
+{
+  return ui->editOsVersion->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFileDriver::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate,"YY-MM_DD");
+  ui->date->setDate(dd); 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFileDriver::getDate(void)
+{
+  QDate dd = ui->date->date(); 
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setVersion
+//
+
+void
+CDlgMdfFileDriver::setVersion(const QString& ver)
+{
+  ui->editVersion->setText(ver);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getVersion
+//
+
+QString
+CDlgMdfFileDriver::getVersion(void)
+{
+  return ui->editVersion->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFileDriver::accept()
+{
+  std::string str;
+  if (nullptr != m_pdriver) {
+
+   /*  str = ui->editBlockSize->text().toStdString();
+    m_pbootinfo->setBlocksize(vscp_readStringValue(str));
+
+    str = ui->editBlockCount->text().toStdString();
+    m_pbootinfo->setBlockCount(vscp_readStringValue(str));
+
+    // m_pbootinfo->setModuleLevel(ui->comboModuleLevel->currentIndex());
+
+    int idx = ui->comboBoxAlgorithm->currentIndex(); //  ->text().toStdString();
+    m_pbootinfo->setAlgorithm(idx); */
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffiledriver.h b/src/cdlgmdffiledriver.h
new file mode 100644
index 00000000..b4823402
--- /dev/null
+++ b/src/cdlgmdffiledriver.h
@@ -0,0 +1,147 @@
+// cdlgmdfdriver.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFDRIVER_H
+#define CDLGMDFDRIVER_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_driver_index {
+  index_driver_none = 0,
+  index_driver_name,
+  index_driver_url,
+  index_driver_type,
+  index_driver_os,
+  index_driver_architecture,
+  index_driver_os_version,
+  index_driver_date,
+  index_driver_version,
+} mdf_driver_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_DRIVER_NAME tr("Name: ")
+#define PREFIX_MDF_DRIVER_TYPE tr("Type: ")
+#define PREFIX_MDF_DRIVER_OS tr("OS: ")
+#define PREFIX_MDF_DRIVER_ARCHITECTURE tr("Architecture: ")
+#define PREFIX_MDF_DRIVER_DATE tr("Date: ")
+#define PREFIX_MDF_DRIVER_OS_VERSION tr("OS Version: ")
+
+namespace Ui {
+class CDlgMdfFileDriver;
+}
+
+class CDlgMdfFileDriver : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFileDriver(QWidget* parent = nullptr);
+  ~CDlgMdfFileDriver();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_driver_index index = index_driver_none);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Type getter/setters
+  */
+  void setType(const QString& type);
+  QString getType(void);
+
+  /*!
+      OS getter/setters
+  */
+  void setOs(const QString& os);
+  QString getOs(void);
+
+  /*!
+      Architecture getter/setters
+  */
+  void setArchitecture(const QString& arch);
+  QString getArchitecture(void); 
+
+  /*!
+      OS Version getter/setters
+  */
+  void setOsVersion(const QString& version);
+  QString getOsVersion(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& isodate);
+  QString getDate(void);
+
+  /*!
+      Version getter/setters
+  */
+  void setVersion(const QString& type);
+  QString getVersion(void);
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFileDriver* ui;
+  CMDF_Driver* m_pdriver;
+};
+
+#endif // CDLGMDFDRIVER_H
diff --git a/src/cdlgmdffiledriver.ui b/src/cdlgmdffiledriver.ui
index d62649d7..a31eea89 100644
--- a/src/cdlgmdffiledriver.ui
+++ b/src/cdlgmdffiledriver.ui
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CDlgMdfFileVideo</class>
- <widget class="QDialog" name="CDlgMdfFileVideo">
+ <class>CDlgMdfFileDriver</class>
+ <widget class="QDialog" name="CDlgMdfFileDriver">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>604</width>
-    <height>315</height>
+    <height>304</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>MDF Driver</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
      <x>10</x>
@@ -50,7 +50,7 @@
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+     <widget class="QLineEdit" name="editName">
       <property name="text">
        <string>name-of-driver</string>
       </property>
@@ -64,7 +64,7 @@
      </widget>
     </item>
     <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+     <widget class="QLineEdit" name="editUrl">
       <property name="text">
        <string>https://www.somewhere.com/driver.zip</string>
       </property>
@@ -77,127 +77,107 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>VSCP Daemon</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>CANAL</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="7" column="0">
-     <widget class="QLabel" name="label_5">
+    <item row="4" column="0">
+     <widget class="QLabel" name="label_3">
       <property name="text">
-       <string>Date</string>
+       <string>OS</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
+    <item row="4" column="1">
+     <widget class="QLineEdit" name="editOs"/>
+    </item>
+    <item row="5" column="0">
+     <widget class="QLabel" name="label_8">
       <property name="text">
-       <string>ISO-date</string>
+       <string>Architecture</string>
       </property>
      </widget>
     </item>
-    <item row="8" column="0">
-     <widget class="QLabel" name="label_7">
+    <item row="5" column="1">
+     <widget class="QLineEdit" name="editArchitecture"/>
+    </item>
+    <item row="6" column="0">
+     <widget class="QLabel" name="label_6">
       <property name="text">
-       <string>Version</string>
+       <string>OS Version</string>
       </property>
      </widget>
     </item>
-    <item row="8" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
+    <item row="6" column="1">
+     <widget class="QLineEdit" name="editOsVersion">
       <property name="text">
-       <string>0</string>
+       <string>10</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="label_3">
+    <item row="7" column="0">
+     <widget class="QLabel" name="label_5">
       <property name="text">
-       <string>OS</string>
+       <string>Date</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QComboBox" name="comboBox_2">
-      <item>
-       <property name="text">
-        <string>Windows</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Linux</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>IOS</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Android</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="6" column="0">
-     <widget class="QLabel" name="label_6">
-      <property name="text">
-       <string>OS Version</string>
+    <item row="7" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="6" column="1">
-     <widget class="QLineEdit" name="lineEdit_5">
+    <item row="8" column="0">
+     <widget class="QLabel" name="label_7">
       <property name="text">
-       <string>10</string>
+       <string>Version</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_8">
+    <item row="8" column="1">
+     <widget class="QLineEdit" name="editVersion">
       <property name="text">
-       <string>Architecture</string>
+       <string>0</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="1">
-     <widget class="QComboBox" name="comboBox_3">
-      <item>
-       <property name="text">
-        <string>X86</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>AMD64</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>ARM64</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Android</string>
-       </property>
-      </item>
-     </widget>
+    <item row="3" column="1">
+     <widget class="QLineEdit" name="editType"/>
     </item>
    </layout>
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFileDriver</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>285</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>157</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFileDriver</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>285</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>157</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffilefirmware.cpp b/src/cdlgmdffilefirmware.cpp
new file mode 100644
index 00000000..a60cb99d
--- /dev/null
+++ b/src/cdlgmdffilefirmware.cpp
@@ -0,0 +1,365 @@
+// cdlgmdffirmware.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilefirmware.h"
+#include "ui_cdlgmdffilefirmware.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFileFirmware::CDlgMdfFileFirmware(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFileFirmware)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfFileFirmware::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFileFirmware::~CDlgMdfFileFirmware()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFileFirmware::initDialogData(const CMDF_Object* pmdfobj, mdf_firmware_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_pfirmware = (CMDF_Firmware*)pmdfobj;
+
+  ui->editName->setText(m_pfirmware->getName().c_str());
+  ui->editTargetCode->setText(QString::number(m_pfirmware->getTargetCode()));
+  ui->editUrl->setText(m_pfirmware->getUrl().c_str());
+  ui->editFormat->setText(m_pfirmware->getFormat().c_str());
+
+  QDate dd = QDate::fromString(m_pfirmware->getDate().c_str(),"YY-MM_DD");
+  ui->date->setDate(dd); 
+
+  ui->editVersion->setText(m_pfirmware->getVersion().c_str());
+  ui->editSize->setText(QString::number(m_pfirmware->getSize()));
+  ui->editMd5->setText(m_pfirmware->getMd5().c_str());
+
+  switch (index) {
+    case index_firmware_name:
+      ui->editName->setFocus();
+      break;
+
+    case index_firmware_target_code:
+      ui->editTargetCode->setFocus();
+      break;
+
+    case index_firmware_format:
+      ui->editFormat->setFocus();
+      break;  
+
+    case index_firmware_date:
+      ui->date->setFocus();
+      break;  
+
+    case index_firmware_version:
+      ui->editVersion->setFocus();
+      break;  
+
+    case index_firmware_size:
+      ui->editSize->setFocus();
+      break;  
+
+    case index_firmware_md5:
+      ui->editMd5->setFocus();
+      break;  
+
+    case index_firmware_none:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFileFirmware::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFileFirmware::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileFirmware::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setTargetCode
+//
+
+void
+CDlgMdfFileFirmware::setTargetCode(uint16_t code)
+{
+  ui->editTargetCode->setText(QString::number(code));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getTargetCode
+//
+
+uint16_t
+CDlgMdfFileFirmware::getTargetCode(void)
+{
+  return vscp_readStringValue(ui->editTargetCode->text().toStdString());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFileFirmware::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFileFirmware::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setFormat
+//
+
+void
+CDlgMdfFileFirmware::setFormat(const QString& name)
+{
+  ui->editFormat->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileFirmware::getFormat(void)
+{
+  return ui->editFormat->text();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFileFirmware::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate,"YY-MM_DD");
+  ui->date->setDate(dd); 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFileFirmware::getDate(void)
+{
+  QDate dd = ui->date->date(); 
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setVersion
+//
+
+void
+CDlgMdfFileFirmware::setVersion(const QString& ver)
+{
+  ui->editVersion->setText(ver);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getVersion
+//
+
+QString
+CDlgMdfFileFirmware::getVersion(void)
+{
+  return ui->editVersion->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setSize
+//
+
+void
+CDlgMdfFileFirmware::setSize(size_t size)
+{
+  ui->editSize->setText(QString::number(size));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getSize
+//
+
+size_t
+CDlgMdfFileFirmware::getSize(void)
+{
+  return vscp_readStringValue(ui->editSize->text().toStdString());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setMd5
+//
+
+void
+CDlgMdfFileFirmware::setMd5(const QString& md5)
+{
+  ui->editMd5->setText(md5);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getMd5
+//
+
+QString
+CDlgMdfFileFirmware::getMd5(void)
+{
+  return ui->editMd5->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFileFirmware::accept()
+{
+  std::string str;
+  if (nullptr != m_pfirmware) {
+
+    str = ui->editName->text().toStdString();
+    m_pfirmware->setName(str);
+
+    str = ui->editTargetCode->text().toStdString();
+    m_pfirmware->setTargetCode(vscp_readStringValue(str));
+
+    str = ui->editUrl->text().toStdString();
+    m_pfirmware->setUrl(str);
+
+    str = ui->editFormat->text().toStdString();
+    m_pfirmware->setFormat(str);
+
+    str = ui->editVersion->text().toStdString();
+    m_pfirmware->setVersion(str);
+
+    str = ui->editSize->text().toStdString();
+    m_pfirmware->setSize(vscp_readStringValue(str));
+
+    str = ui->editMd5->text().toStdString();
+    m_pfirmware->setMd5(str);
+
+    // str = ui->editBlockCount->text().toStdString();
+    // m_pbootinfo->setBlockCount(vscp_readStringValue(str));
+
+    // // m_pbootinfo->setModuleLevel(ui->comboModuleLevel->currentIndex());
+
+    // int idx = ui->comboBoxAlgorithm->currentIndex(); //  ->text().toStdString();
+    // m_pbootinfo->setAlgorithm(idx);
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffilefirmware.h b/src/cdlgmdffilefirmware.h
new file mode 100644
index 00000000..3a1f24e3
--- /dev/null
+++ b/src/cdlgmdffilefirmware.h
@@ -0,0 +1,149 @@
+// cdlgmdffirmware.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFIRMWARE_H
+#define CDLGMDFFIRMWARE_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_firmware_index {
+  index_firmware_none = 0,
+  index_firmware_name,
+  index_firmware_target_code,
+  index_firmware_url,
+  index_firmware_format,
+  index_firmware_date,
+  index_firmware_version,
+  index_firmware_size,
+  index_firmware_md5,
+} mdf_firmware_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_FIRMWARE_NAME tr("Name: ")
+#define PREFIX_MDF_FIRMWARE_TARGET_CODE tr("Target Code: ")
+#define PREFIX_MDF_FIRMWARE_URL tr("URL: ")
+#define PREFIX_MDF_FIRMWARE_FORMAT tr("Format: ")
+#define PREFIX_MDF_FIRMWARE_DATE tr("Date: ")
+#define PREFIX_MDF_FIRMWARE_VERSION tr("Version: ")
+#define PREFIX_MDF_FIRMWARE_MAX tr("Size: ")
+#define PREFIX_MDF_FIRMWARE_ACCESS tr("MD5: ")
+
+namespace Ui {
+class CDlgMdfFileFirmware;
+}
+
+class CDlgMdfFileFirmware : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFileFirmware(QWidget* parent = nullptr);
+  ~CDlgMdfFileFirmware();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_firmware_index index = index_firmware_none);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      target code getter/setters
+  */
+  void setTargetCode(uint16_t code);
+  uint16_t getTargetCode(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Format getter/setters
+  */
+  void setFormat(const QString& format);
+  QString getFormat(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& strdate);
+  QString getDate(void);
+
+  /*!
+      Version getter/setters
+  */
+  void setVersion(const QString& ver);
+  QString getVersion(void);
+
+  /*!
+      Size getter/setters
+  */
+  void setSize(size_t size);
+  size_t getSize(void);
+
+  /*!
+      MD5 getter/setters
+  */
+  void setMd5(const QString& md5);
+  QString getMd5(void);
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFileFirmware* ui;
+  CMDF_Firmware* m_pfirmware;
+};
+
+#endif // CDLGMDFFIRMWARE_H
diff --git a/src/cdlgmdffilefirmware.ui b/src/cdlgmdffilefirmware.ui
index 990a4731..bcea2872 100644
--- a/src/cdlgmdffilefirmware.ui
+++ b/src/cdlgmdffilefirmware.ui
@@ -7,18 +7,18 @@
     <x>0</x>
     <y>0</y>
     <width>597</width>
-    <height>320</height>
+    <height>292</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>MDF Firmware</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>280</y>
-     <width>591</width>
+     <x>10</x>
+     <y>260</y>
+     <width>581</width>
      <height>32</height>
     </rect>
    </property>
@@ -38,143 +38,115 @@
      <x>9</x>
      <y>9</y>
      <width>581</width>
-     <height>267</height>
+     <height>251</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Name</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="editName">
       <property name="text">
        <string>name-for-firmware</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="1" column="0">
      <widget class="QLabel" name="label_3">
       <property name="text">
        <string>Target code</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_2">
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="editTargetCode">
       <property name="text">
        <string>0</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>URL</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="editUrl">
       <property name="text">
        <string>1</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="0">
+    <item row="3" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Format</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QLineEdit" name="editFormat"/>
+    </item>
+    <item row="4" column="0">
      <widget class="QLabel" name="label_5">
       <property name="text">
        <string>Date</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
-      <property name="text">
-       <string>true</string>
+    <item row="4" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="6" column="0">
+    <item row="5" column="0">
      <widget class="QLabel" name="label_7">
       <property name="text">
        <string>Version</string>
       </property>
      </widget>
     </item>
-    <item row="6" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
+    <item row="5" column="1">
+     <widget class="QLineEdit" name="editVersion">
       <property name="text">
        <string>0</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="0">
+    <item row="6" column="0">
      <widget class="QLabel" name="label_6">
       <property name="text">
-       <string>Max</string>
+       <string>Size</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="1">
-     <widget class="QLineEdit" name="lineEdit_5">
+    <item row="6" column="1">
+     <widget class="QLineEdit" name="editSize">
       <property name="text">
        <string>1</string>
       </property>
      </widget>
     </item>
-    <item row="8" column="1">
-     <widget class="QComboBox" name="comboBox_2">
-      <item>
-       <property name="text">
-        <string>Read/Write</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Read Only</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Write Only</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="8" column="0">
+    <item row="7" column="0">
      <widget class="QLabel" name="label_8">
       <property name="text">
-       <string>Access</string>
+       <string>MD5</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>Binary</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Inte Hex 8</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>INtel Hex 16</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="label">
+    <item row="7" column="1">
+     <widget class="QLineEdit" name="editMd5">
       <property name="text">
-       <string>Format</string>
+       <string>1</string>
       </property>
      </widget>
     </item>
@@ -182,5 +154,38 @@
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFileFirmware</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>295</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>159</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFileFirmware</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>295</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>159</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffilemanual.cpp b/src/cdlgmdffilemanual.cpp
new file mode 100644
index 00000000..4b16fccd
--- /dev/null
+++ b/src/cdlgmdffilemanual.cpp
@@ -0,0 +1,278 @@
+// cdlgmdffilemanual.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilemanual.h"
+#include "ui_cdlgmdffilemanual.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFileManual::CDlgMdfFileManual(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFileManual)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // Fill combo with predefined bootloader algorithms (vscp.h)
+  //ui->comboBoxAlgorithm->addItem("VSCP", VSCP_BOOTLOADER_VSCP); // VSCP boot loader algorithm
+  
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfFileManual::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFileManual::~CDlgMdfFileManual()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFileManual::initDialogData(const CMDF_Object* pmdfobj, mdf_file_manual_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_pmanual = (CMDF_Manual*)pmdfobj;
+
+  ui->editName->setText(m_pmanual->getName().c_str());
+  ui->editUrl->setText(m_pmanual->getUrl().c_str());
+  ui->editFormat->setText(m_pmanual->getFormat().c_str());
+  ui->editLanguage->setText(m_pmanual->getLanguage().c_str());
+
+  QDate dd = QDate::fromString(m_pmanual->getDate().c_str(),"YY-MM_DD");
+    ui->date->setDate(dd); 
+
+  switch (index) {
+    case index_file_manual_url:
+      ui->editUrl->setFocus();
+      break;
+
+    case index_file_manual_format:
+      ui->editFormat->setFocus();
+      break;
+
+    case index_file_manual_date:
+      ui->date->setFocus();
+      break;
+
+    case index_file_manual_language:
+      ui->editLanguage->setFocus();
+      break;  
+
+    case index_file_manual_name:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFileManual::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFileManual::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileManual::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFileManual::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFileManual::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setFormat
+//
+
+void
+CDlgMdfFileManual::setFormat(const QString& name)
+{
+  ui->editFormat->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileManual::getFormat(void)
+{
+  return ui->editFormat->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setLanguage
+//
+
+void
+CDlgMdfFileManual::setLanguage(const QString& name)
+{
+  ui->editLanguage->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getLanguage
+//
+
+QString
+CDlgMdfFileManual::getLanguage(void)
+{
+  return ui->editLanguage->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFileManual::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate,"YY-MM_DD");
+  ui->date->setDate(dd); 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFileManual::getDate(void)
+{
+  QDate dd = ui->date->date(); 
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFileManual::accept()
+{
+  std::string str;
+  if (nullptr != m_pmanual) {
+
+    str = ui->editName->text().toStdString();
+    m_pmanual->setName(str);
+
+    str = ui->editUrl->text().toStdString();
+    m_pmanual->setUrl(str);
+
+    str = ui->editFormat->text().toStdString();
+    m_pmanual->setFormat(str);
+
+    str = ui->editLanguage->text().toStdString();
+    m_pmanual->setLanguage(str);
+
+    QDate dd = ui->date->date(); 
+    m_pmanual->setDate(dd.toString("YY-MM-DD").toStdString());
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffilemanual.h b/src/cdlgmdffilemanual.h
new file mode 100644
index 00000000..f30080a1
--- /dev/null
+++ b/src/cdlgmdffilemanual.h
@@ -0,0 +1,126 @@
+// cdlgmdffilemanual.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFILEMANUAL_H
+#define CDLGMDFFILEMANUAL_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_file_manual_index {
+  index_file_manual_none = 0,
+  index_file_manual_name,
+  index_file_manual_url,
+  index_file_manual_format,
+  index_file_manual_date,
+  index_file_manual_language,
+} mdf_file_manual_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_FILE_MANUAL_NAME tr("Name: ")
+#define PREFIX_MDF_FILE_MANUAL_URL tr("URL: ")
+#define PREFIX_MDF_FILE_MANUAL_FORMAT tr("Format: ")
+#define PREFIX_MDF_FILE_MANUAL_DATE tr("Date: ")
+#define PREFIX_MDF_FILE_MANUAL_LANGUAGE tr("Language: ")
+
+namespace Ui {
+class CDlgMdfFileManual;
+}
+
+class CDlgMdfFileManual : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFileManual(QWidget* parent = nullptr);
+  ~CDlgMdfFileManual();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_file_manual_index index = index_file_manual_name);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Format getter/setters
+  */
+  void setFormat(const QString& format);
+  QString getFormat(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& strdate);
+  QString getDate(void);
+
+  /*!
+      Language getter/setters
+  */
+  void setLanguage(const QString& strdate);
+  QString getLanguage(void);
+
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFileManual* ui;
+  CMDF_Manual * m_pmanual;
+};
+
+#endif // CDLGMDFFILEMANUAL_H
diff --git a/src/cdlgmdffilemanual.ui b/src/cdlgmdffilemanual.ui
new file mode 100644
index 00000000..facbcf2f
--- /dev/null
+++ b/src/cdlgmdffilemanual.ui
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CDlgMdfFileManual</class>
+ <widget class="QDialog" name="CDlgMdfFileManual">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>597</width>
+    <height>218</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MDF Manual</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>180</y>
+     <width>581</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+   </property>
+   <property name="centerButtons">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>581</width>
+     <height>158</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="formLayout">
+    <item row="1" column="0">
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="editName">
+      <property name="text">
+       <string>name-of-manual</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="label_4">
+      <property name="text">
+       <string>URL</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="editUrl">
+      <property name="text">
+       <string>https://www.somewhere.com/video.mpeg4</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Format</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0">
+     <widget class="QLabel" name="label_5">
+      <property name="text">
+       <string>Date</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="0">
+     <widget class="QLabel" name="label_7">
+      <property name="text">
+       <string>Language</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1">
+     <widget class="QLineEdit" name="editLanguage">
+      <property name="text">
+       <string>en</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QLineEdit" name="editFormat"/>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFileManual</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFileManual</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/cdlgmdffilepicture.cpp b/src/cdlgmdffilepicture.cpp
new file mode 100644
index 00000000..9d783b7a
--- /dev/null
+++ b/src/cdlgmdffilepicture.cpp
@@ -0,0 +1,251 @@
+// cdlgmdffilepicture.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilepicture.h"
+#include "ui_cdlgmdffilepicture.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFilePicture::CDlgMdfFilePicture(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFilePicture)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // Fill combo with predefined bootloader algorithms (vscp.h)
+  //ui->comboBoxAlgorithm->addItem("VSCP", VSCP_BOOTLOADER_VSCP); // VSCP boot loader algorithm
+  
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfFilePicture::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFilePicture::~CDlgMdfFilePicture()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFilePicture::initDialogData(const CMDF_Object* pmdfobj, mdf_file_picture_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_ppicture = (CMDF_Picture*)pmdfobj;
+
+  ui->editName->setText(m_ppicture->getName().c_str());
+  ui->editUrl->setText(m_ppicture->getUrl().c_str());
+  ui->editFormat->setText(m_ppicture->getFormat().c_str());
+
+  QDate dd = QDate::fromString(m_ppicture->getDate().c_str(),"YY-MM_DD");
+    ui->date->setDate(dd); 
+
+  switch (index) {
+    case index_file_picture_url:
+      ui->editUrl->setFocus();
+      break;
+
+    case index_file_picture_format:
+      ui->editFormat->setFocus();
+      break;
+
+    case index_file_picture_date:
+      ui->date->setFocus();
+      break;
+
+    case index_file_picture_name:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFilePicture::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFilePicture::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFilePicture::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFilePicture::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFilePicture::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setFormat
+//
+
+void
+CDlgMdfFilePicture::setFormat(const QString& name)
+{
+  ui->editFormat->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFilePicture::getFormat(void)
+{
+  return ui->editFormat->text();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFilePicture::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate,"YY-MM_DD");
+  ui->date->setDate(dd); 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFilePicture::getDate(void)
+{
+  QDate dd = ui->date->date(); 
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFilePicture::accept()
+{
+  std::string str;
+  if (nullptr != m_ppicture) {
+
+    str = ui->editName->text().toStdString();
+    m_ppicture->setName(str);
+
+    str = ui->editUrl->text().toStdString();
+    m_ppicture->setUrl(str);
+
+    str = ui->editFormat->text().toStdString();
+    m_ppicture->setFormat(str);
+
+    QDate dd = ui->date->date(); 
+    m_ppicture->setDate(dd.toString("YY-MM-DD").toStdString());
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffilepicture.h b/src/cdlgmdffilepicture.h
new file mode 100644
index 00000000..18c63f18
--- /dev/null
+++ b/src/cdlgmdffilepicture.h
@@ -0,0 +1,118 @@
+// cdlgmdffilepicture.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFILEPICTURE_H
+#define CDLGMDFFILEPICTURE_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_file_picture_index {
+  index_file_picture_none = 0,
+  index_file_picture_name,
+  index_file_picture_url,
+  index_file_picture_format,
+  index_file_picture_date,
+} mdf_file_picture_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_FILE_PICTURE_NAME tr("Name: ")
+#define PREFIX_MDF_FILE_PICTURE_URL tr("URL: ")
+#define PREFIX_MDF_FILE_PICTURE_FORMAT tr("Format: ")
+#define PREFIX_MDF_FILE_PICTURE_DATE tr("Date: ")
+
+namespace Ui {
+class CDlgMdfFilePicture;
+}
+
+class CDlgMdfFilePicture : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFilePicture(QWidget* parent = nullptr);
+  ~CDlgMdfFilePicture();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_file_picture_index index = index_file_picture_name);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Format getter/setters
+  */
+  void setFormat(const QString& format);
+  QString getFormat(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& strdate);
+  QString getDate(void);
+
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFilePicture* ui;
+  CMDF_Picture * m_ppicture;
+};
+
+#endif // CDLGMDFFILEPICTURE_H
diff --git a/src/cdlgmdffilepicture.ui b/src/cdlgmdffilepicture.ui
index 2d79ac19..02ad7406 100644
--- a/src/cdlgmdffilepicture.ui
+++ b/src/cdlgmdffilepicture.ui
@@ -7,18 +7,18 @@
     <x>0</x>
     <y>0</y>
     <width>597</width>
-    <height>218</height>
+    <height>186</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>MDF Picture</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>180</y>
-     <width>591</width>
+     <x>10</x>
+     <y>150</y>
+     <width>581</width>
      <height>32</height>
     </rect>
    </property>
@@ -38,94 +38,59 @@
      <x>9</x>
      <y>9</y>
      <width>581</width>
-     <height>151</height>
+     <height>131</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Name</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="editName">
       <property name="text">
        <string>name-for-picture</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="1" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>URL</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="editUrl">
       <property name="text">
        <string>https://www.somewhere.com/picture.jpg</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Format</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>auto</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>png</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>jpg</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>svg</string>
-       </property>
-      </item>
-     </widget>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="editFormat"/>
     </item>
-    <item row="4" column="0">
+    <item row="3" column="0">
      <widget class="QLabel" name="label_5">
       <property name="text">
        <string>Date</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
-      <property name="text">
-       <string>true</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_7">
-      <property name="text">
-       <string>Version</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
-      <property name="text">
-       <string>0</string>
+    <item row="3" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
@@ -133,5 +98,38 @@
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFilePicture</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFilePicture</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffilesetup.cpp b/src/cdlgmdffilesetup.cpp
new file mode 100644
index 00000000..30272009
--- /dev/null
+++ b/src/cdlgmdffilesetup.cpp
@@ -0,0 +1,251 @@
+// cdlgmdffilesetup.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilesetup.h"
+#include "ui_cdlgmdffilesetup.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFileSetup::CDlgMdfFileSetup(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFileSetup)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // Fill combo with predefined bootloader algorithms (vscp.h)
+  //ui->comboBoxAlgorithm->addItem("VSCP", VSCP_BOOTLOADER_VSCP); // VSCP boot loader algorithm
+  
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfFileSetup::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFileSetup::~CDlgMdfFileSetup()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFileSetup::initDialogData(const CMDF_Object* pmdfobj, mdf_file_setup_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_psetup = (CMDF_Setup*)pmdfobj;
+
+  ui->editName->setText(m_psetup->getName().c_str());
+  ui->editUrl->setText(m_psetup->getUrl().c_str());
+  ui->editFormat->setText(m_psetup->getFormat().c_str());
+
+  QDate dd = QDate::fromString(m_psetup->getDate().c_str(),"YY-MM_DD");
+    ui->date->setDate(dd); 
+
+  switch (index) {
+    case index_file_setup_url:
+      ui->editUrl->setFocus();
+      break;
+
+    case index_file_setup_format:
+      ui->editFormat->setFocus();
+      break;
+
+    case index_file_setup_date:
+      ui->date->setFocus();
+      break;
+
+    case index_file_setup_name:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFileSetup::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFileSetup::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileSetup::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFileSetup::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFileSetup::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setFormat
+//
+
+void
+CDlgMdfFileSetup::setFormat(const QString& name)
+{
+  ui->editFormat->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileSetup::getFormat(void)
+{
+  return ui->editFormat->text();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFileSetup::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate,"YY-MM_DD");
+  ui->date->setDate(dd); 
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFileSetup::getDate(void)
+{
+  QDate dd = ui->date->date(); 
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFileSetup::accept()
+{
+  std::string str;
+  if (nullptr != m_psetup) {
+
+    str = ui->editName->text().toStdString();
+    m_psetup->setName(str);
+
+    str = ui->editUrl->text().toStdString();
+    m_psetup->setUrl(str);
+
+    str = ui->editFormat->text().toStdString();
+    m_psetup->setFormat(str);
+
+    QDate dd = ui->date->date(); 
+    m_psetup->setDate(dd.toString("YY-MM-DD").toStdString());
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffilesetup.h b/src/cdlgmdffilesetup.h
new file mode 100644
index 00000000..c931a416
--- /dev/null
+++ b/src/cdlgmdffilesetup.h
@@ -0,0 +1,118 @@
+// cdlgmdffilesetup.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFILESETUP_H
+#define CDLGMDFFILESETUP_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_file_setup_index {
+  index_file_setup_none = 0,
+  index_file_setup_name,
+  index_file_setup_url,
+  index_file_setup_format,
+  index_file_setup_date,
+} mdf_file_setup_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_FILE_SETUP_NAME tr("Name: ")
+#define PREFIX_MDF_FILE_SETUP_URL tr("URL: ")
+#define PREFIX_MDF_FILE_SETUP_FORMAT tr("Format: ")
+#define PREFIX_MDF_FILE_SETUP_DATE tr("Date: ")
+
+namespace Ui {
+class CDlgMdfFileSetup;
+}
+
+class CDlgMdfFileSetup : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFileSetup(QWidget* parent = nullptr);
+  ~CDlgMdfFileSetup();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_file_setup_index index = index_file_setup_name);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Format getter/setters
+  */
+  void setFormat(const QString& format);
+  QString getFormat(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& strdate);
+  QString getDate(void);
+
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFileSetup* ui;
+  CMDF_Setup * m_psetup;
+};
+
+#endif // CDLGMDFFILEPICTURE_H
diff --git a/src/cdlgmdffilesetup.ui b/src/cdlgmdffilesetup.ui
index 0fa082fc..84b20490 100644
--- a/src/cdlgmdffilesetup.ui
+++ b/src/cdlgmdffilesetup.ui
@@ -7,17 +7,17 @@
     <x>0</x>
     <y>0</y>
     <width>604</width>
-    <height>222</height>
+    <height>187</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>MDF Setup Script</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>180</y>
+     <y>150</y>
      <width>581</width>
      <height>32</height>
     </rect>
@@ -38,79 +38,59 @@
      <x>9</x>
      <y>9</y>
      <width>581</width>
-     <height>161</height>
+     <height>131</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Name</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="editName">
       <property name="text">
        <string>name-of-setup</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="1" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>URL</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="editUrl">
       <property name="text">
-       <string>https://www.somewhere.com/driver.zip</string>
+       <string>https://www.somewhere.com/manual.pdf</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Format</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>vscpjs</string>
-       </property>
-      </item>
-     </widget>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="editFormat"/>
     </item>
-    <item row="4" column="0">
+    <item row="3" column="0">
      <widget class="QLabel" name="label_5">
       <property name="text">
        <string>Date</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
-      <property name="text">
-       <string>ISO-date</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_7">
-      <property name="text">
-       <string>Version</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
-      <property name="text">
-       <string>0</string>
+    <item row="3" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
@@ -118,5 +98,38 @@
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFileSetup</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>110</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFileSetup</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>110</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cdlgmdffilevideo.cpp b/src/cdlgmdffilevideo.cpp
new file mode 100644
index 00000000..431d2298
--- /dev/null
+++ b/src/cdlgmdffilevideo.cpp
@@ -0,0 +1,249 @@
+// cdlgmdffilevideo.cpp
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifdef WIN32
+#include <pch.h>
+#endif
+
+#include <vscp.h>
+#include <vscphelper.h>
+
+#include <vscpworks.h>
+
+#include "cdlgmdffilevideo.h"
+#include "ui_cdlgmdffilevideo.h"
+
+#include <QDate>
+#include <QDebug>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <spdlog/async.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/spdlog.h>
+
+///////////////////////////////////////////////////////////////////////////////
+// CTor
+//
+
+CDlgMdfFileVideo::CDlgMdfFileVideo(QWidget* parent)
+  : QDialog(parent)
+  , ui(new Ui::CDlgMdfFileVideo)
+{
+  ui->setupUi(this);
+
+  vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
+
+  // Fill combo with predefined bootloader algorithms (vscp.h)
+  // ui->comboBoxAlgorithm->addItem("VSCP", VSCP_BOOTLOADER_VSCP); // VSCP boot loader algorithm
+
+  // QShortcut* shortcut = new QShortcut(QKeySequence(tr("Ctrl+E", "Edit")), ui->editDate);
+  // connect(shortcut, &QShortcut::activated, this, &CDlgMdfFileVideo::editDesc);
+
+  // connect(ui->btnSetDummyGuid, &QPushButton::clicked, this, &cdlgmdfmodule::setDummyGuid);
+
+  setInitialFocus();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DTor
+//
+
+CDlgMdfFileVideo::~CDlgMdfFileVideo()
+{
+  delete ui;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// initDialogData
+//
+
+void
+CDlgMdfFileVideo::initDialogData(const CMDF_Object* pmdfobj, mdf_file_video_index index)
+{
+  QString str;
+
+  if (nullptr == pmdfobj) {
+    spdlog::error("MDF module information - Invalid MDF object (initDialogData)");
+    return;
+  }
+
+  m_pvideo = (CMDF_Video*)pmdfobj;
+
+  ui->editName->setText(m_pvideo->getName().c_str());
+  ui->editUrl->setText(m_pvideo->getUrl().c_str());
+  ui->editFormat->setText(m_pvideo->getFormat().c_str());
+
+  QDate dd = QDate::fromString(m_pvideo->getDate().c_str(), "YY-MM_DD");
+  ui->date->setDate(dd);
+
+  switch (index) {
+    case index_file_video_url:
+      ui->editUrl->setFocus();
+      break;
+
+    case index_file_video_format:
+      ui->editFormat->setFocus();
+      break;
+
+    case index_file_video_date:
+      ui->date->setFocus();
+      break;
+
+    case index_file_video_name:
+    default:
+      ui->editName->setFocus();
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setInitialFocus
+//
+
+void
+CDlgMdfFileVideo::setInitialFocus(void)
+{
+  // ui->editGuid->setFocus();
+}
+
+// ----------------------------------------------------------------------------
+//                             Getters & Setters
+// ----------------------------------------------------------------------------
+
+///////////////////////////////////////////////////////////////////////////////
+// setName
+//
+
+void
+CDlgMdfFileVideo::setName(const QString& name)
+{
+  ui->editName->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileVideo::getName(void)
+{
+  return ui->editName->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setUrl
+//
+
+void
+CDlgMdfFileVideo::setUrl(const QString& name)
+{
+  ui->editUrl->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getUrl
+//
+
+QString
+CDlgMdfFileVideo::getUrl(void)
+{
+  return ui->editUrl->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setFormat
+//
+
+void
+CDlgMdfFileVideo::setFormat(const QString& name)
+{
+  ui->editFormat->setText(name);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getFormat
+//
+
+QString
+CDlgMdfFileVideo::getFormat(void)
+{
+  return ui->editFormat->text();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// setDate
+//
+
+void
+CDlgMdfFileVideo::setDate(const QString& strdate)
+{
+  QDate dd = QDate::fromString(strdate, "YY-MM_DD");
+  ui->date->setDate(dd);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// getDate
+//
+
+QString
+CDlgMdfFileVideo::getDate(void)
+{
+  QDate dd = ui->date->date();
+  return dd.toString("YY-MM-DD");
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// accept
+//
+
+void
+CDlgMdfFileVideo::accept()
+{
+  std::string str;
+  if (nullptr != m_pvideo) {
+
+    str = ui->editName->text().toStdString();
+    m_pvideo->setName(str);
+
+    str = ui->editUrl->text().toStdString();
+    m_pvideo->setUrl(str);
+
+    str = ui->editFormat->text().toStdString();
+    m_pvideo->setFormat(str);
+
+    QDate dd = ui->date->date();
+    m_pvideo->setDate(dd.toString("YY-MM-DD").toStdString());
+  }
+  else {
+    spdlog::error("MDF module information - Invalid MDF object (accept)");
+  }
+
+  QDialog::accept();
+}
diff --git a/src/cdlgmdffilevideo.h b/src/cdlgmdffilevideo.h
new file mode 100644
index 00000000..3e9e50f3
--- /dev/null
+++ b/src/cdlgmdffilevideo.h
@@ -0,0 +1,118 @@
+// cdlgmdffilevideo.h
+//
+// This file is part of the VSCP (https://www.vscp.org)
+//
+// The MIT License (MIT)
+//
+// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB
+// <info@grodansparadis.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+#ifndef CDLGMDFFILEVIDEO_H
+#define CDLGMDFFILEVIDEO_H
+
+#include <vscpworks.h>
+#include <mdf.h>
+
+#include <QDialog>
+
+// Id for fields to identify them in the UI.
+// Use to set focus on edit and to write changed values 
+// in correct position among other things.
+typedef enum mdf_file_video_index {
+  index_file_video_none = 0,
+  index_file_video_name,
+  index_file_video_url,
+  index_file_video_format,
+  index_file_video_date,
+} mdf_file_video_index;
+
+// Tree prefixes (Text before value in tree table)
+#define PREFIX_MDF_FILE_VIDEO_NAME tr("Name: ")
+#define PREFIX_MDF_FILE_VIDEO_URL tr("URL: ")
+#define PREFIX_MDF_FILE_VIDEO_FORMAT tr("Format: ")
+#define PREFIX_MDF_FILE_VIDEO_DATE tr("Date: ")
+
+namespace Ui {
+class CDlgMdfFileVideo;
+}
+
+class CDlgMdfFileVideo : public QDialog {
+  Q_OBJECT
+
+public:
+public:
+  explicit CDlgMdfFileVideo(QWidget* parent = nullptr);
+  ~CDlgMdfFileVideo();
+
+  /*!
+      Set inital focus to description
+  */
+  void setInitialFocus(void);
+
+  /*!
+    Init dialog data
+    @param pmdfobject Pointer to MDF object
+    @param index The index for the field that will get focus
+      
+  */
+  void initDialogData(const CMDF_Object* pmdfobj, mdf_file_video_index index = index_file_video_name);
+
+
+  // ----------------------------------------------------------------------------
+  //                             Getters & Setters
+  // ----------------------------------------------------------------------------
+
+  /*!
+      Name getter/setters
+  */
+  void setName(const QString& name);
+  QString getName(void);
+
+  /*!
+      URL getter/setters
+  */
+  void setUrl(const QString& url);
+  QString getUrl(void);
+
+  /*!
+      Format getter/setters
+  */
+  void setFormat(const QString& format);
+  QString getFormat(void);
+
+  /*!
+      Date getter/setters
+  */
+  void setDate(const QString& strdate);
+  QString getDate(void);
+
+
+public slots:
+  void accept(void);
+
+
+private:
+  Ui::CDlgMdfFileVideo* ui;
+  CMDF_Video * m_pvideo;
+};
+
+#endif // CDLGMDFFILEVIDEO_H
diff --git a/src/cdlgmdffilevideo.ui b/src/cdlgmdffilevideo.ui
index d83f4506..df832f69 100644
--- a/src/cdlgmdffilevideo.ui
+++ b/src/cdlgmdffilevideo.ui
@@ -7,18 +7,18 @@
     <x>0</x>
     <y>0</y>
     <width>597</width>
-    <height>218</height>
+    <height>186</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>MDF Video</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox_2">
+  <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>180</y>
-     <width>591</width>
+     <x>10</x>
+     <y>150</y>
+     <width>581</width>
      <height>32</height>
     </rect>
    </property>
@@ -38,94 +38,59 @@
      <x>9</x>
      <y>9</y>
      <width>581</width>
-     <height>151</height>
+     <height>131</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Name</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit">
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="editName">
       <property name="text">
        <string>name-of-video</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
+    <item row="1" column="0">
      <widget class="QLabel" name="label_4">
       <property name="text">
        <string>URL</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="lineEdit_3">
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="editUrl">
       <property name="text">
        <string>https://www.somewhere.com/video.mpeg4</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Format</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>auto</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>png</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>jpg</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>svg</string>
-       </property>
-      </item>
-     </widget>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="editFormat"/>
     </item>
-    <item row="4" column="0">
+    <item row="3" column="0">
      <widget class="QLabel" name="label_5">
       <property name="text">
        <string>Date</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QLineEdit" name="lineEdit_4">
-      <property name="text">
-       <string>ISO-data</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_7">
-      <property name="text">
-       <string>Version</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="lineEdit_6">
-      <property name="text">
-       <string>0</string>
+    <item row="3" column="1">
+     <widget class="QDateEdit" name="date">
+      <property name="calendarPopup">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
@@ -133,5 +98,38 @@
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CDlgMdfFileVideo</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CDlgMdfFileVideo</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>195</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>298</x>
+     <y>108</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/cfrmmdf.cpp b/src/cfrmmdf.cpp
index 8f6480e3..3ee16148 100644
--- a/src/cfrmmdf.cpp
+++ b/src/cfrmmdf.cpp
@@ -48,11 +48,19 @@
 #include "ui_cfrmmdf.h"
 
 #include "cdlgeditmap.h"
+#include "cdlgmdfbootloader.h"
 #include "cdlgmdfcontact.h"
 #include "cdlgmdfcontactlist.h"
 #include "cdlgmdfdescription.h"
 #include "cdlgmdfmanufacturer.h"
 #include "cdlgmdfmodule.h"
+#include "cdlgmdffile.h"
+#include "cdlgmdffilepicture.h"
+#include "cdlgmdffilevideo.h"
+#include "cdlgmdffilemanual.h"
+#include "cdlgmdffiledriver.h"
+#include "cdlgmdffilefirmware.h"
+#include "cdlgmdffilesetup.h"
 
 #include <QClipboard>
 #include <QFile>
@@ -372,7 +380,13 @@ CFrmMdf::showMdfContextMenu(const QPoint& pos)
         break;
 
       case mdf_type_bootloader:
-        menu->addAction(QString(tr("Bootloader")), this, SLOT(loadSelectedMdf()));
+        // menu->addAction(QString(tr("Bootloader")), this, SLOT(editBootlLoader()));
+        menu->addAction(QString(tr("Edit bootloader")), this, SLOT(editBootLoader()));
+        break;
+
+      case mdf_type_bootloader_item:
+        // menu->addAction(QString(tr("Bootloader")), this, SLOT(editBootlLoader()));
+        menu->addAction(QString(tr("Edit bootloader item")), this, SLOT(editBootLoader()));
         break;
 
       case mdf_type_alarm:
@@ -434,55 +448,55 @@ CFrmMdf::showMdfContextMenu(const QPoint& pos)
         break;
 
       case mdf_type_file:
-        menu->addAction(QString(tr("File")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit file items")), this, SLOT(loadSelectedMdf()));
         break;
 
       case mdf_type_picture:
-        menu->addAction(QString(tr("Picture")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit pictures")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_picture_item:
-        menu->addAction(QString(tr("Picture item")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit picture items")), this, SLOT(editFile()));
         break;
 
       case mdf_type_video:
-        menu->addAction(QString(tr("Video")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit video items")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_video_item:
-        menu->addAction(QString(tr("Video item")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit video")), this, SLOT(editFile()));
         break;
 
       case mdf_type_firmware:
-        menu->addAction(QString(tr("Firmware")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit firmware items")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_firmware_item:
-        menu->addAction(QString(tr("Firmware item")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit firmware")), this, SLOT(editFile()));
         break;
 
       case mdf_type_driver:
-        menu->addAction(QString(tr("Driver")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit driver items")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_driver_item:
-        menu->addAction(QString(tr("Driver")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit driver")), this, SLOT(editFile()));
         break;
 
       case mdf_type_setup:
-        menu->addAction(QString(tr("Setup")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit setup items")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_setup_item:
-        menu->addAction(QString(tr("Setup")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit Setup")), this, SLOT(editFile()));
         break;
 
       case mdf_type_manual:
-        menu->addAction(QString(tr("Manual")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit manual items")), this, SLOT(editFileList()));
         break;
 
       case mdf_type_manual_item:
-        menu->addAction(QString(tr("Manual item")), this, SLOT(loadSelectedMdf()));
+        menu->addAction(QString(tr("Edit manual")), this, SLOT(editFile()));
         break;
 
       case mdf_type_generic_string:
@@ -1051,21 +1065,517 @@ CFrmMdf::renderManufacturerSocial(QMdfTreeWidgetItem* pItemSocialHead)
   QMdfTreeWidgetItem* pItem;
   CMDF_Item* pItemSocial;
 
-  do {
-    pItemSocial = m_mdf.getManufacturer()->getSocialObj(index);
-    if (nullptr != pItemSocial) {
-      pItem = new QMdfTreeWidgetItem(pItemSocialHead, pItemSocial, mdf_type_phone_item, index);
-      pItem->setText(0, pItemSocial->getName().c_str());
-      pItemSocialHead->addChild(pItem);
-      fillDescriptionItems(pItem,
-                           pItemSocial,
-                           pItemSocial->getMapDescription());
-      fillInfoUrlItems(pItem,
-                       pItemSocial,
-                       pItemSocial->getMapInfoUrl());
-      index++;
+  do {
+    pItemSocial = m_mdf.getManufacturer()->getSocialObj(index);
+    if (nullptr != pItemSocial) {
+      pItem = new QMdfTreeWidgetItem(pItemSocialHead, pItemSocial, mdf_type_phone_item, index);
+      pItem->setText(0, pItemSocial->getName().c_str());
+      pItemSocialHead->addChild(pItem);
+      fillDescriptionItems(pItem,
+                           pItemSocial,
+                           pItemSocial->getMapDescription());
+      fillInfoUrlItems(pItem,
+                       pItemSocial,
+                       pItemSocial->getMapInfoUrl());
+      index++;
+    }
+  } while (nullptr != pItemSocial);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderBootloadInfo
+//
+
+void
+CFrmMdf::renderBootLoadInfo(QMdfTreeWidgetItem* pItemBootHead, uint16_t selectedIndex)
+{
+  QString str;
+  QMdfTreeWidgetItem* pItem;
+
+  pItemBootHead->setSelected(false);
+
+  CMDF_BootLoaderInfo* pboot = m_mdf.getBootLoaderObj();
+  if (nullptr != pboot) {
+    str   = QString("Algorithm: %1").arg(pboot->getAlgorithm());
+    pItem = new QMdfTreeWidgetItem(pItemBootHead, pboot, mdf_type_bootloader_item, static_cast<mdf_bootloader_index>(index_bootloader_algorithm));
+    pItem->setText(0, str);
+    pItemBootHead->addChild(pItem);
+    // Select item
+    if (index_bootloader_algorithm == static_cast<mdf_bootloader_index>(selectedIndex)) {
+      pItem->setSelected(true);
+    }
+
+    str   = QString("Block Size: %1").arg(pboot->getBlockSize());
+    pItem = new QMdfTreeWidgetItem(pItemBootHead, pboot, mdf_type_bootloader_item, static_cast<mdf_bootloader_index>(index_bootloader_blocksize));
+    pItem->setText(0, str);
+    pItemBootHead->addChild(pItem);
+    // Select item
+    if (index_bootloader_blocksize == static_cast<mdf_bootloader_index>(selectedIndex)) {
+      pItem->setSelected(true);
+    }
+
+    str   = QString("Block Count: %1").arg(pboot->getBlockCount());
+    pItem = new QMdfTreeWidgetItem(pItemBootHead, pboot, mdf_type_bootloader_item, static_cast<mdf_bootloader_index>(index_bootloader_blockcount));
+    pItem->setText(0, str);
+    pItemBootHead->addChild(pItem);
+    // Select item
+    if (index_bootloader_blockcount == static_cast<mdf_bootloader_index>(selectedIndex)) {
+      pItem->setSelected(true);
+    }
+  }
+  else {
+    spdlog::error("No bootloader object when reading MDF");
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderPictureItems
+//
+
+void
+CFrmMdf::renderPictureItems(QMdfTreeWidgetItem* pItemPicture, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Picture* pPictureObj;
+
+  // Return if noting to render
+  if (!m_mdf.getPictureCount()) {
+    return;
+  }
+
+  do {
+    pPictureObj = m_mdf.getPictureObj(index);
+    if (nullptr != pPictureObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemPicture, &m_mdf, mdf_type_picture_item, index);
+      str                       = QString("Picture %1 - ").arg(index) + pPictureObj->getName().c_str();
+      pItem->setText(0, str);
+      pItemPicture->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: ") + pPictureObj->getName().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: ") + pPictureObj->getUrl().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Format: ") + pPictureObj->getFormat().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: %1").arg(pPictureObj->getDate().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pPictureObj, pPictureObj->getMapDescription());
+      fillInfoUrlItems(pItem, pPictureObj, pPictureObj->getMapInfoUrl());
+    }
+
+    index++;
+
+  } while (nullptr != pPictureObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderVideoItems
+//
+
+void
+CFrmMdf::renderVideoItems(QMdfTreeWidgetItem* pItemVideo, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Video* pVideoObj;
+
+  // Return if noting to render
+  if (!m_mdf.getVideoCount()) {
+    return;
+  }
+
+  do {
+    pVideoObj = m_mdf.getVideoObj(index);
+    if (nullptr != pVideoObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemVideo, &m_mdf, mdf_type_video_item, index);
+      str                       = QString("Video %1 - ").arg(index) + pVideoObj->getName().c_str();
+      pItem->setText(0, str);
+      pItemVideo->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: ") + pVideoObj->getName().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: ") + pVideoObj->getUrl().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Format: ") + pVideoObj->getFormat().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: %1").arg(pVideoObj->getDate().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pVideoObj, pVideoObj->getMapDescription());
+      fillInfoUrlItems(pItem, pVideoObj, pVideoObj->getMapInfoUrl());
+    }
+
+    index++;
+
+  } while (nullptr != pVideoObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderManualItems
+//
+
+void
+CFrmMdf::renderManualItems(QMdfTreeWidgetItem* pItemManual, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Manual* pManualObj;
+
+  // Return if noting to render
+  if (!m_mdf.getManualCount()) {
+    return;
+  }
+
+  do {
+    pManualObj = m_mdf.getManualObj(index);
+    if (nullptr != pManualObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemManual, &m_mdf, mdf_type_manual_item, index);
+      str                       = QString("Manual %1 - %2").arg(index).arg(pManualObj->getName().c_str());
+      pItem->setText(0, str);
+      pItemManual->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: %1").arg(pManualObj->getName().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: ") + pManualObj->getUrl().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Format: ") + pManualObj->getFormat().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: %1").arg(pManualObj->getDate().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pManualObj, pManualObj->getMapDescription());
+      fillInfoUrlItems(pItem, pManualObj, pManualObj->getMapInfoUrl());
+    }
+
+    index++;
+
+  } while (nullptr != pManualObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderDriverItems
+//
+
+void
+CFrmMdf::renderDriverItems(QMdfTreeWidgetItem* pItemDriver, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Driver* pDriverObj;
+
+  // Return if noting to render
+  if (!m_mdf.getDriverCount()) {
+    return;
+  }
+
+  do {
+    pDriverObj = m_mdf.getDriverObj(index);
+    if (nullptr != pDriverObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemDriver, &m_mdf, mdf_type_driver_item, index);
+      str                       = QString("Driver %1 - %2 %3").arg(index).arg(pDriverObj->getName().c_str()).arg(pDriverObj->getDate().c_str());
+      pItem->setText(0, str);
+      pItemDriver->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: %1").arg(pDriverObj->getName().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Version: %1.%2.%3").arg(pDriverObj->getVersionMajor()).arg(pDriverObj->getVersionMinor()).arg(pDriverObj->getVersionPatch());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: ") + pDriverObj->getDate().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: ") + pDriverObj->getUrl().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Type: ") + pDriverObj->getType().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Architecture: ") + pDriverObj->getFormat().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("OS: ") + pDriverObj->getOS().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("OS Version: ") + pDriverObj->getOSVer().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("MD5 Checksum: ") + pDriverObj->getMd5().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pDriverObj, pDriverObj->getMapDescription());
+      fillInfoUrlItems(pItem, pDriverObj, pDriverObj->getMapInfoUrl());
+    }
+
+    index++;
+
+  } while (nullptr != pDriverObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderSetupItems
+//
+
+void
+CFrmMdf::renderSetupItems(QMdfTreeWidgetItem* pItemSetup, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Setup* pSetupObj;
+
+  // Return if noting to render
+  if (!m_mdf.getSetupCount()) {
+    return;
+  }
+
+  do {
+    pSetupObj = m_mdf.getSetupObj(index);
+    if (nullptr != pSetupObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemSetup, &m_mdf, mdf_type_setup_item, index);
+      str                       = QString("Script %1 - %2").arg(index).arg(pSetupObj->getName().c_str());
+      pItem->setText(0, str);
+      pItemSetup->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: %1").arg(pSetupObj->getName().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: ") + pSetupObj->getUrl().c_str();
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Format: ") + pSetupObj->getFormat().c_str();
+        // pSubItem->setFont(0, fontTopItem);
+        //  pSubItem->setForeground(0, greenBrush);
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: %1").arg(pSetupObj->getDate().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pSetupObj, pSetupObj->getMapDescription());
+      fillInfoUrlItems(pItem, pSetupObj, pSetupObj->getMapInfoUrl());
+    }
+
+    index++;
+
+  } while (nullptr != pSetupObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// renderFirmwareItems
+//
+
+void
+CFrmMdf::renderFirmwareItems(QMdfTreeWidgetItem* pItemFirmware, uint16_t selectedIndex)
+{
+  int index = 0;
+  QString str;
+  CMDF_Firmware* pFirmwareObj;
+
+  // Return if noting to render
+  if (!m_mdf.getFirmwareCount()) {
+    return;
+  }
+
+  do {
+    pFirmwareObj = m_mdf.getFirmwareObj(index);
+    if (nullptr != pFirmwareObj) {
+      QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemFirmware, &m_mdf, mdf_type_firmware_item, index);
+      str                       = QString("Firmware %1 - %2 %3").arg(index).arg(pFirmwareObj->getDate().c_str()).arg(pFirmwareObj->getName().c_str());
+      pItem->setText(0, str);
+      pItemFirmware->addChild(pItem);
+
+      QMdfTreeWidgetItem* pSubItem;
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Name: %1").arg(pFirmwareObj->getName().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Version: %1.%2.%3").arg(pFirmwareObj->getVersionMajor()).arg(pFirmwareObj->getVersionMinor()).arg(pFirmwareObj->getVersionPatch());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
+      if (nullptr != pSubItem) {
+        str = QString("URL: %1").arg(pFirmwareObj->getUrl().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
+      if (nullptr != pSubItem) {
+        str = QString("Date: %1").arg(pFirmwareObj->getDate().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_number);
+      if (nullptr != pSubItem) {
+        str = QString("Target Code: %1").arg(pFirmwareObj->getTargetCode());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Target: %1").arg(pFirmwareObj->getTarget().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("Format: %1").arg(pFirmwareObj->getFormat().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_number);
+      if (nullptr != pSubItem) {
+        str = QString("Size: %1").arg(pFirmwareObj->getSize());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
+      if (nullptr != pSubItem) {
+        str = QString("MD5 Checksum: %1").arg(pFirmwareObj->getMd5().c_str());
+        pSubItem->setText(0, str);
+        pItem->addChild(pSubItem);
+      }
+
+      fillDescriptionItems(pItem, pFirmwareObj, pFirmwareObj->getMapDescription());
+      fillInfoUrlItems(pItem, pFirmwareObj, pFirmwareObj->getMapInfoUrl());
     }
-  } while (nullptr != pItemSocial);
+
+    index++;
+
+  } while (nullptr != pFirmwareObj);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1260,28 +1770,6 @@ CFrmMdf::loadMdf(void)
 
     renderManufacturerEmail(pItemEmailHead);
 
-    /*
-    index = 0;
-    CMDF_Item* pItemEmail;
-
-    do {
-      pItemEmail = pManufacturer->getEmailObj(index);
-      if (nullptr != pItemEmail) {
-        // str   = QString("Email ") + QString::number(index) + ": " + pItemEmail->getName().c_str();
-        pItem = new QMdfTreeWidgetItem(pItemEmailHead, pItemEmail, mdf_type_email_item, index);
-        pItem->setText(0, pItemEmail->getName().c_str());
-        pItemEmailHead->addChild(pItem);
-        fillDescriptionItems(pItem,
-                             pItemEmail,
-                             pItemEmail->getMapDescription());
-        fillHelpUrlItems(pItem,
-                         pItemEmail,
-                         pItemEmail->getMapInfoUrl());
-        index++;
-      }
-    } while (nullptr != pItemEmail);
-    */
-
     QMdfTreeWidgetItem* pItemPhoneHead = new QMdfTreeWidgetItem(pItemManufacturer,
                                                                 m_mdf.getManufacturer(),
                                                                 mdf_type_phone);
@@ -1291,24 +1779,6 @@ CFrmMdf::loadMdf(void)
     pItemModule->addChild(pItemPhoneHead);
 
     renderManufacturerPhone(pItemPhoneHead);
-    // CMDF_Item* pItemPhone;
-    // index = 0;
-
-    // do {
-    //   pItemPhone = pManufacturer->getPhoneObj(index++);
-    //   if (nullptr != pItemPhone) {
-    //     // str   = QString("Phone ") + QString::number(index) + ": " + pItemPhone->getName().c_str();
-    //     pItem = new QMdfTreeWidgetItem(pItemPhoneHead, pItemPhone, mdf_type_phone_item, index);
-    //     pItem->setText(0, pItemPhone->getName().c_str());
-    //     pItemPhoneHead->addChild(pItem);
-    //     fillDescriptionItems(pItem,
-    //                          pManufacturer->getPhoneObj(),
-    //                          pManufacturer->getPhoneObj()->getMapDescription());
-    //     fillHelpUrlItems(pItem,
-    //                      pManufacturer->getPhoneObj(),
-    //                      pManufacturer->getPhoneObj()->getMapInfoUrl());
-    //   }
-    // } while (nullptr != pItemPhone);
 
     QMdfTreeWidgetItem* pItemFaxHead = new QMdfTreeWidgetItem(pItemManufacturer,
                                                               m_mdf.getManufacturer(),
@@ -1319,24 +1789,6 @@ CFrmMdf::loadMdf(void)
     pItemModule->addChild(pItemFaxHead);
 
     renderManufacturerFax(pItemFaxHead);
-    // CMDF_Item* pItemFax;
-    // index = 0;
-
-    // do {
-    //   pItemFax = pManufacturer->getFaxObj(index++);
-    //   if (nullptr != pItemFax) {
-    //     // str   = QString("Fax ") + QString::number(index) + ": " + pItemFax->getName().c_str();
-    //     pItem = new QMdfTreeWidgetItem(pItemFaxHead, pItemFax, mdf_type_fax_item, index);
-    //     pItem->setText(0, pItemFax->getName().c_str());
-    //     pItemFaxHead->addChild(pItem);
-    //     fillDescriptionItems(pItem,
-    //                          pManufacturer->getFaxObj(),
-    //                          pManufacturer->getFaxObj()->getMapDescription());
-    //     fillHelpUrlItems(pItem,
-    //                      pManufacturer->getFaxObj(),
-    //                      pManufacturer->getFaxObj()->getMapInfoUrl());
-    //   }
-    // } while (nullptr != pItemFax);
 
     QMdfTreeWidgetItem* pItemWebHead = new QMdfTreeWidgetItem(pItemManufacturer,
                                                               m_mdf.getManufacturer(),
@@ -1347,24 +1799,6 @@ CFrmMdf::loadMdf(void)
     pItemModule->addChild(pItemWebHead);
 
     renderManufacturerWeb(pItemWebHead);
-    // CMDF_Item* pItemWeb;
-    // index = 0;
-
-    // do {
-    //   pItemWeb = pManufacturer->getWebObj(index++);
-    //   if (nullptr != pItemWeb) {
-    //     // str   = QString("Web ") + QString::number(index) + ": " + pItemWeb->getName().c_str();
-    //     pItem = new QMdfTreeWidgetItem(pItemWebHead, pItemWeb, mdf_type_web_item, index);
-    //     pItem->setText(0, pItemWeb->getName().c_str());
-    //     pItemWebHead->addChild(pItem);
-    //     fillDescriptionItems(pItem,
-    //                          pManufacturer->getWebObj(),
-    //                          pManufacturer->getWebObj()->getMapDescription());
-    //     fillHelpUrlItems(pItem,
-    //                      pManufacturer->getWebObj(),
-    //                      pManufacturer->getWebObj()->getMapInfoUrl());
-    //   }
-    // } while (nullptr != pItemWeb);
 
     QMdfTreeWidgetItem* pItemSocialHead = new QMdfTreeWidgetItem(pItemManufacturer,
                                                                  m_mdf.getManufacturer(),
@@ -1375,20 +1809,6 @@ CFrmMdf::loadMdf(void)
     pItemModule->addChild(pItemSocialHead);
 
     renderManufacturerSocial(pItemSocialHead);
-    // CMDF_Item* pItemSocial;
-    // index = 0;
-
-    // do {
-    //   pItemSocial = pManufacturer->getSocialObj(index++);
-    //   if (nullptr != pItemSocial) {
-    //     // str = QString("Social ") + QString::number(index) + ": " + pItemSocial->getName().c_str();
-    //     pItem = new QMdfTreeWidgetItem(pItemSocialHead, pItemSocial, mdf_type_social_item, index);
-    //     pItem->setText(0, pItemSocial->getName().c_str());
-    //     pItemSocialHead->addChild(pItem);
-    //     fillDescriptionItems(pItem, pManufacturer->getSocialObj(), pManufacturer->getSocialObj()->getMapDescription());
-    //     fillHelpUrlItems(pItem, pManufacturer->getSocialObj(), pManufacturer->getSocialObj()->getMapInfoUrl());
-    //   }
-    // } while (nullptr != pItemSocial);
   }
   else {
     spdlog::error("No manufacturer object when reading MDF");
@@ -1396,444 +1816,80 @@ CFrmMdf::loadMdf(void)
 
   // * * * Boot info * * *
 
-  QMdfTreeWidgetItem* pItemBoot = new QMdfTreeWidgetItem(pItemModule, mdf_type_bootloader);
+  QMdfTreeWidgetItem* pItemBoot = new QMdfTreeWidgetItem(pItemModule,
+                                                         m_mdf.getBootLoaderObj(),
+                                                         mdf_type_bootloader,
+                                                         static_cast<mdf_bootloader_index>(index_bootloader_algorithm));
   pItemBoot->setFont(0, fontTopItem);
   pItemBoot->setForeground(0, greenBrush);
   pItemBoot->setText(0, tr("Boot"));
   ui->treeMDF->addTopLevelItem(pItemBoot);
 
-  CMDF_BootLoaderInfo* pboot = m_mdf.getBootLoaderObj();
-  if (nullptr != pboot) {
-    str   = QString("Algorithm: %1").arg(pboot->getAlgorithm());
-    pItem = new QMdfTreeWidgetItem(pItemBoot, mdf_type_generic_number);
-    pItem->setText(0, str);
-    pItemBoot->addChild(pItem);
-
-    str   = QString("Block Size: %1").arg(pboot->getBlockSize());
-    pItem = new QMdfTreeWidgetItem(pItemBoot, mdf_type_generic_number);
-    pItem->setText(0, str);
-    pItemBoot->addChild(pItem);
-
-    str   = QString("Block Count: %1").arg(pboot->getBlockCount());
-    pItem = new QMdfTreeWidgetItem(pItemBoot, mdf_type_generic_number);
-    pItem->setText(0, str);
-    pItemBoot->addChild(pItem);
-  }
-  else {
-    spdlog::error("No bootloader object when reading MDF");
-  }
+  renderBootLoadInfo(pItemBoot);
 
   // * * * Files * * *
 
-  QMdfTreeWidgetItem* pItemFiles = new QMdfTreeWidgetItem(pItemModule, mdf_type_file);
+  QMdfTreeWidgetItem* pItemFiles = new QMdfTreeWidgetItem(pItemModule, &m_mdf, mdf_type_file);
   pItemFiles->setFont(0, fontTopItem);
   pItemFiles->setForeground(0, greenBrush);
   pItemFiles->setText(0, tr("Files"));
   ui->treeMDF->addTopLevelItem(pItemFiles);
 
-  // Manuals
-
-  if (m_mdf.getManualCount()) {
-
-    QMdfTreeWidgetItem* pItemManual = new QMdfTreeWidgetItem(pItemFiles, mdf_type_manual);
-    pItemManual->setFont(0, fontTopItem);
-    // pItemManual->setForeground(0, greenBrush);
-    pItemManual->setText(0, tr("Manuals"));
-    pItemFiles->addChild(pItemManual);
-
-    index = 0;
-    CMDF_Manual* pManualObj;
-
-    do {
-      pManualObj = m_mdf.getManualObj(index);
-      if (nullptr != pManualObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemManual, mdf_type_manual_item);
-        str                       = QString("Manual %1 - %2").arg(index).arg(pManualObj->getName().c_str());
-        pItem->setText(0, str);
-        pItemManual->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: %1").arg(pManualObj->getName().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: ") + pManualObj->getUrl().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Format: ") + pManualObj->getFormat().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        fillDescriptionItems(pItem, pManualObj, pManualObj->getMapDescription());
-        fillInfoUrlItems(pItem, pManualObj, pManualObj->getMapInfoUrl());
-      }
-
-      index++;
-
-    } while (nullptr != pManualObj);
-  }
 
   // Picture file(s)
 
-  if (m_mdf.getPictureCount()) {
-
-    QMdfTreeWidgetItem* pItemPicture = new QMdfTreeWidgetItem(pItemFiles, mdf_type_picture);
-    pItemPicture->setFont(0, fontTopItem);
-    // pItemPicture->setForeground(0, greenBrush);
-    pItemPicture->setText(0, tr("Pictures"));
-    pItemFiles->addChild(pItemPicture);
-
-    index = 0;
-    CMDF_Picture* pPictureObj;
-
-    do {
-      pPictureObj = m_mdf.getPictureObj(index);
-      if (nullptr != pPictureObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemPicture, mdf_type_picture_item);
-        str                       = QString("Picture %1 - ").arg(index) + pPictureObj->getName().c_str();
-        pItem->setText(0, str);
-        pItemPicture->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: ") + pPictureObj->getName().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: ") + pPictureObj->getUrl().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
+  QMdfTreeWidgetItem* pItemPicture = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_picture);
+  pItemPicture->setFont(0, fontTopItem);
+  pItemPicture->setText(0, tr("Pictures"));
+  pItemFiles->addChild(pItemPicture);
 
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Format: ") + pPictureObj->getFormat().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
+  renderPictureItems(pItemPicture);
 
-        fillDescriptionItems(pItem, pPictureObj, pPictureObj->getMapDescription());
-        fillInfoUrlItems(pItem, pPictureObj, pPictureObj->getMapInfoUrl());
-      }
+  // Manuals
 
-      index++;
+  QMdfTreeWidgetItem* pItemManual = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_manual);
+  pItemManual->setFont(0, fontTopItem);
+  pItemManual->setText(0, tr("Manuals"));
+  pItemFiles->addChild(pItemManual);
 
-    } while (nullptr != pPictureObj);
-  }
+  renderManualItems(pItemManual);
 
   // Video file(s)
 
-  if (m_mdf.getVideoCount()) {
-
-    QMdfTreeWidgetItem* pItemVideo = new QMdfTreeWidgetItem(pItemFiles, mdf_type_video);
-    pItemVideo->setFont(0, fontTopItem);
-    // pItemVideo->setForeground(0, greenBrush);
-    pItemVideo->setText(0, tr("Videos"));
-    pItemFiles->addChild(pItemVideo);
-
-    index = 0;
-    CMDF_Video* pVideoObj;
-
-    do {
-      pVideoObj = m_mdf.getVideoObj(index);
-      if (nullptr != pVideoObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemVideo, mdf_type_video_item);
-        str                       = QString("Video %1 - ").arg(index) + pVideoObj->getName().c_str();
-        pItem->setText(0, str);
-        pItemVideo->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: ") + pVideoObj->getName().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: ") + pVideoObj->getUrl().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Format: ") + pVideoObj->getFormat().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        fillDescriptionItems(pItem, pVideoObj, pVideoObj->getMapDescription());
-        fillInfoUrlItems(pItem, pVideoObj, pVideoObj->getMapInfoUrl());
-      }
-
-      index++;
+  QMdfTreeWidgetItem* pItemVideo = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_video);
+  pItemVideo->setFont(0, fontTopItem);
+  pItemVideo->setText(0, tr("Videos"));
+  pItemFiles->addChild(pItemVideo);
 
-    } while (nullptr != pVideoObj);
-  }
+  renderVideoItems(pItemVideo);
 
   // Firmware file(s)
 
-  if (m_mdf.getFirmwareCount()) {
-
-    QMdfTreeWidgetItem* pItemFirmware = new QMdfTreeWidgetItem(pItemFiles, mdf_type_firmware);
-    pItemFirmware->setFont(0, fontTopItem);
-    // pItemFirmware->setForeground(0, greenBrush);
-    pItemFirmware->setText(0, tr("Firmware"));
-    pItemFiles->addChild(pItemFirmware);
-
-    index = 0;
-    CMDF_Firmware* pFirmwareObj;
-
-    do {
-      pFirmwareObj = m_mdf.getFirmwareObj(index);
-      if (nullptr != pFirmwareObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemFirmware, mdf_type_firmware_item);
-        str                       = QString("Firmware %1 - %2 %3").arg(index).arg(pFirmwareObj->getDate().c_str()).arg(pFirmwareObj->getName().c_str());
-        pItem->setText(0, str);
-        pItemFirmware->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: %1").arg(pFirmwareObj->getName().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Version: %1.%2.%3").arg(pFirmwareObj->getVersionMajor()).arg(pFirmwareObj->getVersionMinor()).arg(pFirmwareObj->getVersionPatch());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: %s").arg(pFirmwareObj->getUrl().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
-        if (nullptr != pSubItem) {
-          str = QString("Date: %1").arg(pFirmwareObj->getDate().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_number);
-        if (nullptr != pSubItem) {
-          str = QString("Target Code: %1").arg(pFirmwareObj->getTargetCode());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Target: %1").arg(pFirmwareObj->getTarget().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Format: %1").arg(pFirmwareObj->getFormat().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_number);
-        if (nullptr != pSubItem) {
-          str = QString("Size: %1").arg(pFirmwareObj->getSize());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("MD5 Checksum: %1").arg(pFirmwareObj->getMd5().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        fillDescriptionItems(pItem, pFirmwareObj, pFirmwareObj->getMapDescription());
-        fillInfoUrlItems(pItem, pFirmwareObj, pFirmwareObj->getMapInfoUrl());
-      }
-
-      index++;
+  QMdfTreeWidgetItem* pItemFirmware = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_firmware);
+  pItemFirmware->setFont(0, fontTopItem);
+  pItemFirmware->setText(0, tr("Firmware"));
+  pItemFiles->addChild(pItemFirmware);
 
-    } while (nullptr != pFirmwareObj);
-  }
+  renderFirmwareItems(pItemFirmware);
 
   // Drivers
 
-  if (m_mdf.getDriverCount()) {
-
-    QMdfTreeWidgetItem* pItemDriver = new QMdfTreeWidgetItem(pItemFiles, mdf_type_driver);
-    pItemDriver->setFont(0, fontTopItem);
-    // pItemDriver->setForeground(0, greenBrush);
-    pItemDriver->setText(0, tr("Drivers"));
-    pItemFiles->addChild(pItemDriver);
-
-    index = 0;
-    CMDF_Driver* pDriverObj;
-
-    do {
-      pDriverObj = m_mdf.getDriverObj(index);
-      if (nullptr != pDriverObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemDriver, mdf_type_driver_item);
-        str                       = QString("Driver %1 - %2 %3").arg(index).arg(pDriverObj->getName().c_str()).arg(pDriverObj->getDate().c_str());
-        pItem->setText(0, str);
-        pItemDriver->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
+  QMdfTreeWidgetItem* pItemDriver = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_driver);
+  pItemDriver->setFont(0, fontTopItem);
+  pItemDriver->setText(0, tr("Drivers"));
+  pItemFiles->addChild(pItemDriver);
 
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: %1").arg(pDriverObj->getName().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Version: %1.%2.%3").arg(pDriverObj->getVersionMajor()).arg(pDriverObj->getVersionMinor()).arg(pDriverObj->getVersionPatch());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_date);
-        if (nullptr != pSubItem) {
-          str = QString("Date: ") + pDriverObj->getDate().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: ") + pDriverObj->getUrl().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Type: ") + pDriverObj->getType().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Architecture: ") + pDriverObj->getFormat().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("OS: ") + pDriverObj->getOS().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("OS Version: ") + pDriverObj->getOSVer().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("MD5 Checksum: ") + pDriverObj->getMd5().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        fillDescriptionItems(pItem, pDriverObj, pDriverObj->getMapDescription());
-        fillInfoUrlItems(pItem, pDriverObj, pDriverObj->getMapInfoUrl());
-      }
-
-      index++;
-
-    } while (nullptr != pDriverObj);
-  }
+  renderDriverItems(pItemDriver);
 
   // Setup script
 
-  if (m_mdf.getSetupCount()) {
-
-    QMdfTreeWidgetItem* pItemSetup = new QMdfTreeWidgetItem(pItemFiles, mdf_type_setup);
-    pItemSetup->setFont(0, fontTopItem);
-    // pItemSetup->setForeground(0, greenBrush);
-    pItemSetup->setText(0, tr("Setup scripts"));
-    pItemFiles->addChild(pItemSetup);
-
-    index = 0;
-    CMDF_Setup* pSetupObj;
-
-    do {
-      pSetupObj = m_mdf.getSetupObj(index);
-      if (nullptr != pSetupObj) {
-        QMdfTreeWidgetItem* pItem = new QMdfTreeWidgetItem(pItemSetup, mdf_type_setup_item);
-        str                       = QString("Script %1 - %2").arg(index).arg(pSetupObj->getName().c_str());
-        pItem->setText(0, str);
-        pItemSetup->addChild(pItem);
-
-        QMdfTreeWidgetItem* pSubItem;
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Name: %1").arg(pSetupObj->getName().c_str());
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_url);
-        if (nullptr != pSubItem) {
-          str = QString("URL: ") + pSetupObj->getUrl().c_str();
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        pSubItem = new QMdfTreeWidgetItem(pItem, mdf_type_generic_string);
-        if (nullptr != pSubItem) {
-          str = QString("Format: ") + pSetupObj->getFormat().c_str();
-          pSubItem->setFont(0, fontTopItem);
-          // pSubItem->setForeground(0, greenBrush);
-          pSubItem->setText(0, str);
-          pItem->addChild(pSubItem);
-        }
-
-        fillDescriptionItems(pItem, pSetupObj, pSetupObj->getMapDescription());
-        fillInfoUrlItems(pItem, pSetupObj, pSetupObj->getMapInfoUrl());
-      }
-
-      index++;
+  QMdfTreeWidgetItem* pItemSetup = new QMdfTreeWidgetItem(pItemFiles, &m_mdf, mdf_type_setup);
+  pItemSetup->setFont(0, fontTopItem);
+  // pItemSetup->setForeground(0, greenBrush);
+  pItemSetup->setText(0, tr("Setup scripts"));
+  pItemFiles->addChild(pItemSetup);
 
-    } while (nullptr != pSetupObj);
-  }
+  renderSetupItems(pItemSetup);
 
   // Registers
 
@@ -1849,7 +1905,7 @@ CFrmMdf::loadMdf(void)
 
   // Fetch number of pages and pages
   nPages                           = m_mdf.getPages(pages);
-  std::deque<CMDF_Register*>* regs = m_mdf.getRegisterList();
+  std::deque<CMDF_Register*>* regs = m_mdf.getRegisterObjList();
 
   // If we have pages separate registers in pages
   if (nPages > 1) {
@@ -2309,30 +2365,30 @@ CFrmMdf::loadMdf(void)
   //   tr("Open Module Description File (MDF)"), ".", tr("MDF Files (*.mdf *.json *.xml)"));
 
   // ui->treeMDF->expandAll();
-}
+  //}
 
-///////////////////////////////////////////////////////////////////////////////
-// onFindNodesTreeWidgetItemClicked
-//
+  ///////////////////////////////////////////////////////////////////////////////
+  // onFindNodesTreeWidgetItemClicked
+  //
+
+  // void
+  // CFrmMdf::onFindNodesTreeWidgetItemClicked(QMdfTreeWidgetItem* item, int column)
+  //{
+  //  CFoundNodeWidgetItem *pItem = (CFoundNodeWidgetItem *)item;
+  //  if (nullptr == pItem) {
+  //    return;
+  //  }
 
-// void
-// CFrmMdf::onFindNodesTreeWidgetItemClicked(QMdfTreeWidgetItem* item, int column)
-//{
-//  CFoundNodeWidgetItem *pItem = (CFoundNodeWidgetItem *)item;
-//  if (nullptr == pItem) {
-//    return;
-//  }
-
-// if ((pItem->type() == TREE_LIST_FOUND_NODE_TYPE) && pItem->m_bMdf && !pItem->m_bStdRegs) {
-
-//   // Set the HTML
-//   std::string html = vscp_getDeviceInfoHtml(pItem->m_mdf, pItem->m_stdregs);
-//   ui->infoArea->setHtml(html.c_str());
-// }
-// else {
-//   ui->infoArea->setText(tr("MDF info should be loaded before device info can be viewed"));
-// }
-//}
+  // if ((pItem->type() == TREE_LIST_FOUND_NODE_TYPE) && pItem->m_bMdf && !pItem->m_bStdRegs) {
+
+  //   // Set the HTML
+  //   std::string html = vscp_getDeviceInfoHtml(pItem->m_mdf, pItem->m_stdregs);
+  //   ui->infoArea->setHtml(html.c_str());
+  // }
+  // else {
+  //   ui->infoArea->setText(tr("MDF info should be loaded before device info can be viewed"));
+  // }
+} // loadMdf
 
 ///////////////////////////////////////////////////////////////////////////////
 // onItemClicked
@@ -3120,7 +3176,7 @@ CFrmMdf::editDescription(void)
       deleteMdfWidgetChildItems(pItemDescription, mdf_type_generic_description_item);
       fillDescriptionItems(pItemDescription, pItem->getObject(), pmap, true);
 
-      //QMdfTreeWidgetItem* piter = nullptr;
+      // QMdfTreeWidgetItem* piter = nullptr;
     }
   }
 }
@@ -3229,7 +3285,7 @@ CFrmMdf::editInfoUrl(void)
       deleteMdfWidgetChildItems(pItemInfoUrl, mdf_type_generic_help_url_item);
       fillDescriptionItems(pItemInfoUrl, pItem->getObject(), pmap, true);
 
-      //QMdfTreeWidgetItem* piter = nullptr;
+      // QMdfTreeWidgetItem* piter = nullptr;
     }
   }
 }
@@ -3401,17 +3457,6 @@ CFrmMdf::editContact(void)
     return;
   }
 
-  // Must be correct object type
-  // if ((mdf_type_phone != pItem->getObjectType()) && (mdf_type_phone_item != pItem->getObjectType()) &&
-  //     (mdf_type_fax != pItem->getObjectType()) && (mdf_type_fax_item != pItem->getObjectType()) &&
-  //     (mdf_type_email != pItem->getObjectType()) && (mdf_type_email_item != pItem->getObjectType()) &&
-  //     (mdf_type_web != pItem->getObjectType()) && (mdf_type_web_item != pItem->getObjectType()) &&
-  //     (mdf_type_social != pItem->getObjectType()) && (mdf_type_social_item != pItem->getObjectType())) {
-  //   int ret = QMessageBox::critical(this, tr("MDF contact edit"), tr("This is not a contact item"));
-  //   spdlog::error("MDF contact edit - Not a contact item");
-  //   return;
-  // }
-
   switch (pItem->getObjectType()) {
 
     case mdf_type_phone: {
@@ -3564,4 +3609,126 @@ CFrmMdf::editContact(void)
       spdlog::error("MDF contact edit - Not a contact item");
       break;
   }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// editBootLoader
+//
+
+void
+CFrmMdf::editBootLoader(void)
+{
+  QMdfTreeWidgetItem* pItem         = (QMdfTreeWidgetItem*)ui->treeMDF->currentItem();
+  QMdfTreeWidgetItem* pBootHeadItem = nullptr;
+  uint16_t selectedIndex            = pItem->getElementIndex();
+
+  // Item must be selected
+  if (nullptr == pItem) {
+    int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("No MDF bootloader item selected"));
+    return;
+  }
+
+  // Must have an object
+  if (nullptr == pItem->getObject()) {
+    int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("Internal error: Invalid bootloader object"));
+    spdlog::error("MDF bootloader edit - object has nullptr");
+    return;
+  }
+
+  CMDF_BootLoaderInfo* pBootInfo = (CMDF_BootLoaderInfo*)pItem->getObject();
+  if (nullptr == pBootInfo) {
+    int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("No bootloader item object"));
+    return;
+  }
+
+  CDlgMdfBootLoader dlg(this);
+
+  switch (pItem->getObjectType()) {
+
+    case mdf_type_bootloader:
+      pBootHeadItem = pItem;
+      pBootHeadItem->setExpanded(true);
+      break;
+
+    case mdf_type_bootloader_item: {
+      pBootHeadItem = (QMdfTreeWidgetItem*)pItem->parent();
+      break;
+    }
+
+    default:
+      int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("This is not a bootloader item"));
+      spdlog::error("MDF bootloader edit - Not a bootloader item");
+      break;
+  }
+
+  dlg.initDialogData(pBootInfo, static_cast<mdf_bootloader_index>(selectedIndex));
+  if (QDialog::Accepted == dlg.exec()) {
+
+    QMdfTreeWidgetItem* piter = (QMdfTreeWidgetItem*)ui->treeMDF->itemBelow(pBootHeadItem);
+    while (mdf_type_bootloader_item == piter->getObjectType()) {
+      pItem->removeChild(piter);
+      delete piter;
+      piter = (QMdfTreeWidgetItem*)ui->treeMDF->itemBelow(pBootHeadItem);
+    }
+
+    renderBootLoadInfo(pBootHeadItem, selectedIndex);
+  }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// editFileList
+//
+
+void
+CFrmMdf::editFileList(void)
+{
+  QMdfTreeWidgetItem* pItem         = (QMdfTreeWidgetItem*)ui->treeMDF->currentItem();
+  QMdfTreeWidgetItem* pFileHeadItem = nullptr;
+  uint16_t selectedIndex            = pItem->getElementIndex();
+
+  // Item must be selected
+  if (nullptr == pItem) {
+    int ret = QMessageBox::critical(this, tr("MDF file list edit"), tr("No MDF file list item selected"));
+    return;
+  }
+
+  // Must have an object
+  if (nullptr == pItem->getObject()) {
+    int ret = QMessageBox::critical(this, tr("MDF file list edit"), tr("Internal error: Invalid file list object"));
+    spdlog::error("MDF bootloader edit - object has nullptr");
+    return;
+  }
+
+  CDlgMdfFile dlg(this);
+  dlg.initDialogData(pItem->getObject(), pItem->getObjectType());
+  if (QDialog::Accepted == dlg.exec()) {
+  
+  }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// editFile
+//
+
+void
+CFrmMdf::editFile(void)
+{
+  QMdfTreeWidgetItem* pItem         = (QMdfTreeWidgetItem*)ui->treeMDF->currentItem();
+  QMdfTreeWidgetItem* pBootHeadItem = nullptr;
+  uint16_t selectedIndex            = pItem->getElementIndex();
+
+  // Item must be selected
+  if (nullptr == pItem) {
+    int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("No MDF bootloader item selected"));
+    return;
+  }
+
+  // Must have an object
+  if (nullptr == pItem->getObject()) {
+    int ret = QMessageBox::critical(this, tr("MDF bootloader edit"), tr("Internal error: Invalid bootloader object"));
+    spdlog::error("MDF bootloader edit - object has nullptr");
+    return;
+  }
 }
\ No newline at end of file
diff --git a/src/cfrmmdf.h b/src/cfrmmdf.h
index 35077dca..0febfb6b 100644
--- a/src/cfrmmdf.h
+++ b/src/cfrmmdf.h
@@ -209,6 +209,15 @@ public slots:
   /// Edit phone/fax/email/web/social data
   void editContact(void);
 
+  /// Edit bootloader data
+  void editBootLoader(void);
+
+  /// Edit file list (top item file header)
+  void editFileList(void);
+
+  /// Edit file objects
+  void editFile(void);
+
   /*!
     Fill in data from info map as children to parent item
 
@@ -311,6 +320,64 @@ public slots:
   void
   renderManufacturerSocial(QMdfTreeWidgetItem *pItemSocialHead);
 
+
+  /*!
+    Render bootloader info
+    @param pItemBootHead Pointer to boot info head
+  */
+  void
+  renderBootLoadInfo(QMdfTreeWidgetItem* pItemBootHead, uint16_t selectedIndex = 0);
+
+  
+
+  /*!
+    Render picture items
+    @param pItemPicture Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderPictureItems(QMdfTreeWidgetItem* pItemPicture, uint16_t selectedIndex = 0);
+
+  /*!
+    Render video items
+    @param pItemVideo Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderVideoItems(QMdfTreeWidgetItem* pItemVideo, uint16_t selectedIndex = 0);
+
+  /*!
+    Render manual items
+    @param pItemManual Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderManualItems(QMdfTreeWidgetItem* pItemManual, uint16_t selectedIndex = 0);
+
+  /*!
+    Render driver items
+    @param pItemDriver Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderDriverItems(QMdfTreeWidgetItem* pItemDriver, uint16_t selectedIndex = 0);
+
+  /*!
+    Render setup items
+    @param pItemSetup Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderSetupItems(QMdfTreeWidgetItem* pItemSetup, uint16_t selectedIndex = 0);
+
+  /*!
+    Render firmware items
+    @param pItemFirmware Pointer to header item in tree for sub items
+    @param selectedIndex Item that should be selected
+  */
+  void
+  renderFirmwareItems(QMdfTreeWidgetItem* pItemFirmware, uint16_t selectedIndex = 0);
+
   /// Do the new operation
   void newMdf(void);