diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d3c6a8ef87..438f7f35d4 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -212,6 +212,7 @@ set( COMMON_WIDGET_SRCS
     widgets/grid_icon_text_helpers.cpp
     widgets/grid_text_button_helpers.cpp
     widgets/grid_text_helpers.cpp
+    widgets/html_window.cpp
     widgets/indicator_icon.cpp
     widgets/wx_infobar.cpp
     widgets/kistatusbar.cpp
@@ -393,7 +394,6 @@ set( COMMON_SRCS
     grid_tricks.cpp
     hotkey_store.cpp
     hotkeys_basic.cpp
-    html_window.cpp
     kiface_base.cpp
     kiid.cpp
     kiway.cpp
diff --git a/common/dialogs/dialog_display_html_text_base.cpp b/common/dialogs/dialog_display_html_text_base.cpp
index cc5a6186da..a3e4b2b901 100644
--- a/common/dialogs/dialog_display_html_text_base.cpp
+++ b/common/dialogs/dialog_display_html_text_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -18,7 +18,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent,
 
 	bMainSizer->SetMinSize( wxSize( 540,240 ) );
 	m_htmlWindow = new HTML_WINDOW( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
-	bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 );
+	bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 10 );
 
 	m_sdbSizer1 = new wxStdDialogButtonSizer();
 	m_sdbSizer1OK = new wxButton( this, wxID_OK );
diff --git a/common/dialogs/dialog_display_html_text_base.fbp b/common/dialogs/dialog_display_html_text_base.fbp
index c6247e09e5..4862729643 100644
--- a/common/dialogs/dialog_display_html_text_base.fbp
+++ b/common/dialogs/dialog_display_html_text_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="15" />
+    <FileVersion major="1" minor="16" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -14,6 +14,7 @@
         <property name="file">dialog_display_html_text_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_display_html_text_base</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -50,6 +52,7 @@
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title"></property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
@@ -108,7 +111,7 @@
                         <property name="show">1</property>
                         <property name="size"></property>
                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
diff --git a/common/dialogs/dialog_display_html_text_base.h b/common/dialogs/dialog_display_html_text_base.h
index 55a9d8ae50..b084d22e3b 100644
--- a/common/dialogs/dialog_display_html_text_base.h
+++ b/common/dialogs/dialog_display_html_text_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "dialog_shim.h"
 #include <wx/html/htmlwin.h>
 #include <wx/gdicmn.h>
diff --git a/common/dialogs/dialog_plugin_options_base.fbp b/common/dialogs/dialog_plugin_options_base.fbp
index 95db69a364..08364b4f86 100644
--- a/common/dialogs/dialog_plugin_options_base.fbp
+++ b/common/dialogs/dialog_plugin_options_base.fbp
@@ -555,7 +555,7 @@
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
                                         <property name="window_extra_style"></property>
diff --git a/common/dialogs/dialog_plugin_options_base.h b/common/dialogs/dialog_plugin_options_base.h
index 0d08cc8d91..987f7ff251 100644
--- a/common/dialogs/dialog_plugin_options_base.h
+++ b/common/dialogs/dialog_plugin_options_base.h
@@ -13,7 +13,7 @@
 class STD_BITMAP_BUTTON;
 class WX_GRID;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "dialog_shim.h"
 #include <wx/colour.h>
 #include <wx/settings.h>
diff --git a/common/html_window.cpp b/common/widgets/html_window.cpp
similarity index 98%
rename from common/html_window.cpp
rename to common/widgets/html_window.cpp
index 5cdfd25219..afee719349 100644
--- a/common/html_window.cpp
+++ b/common/widgets/html_window.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <html_window.h>
+#include <widgets/html_window.h>
 #include <wx/settings.h>
 
 
diff --git a/common/widgets/wx_html_report_box.h b/common/widgets/wx_html_report_box.h
index bda36a68a2..9b52cedfbe 100644
--- a/common/widgets/wx_html_report_box.h
+++ b/common/widgets/wx_html_report_box.h
@@ -22,7 +22,7 @@
 
 #include <reporter.h>
 #include <vector>
-#include <html_window.h>
+#include <widgets/html_window.h>
 #include <eda_units.h>
 
 /**
diff --git a/common/widgets/wx_html_report_panel_base.cpp b/common/widgets/wx_html_report_panel_base.cpp
index 63b656fec2..f7f76cf9b4 100644
--- a/common/widgets/wx_html_report_panel_base.cpp
+++ b/common/widgets/wx_html_report_panel_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/common/widgets/wx_html_report_panel_base.fbp b/common/widgets/wx_html_report_panel_base.fbp
index 7d77bb7f9b..b000ab0f95 100644
--- a/common/widgets/wx_html_report_panel_base.fbp
+++ b/common/widgets/wx_html_report_panel_base.fbp
@@ -126,7 +126,7 @@
                                 <property name="show">1</property>
                                 <property name="size"></property>
                                 <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
diff --git a/common/widgets/wx_html_report_panel_base.h b/common/widgets/wx_html_report_panel_base.h
index 1f5749a7c4..f34fc75ccc 100644
--- a/common/widgets/wx_html_report_panel_base.h
+++ b/common/widgets/wx_html_report_panel_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include <wx/html/htmlwin.h>
 #include <wx/gdicmn.h>
 #include <wx/font.h>
diff --git a/eeschema/dialogs/dialog_choose_symbol.h b/eeschema/dialogs/dialog_choose_symbol.h
index 6fef667738..03aff6036a 100644
--- a/eeschema/dialogs/dialog_choose_symbol.h
+++ b/eeschema/dialogs/dialog_choose_symbol.h
@@ -27,7 +27,7 @@
 #include "dialog_shim.h"
 #include <symbol_tree_model_adapter.h>
 #include <footprint_info.h>
-#include <html_window.h>
+#include <widgets/html_window.h>
 
 class wxCheckBox;
 class wxStaticBitmap;
diff --git a/eeschema/dialogs/dialog_rescue_each_base.cpp b/eeschema/dialogs/dialog_rescue_each_base.cpp
index 864067e958..241859435f 100644
--- a/eeschema/dialogs/dialog_rescue_each_base.cpp
+++ b/eeschema/dialogs/dialog_rescue_each_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_rescue_each_base.fbp b/eeschema/dialogs/dialog_rescue_each_base.fbp
index ed3dca2546..dcdb1c2533 100644
--- a/eeschema/dialogs/dialog_rescue_each_base.fbp
+++ b/eeschema/dialogs/dialog_rescue_each_base.fbp
@@ -121,7 +121,7 @@
                                 <property name="show">1</property>
                                 <property name="size"></property>
                                 <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
diff --git a/eeschema/dialogs/dialog_rescue_each_base.h b/eeschema/dialogs/dialog_rescue_each_base.h
index b086bc83d1..f92e30459b 100644
--- a/eeschema/dialogs/dialog_rescue_each_base.h
+++ b/eeschema/dialogs/dialog_rescue_each_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "dialog_shim.h"
 #include <wx/html/htmlwin.h>
 #include <wx/gdicmn.h>
diff --git a/eeschema/dialogs/dialog_symbol_remap_base.cpp b/eeschema/dialogs/dialog_symbol_remap_base.cpp
index e59224463e..96890604d6 100644
--- a/eeschema/dialogs/dialog_symbol_remap_base.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_symbol_remap_base.fbp b/eeschema/dialogs/dialog_symbol_remap_base.fbp
index 5ae119eeb4..59de754d15 100644
--- a/eeschema/dialogs/dialog_symbol_remap_base.fbp
+++ b/eeschema/dialogs/dialog_symbol_remap_base.fbp
@@ -120,7 +120,7 @@
                                 <property name="show">1</property>
                                 <property name="size"></property>
                                 <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
@@ -347,7 +347,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="subclass">WX_HTML_REPORT_PANEL; wx_html_report_panel.h</property>
+                                <property name="subclass">WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare</property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
diff --git a/eeschema/dialogs/dialog_symbol_remap_base.h b/eeschema/dialogs/dialog_symbol_remap_base.h
index 6ed801cdca..7cc47a8c79 100644
--- a/eeschema/dialogs/dialog_symbol_remap_base.h
+++ b/eeschema/dialogs/dialog_symbol_remap_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.0)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,7 +12,7 @@
 #include <wx/intl.h>
 class WX_HTML_REPORT_PANEL;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "dialog_shim.h"
 #include <wx/html/htmlwin.h>
 #include <wx/gdicmn.h>
diff --git a/include/html_window.h b/include/widgets/html_window.h
similarity index 100%
rename from include/html_window.h
rename to include/widgets/html_window.h
diff --git a/include/widgets/lib_tree.h b/include/widgets/lib_tree.h
index 5164d48a09..a991e06eb0 100644
--- a/include/widgets/lib_tree.h
+++ b/include/widgets/lib_tree.h
@@ -28,7 +28,7 @@
 #include <wx/panel.h>
 #include <wx/timer.h>
 #include <lib_tree_model_adapter.h>
-#include <html_window.h>
+#include <widgets/html_window.h>
 #include <widgets/wx_dataviewctrl.h>
 
 class wxTextCtrl;
diff --git a/kicad/dialogs/dialog_template_selector_base.cpp b/kicad/dialogs/dialog_template_selector_base.cpp
index 197862c701..7011c9d5b0 100644
--- a/kicad/dialogs/dialog_template_selector_base.cpp
+++ b/kicad/dialogs/dialog_template_selector_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/kicad/dialogs/dialog_template_selector_base.fbp b/kicad/dialogs/dialog_template_selector_base.fbp
index e6659c5708..bc4b7c30ac 100644
--- a/kicad/dialogs/dialog_template_selector_base.fbp
+++ b/kicad/dialogs/dialog_template_selector_base.fbp
@@ -455,7 +455,7 @@
                         <property name="show">1</property>
                         <property name="size">-1,-1</property>
                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
diff --git a/kicad/dialogs/dialog_template_selector_base.h b/kicad/dialogs/dialog_template_selector_base.h
index 51cb5488e6..735463772e 100644
--- a/kicad/dialogs/dialog_template_selector_base.h
+++ b/kicad/dialogs/dialog_template_selector_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,7 +12,7 @@
 #include <wx/intl.h>
 class STD_BITMAP_BUTTON;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp
index 50019cf074..54e7e801e6 100644
--- a/kicad/pcm/dialogs/panel_packages_view.cpp
+++ b/kicad/pcm/dialogs/panel_packages_view.cpp
@@ -20,7 +20,7 @@
 
 #include "panel_packages_view.h"
 #include <grid_tricks.h>
-#include <html_window.h>
+#include <widgets/html_window.h>
 #include <pgm_base.h>
 #include <kiplatform/ui.h>
 #include <settings/common_settings.h>
diff --git a/kicad/pcm/dialogs/panel_packages_view_base.cpp b/kicad/pcm/dialogs/panel_packages_view_base.cpp
index 74570e032f..0db4e44e8e 100644
--- a/kicad/pcm/dialogs/panel_packages_view_base.cpp
+++ b/kicad/pcm/dialogs/panel_packages_view_base.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "widgets/wx_panel.h"
 
 #include "panel_packages_view_base.h"
diff --git a/kicad/pcm/dialogs/panel_packages_view_base.fbp b/kicad/pcm/dialogs/panel_packages_view_base.fbp
index 189b92148b..2465eedb3a 100644
--- a/kicad/pcm/dialogs/panel_packages_view_base.fbp
+++ b/kicad/pcm/dialogs/panel_packages_view_base.fbp
@@ -563,7 +563,7 @@
                                                         <property name="show">1</property>
                                                         <property name="size"></property>
                                                         <property name="style">wxHW_SCROLLBAR_NEVER</property>
-                                                        <property name="subclass">HTML_WINDOW; html_window.h; forward_declare</property>
+                                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; forward_declare</property>
                                                         <property name="toolbar_pane">0</property>
                                                         <property name="tooltip"></property>
                                                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
index eac5cd0fb1..a39464ac23 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
@@ -27,7 +27,7 @@
 #include <string_utils.h>
 #include "iec60664.h"
 #include <wx/string.h>
-#include <html_window.h>
+#include <widgets/html_window.h>
 #include <bitmaps.h>
 
 
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp
index 9bddf0c245..fdc721fcf4 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 
 #include "panel_electrical_spacing_iec60664_base.h"
 
@@ -23,7 +23,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE(
 
 	m_stTitle = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Insulation for equipment within low-voltage supply systems"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_stTitle->Wrap( -1 );
-	m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
 	bSizerMain->Add( m_stTitle, 0, wxALIGN_CENTER|wxALL, 5 );
 
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp
index 107502e8e4..c004275398 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp
@@ -2897,7 +2897,7 @@
                                             <property name="show">1</property>
                                             <property name="size"></property>
                                             <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                            <property name="subclass">HTML_WINDOW; html_window.h; forward_declare</property>
+                                            <property name="subclass">HTML_WINDOW; widgets/html_window.h; forward_declare</property>
                                             <property name="toolbar_pane">0</property>
                                             <property name="tooltip"></property>
                                             <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h
index 2169a84794..0d01318540 100644
--- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h
+++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp b/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp
index dcdf7d6b50..f12b496ab3 100644
--- a/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp b/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp
index 2877e273c2..9fd713b44f 100644
--- a/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.fbp
@@ -35,7 +35,6 @@
             <property name="bg"></property>
             <property name="context_help"></property>
             <property name="context_menu">1</property>
-            <property name="drag_accept_files">0</property>
             <property name="enabled">1</property>
             <property name="event_handler">impl_virtual</property>
             <property name="fg"></property>
@@ -117,7 +116,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="drag_col_move">0</property>
                                         <property name="drag_col_size">0</property>
                                         <property name="drag_grid_size">0</property>
@@ -220,7 +218,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="drag_col_move">0</property>
                                         <property name="drag_col_size">0</property>
                                         <property name="drag_grid_size">0</property>
@@ -300,7 +297,6 @@
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
-                        <property name="drag_accept_files">0</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
@@ -326,7 +322,7 @@
                         <property name="show">1</property>
                         <property name="size"></property>
                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_eseries_display_base.h b/pcb_calculator/calculator_panels/panel_eseries_display_base.h
index 3d59825fb1..8aa761beda 100644
--- a/pcb_calculator/calculator_panels/panel_eseries_display_base.h
+++ b/pcb_calculator/calculator_panels/panel_eseries_display_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panels/calculator_panel.h"
 #include <wx/colour.h>
 #include <wx/settings.h>
diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp b/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp
index 072d046ca5..636253079f 100644
--- a/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp b/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp
index da59b97d7c..f21f320cc2 100644
--- a/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.fbp
@@ -1792,7 +1792,7 @@
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
                                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_fusing_current_base.h b/pcb_calculator/calculator_panels/panel_fusing_current_base.h
index c6120cb679..d5d87cf164 100644
--- a/pcb_calculator/calculator_panels/panel_fusing_current_base.h
+++ b/pcb_calculator/calculator_panels/panel_fusing_current_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -13,7 +13,7 @@
 class UNIT_SELECTOR_LEN;
 class UNIT_SELECTOR_THICKNESS;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panels/calculator_panel.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp
index 877b39be27..7608d77f74 100644
--- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp
index 23a7cea482..215f7ff4c9 100644
--- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.fbp
@@ -260,7 +260,7 @@
                         <property name="show">1</property>
                         <property name="size"></property>
                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h
index 39efcc902c..4b6e8c32f4 100644
--- a/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h
+++ b/pcb_calculator/calculator_panels/panel_galvanic_corrosion_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panels/calculator_panel.h"
 #include <wx/colour.h>
 #include <wx/settings.h>
diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp b/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp
index 9d88f3b215..b195604612 100644
--- a/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp b/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp
index 2187511e6e..a2665f6646 100644
--- a/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.fbp
@@ -35,7 +35,6 @@
             <property name="bg"></property>
             <property name="context_help"></property>
             <property name="context_menu">1</property>
-            <property name="drag_accept_files">0</property>
             <property name="enabled">1</property>
             <property name="event_handler">impl_virtual</property>
             <property name="fg"></property>
@@ -47,7 +46,7 @@
             <property name="name">PANEL_R_CALCULATOR_BASE</property>
             <property name="pos"></property>
             <property name="size">-1,-1</property>
-            <property name="subclass">CALCULATOR_PANEL; calculator_panels/panel_r_calculator.h; forward_declare</property>
+            <property name="subclass">CALCULATOR_PANEL; calculator_panels/calculator_panel.h; forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
@@ -120,7 +119,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -182,7 +180,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -247,7 +244,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -309,7 +305,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -371,7 +366,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -436,7 +430,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -498,7 +491,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -560,7 +552,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -625,7 +616,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -689,7 +679,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
@@ -757,7 +746,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -823,7 +811,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -889,7 +876,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -955,7 +941,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1021,7 +1006,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1119,7 +1103,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1181,7 +1164,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1246,7 +1228,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1308,7 +1289,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1373,7 +1353,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1435,7 +1414,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1497,7 +1475,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1562,7 +1539,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1624,7 +1600,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1689,7 +1664,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1751,7 +1725,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1813,7 +1786,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1878,7 +1850,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -1940,7 +1911,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -2005,7 +1975,6 @@
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
                                                 <property name="enabled">1</property>
                                                 <property name="fg"></property>
                                                 <property name="floatable">1</property>
@@ -2069,7 +2038,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
@@ -2133,7 +2101,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
@@ -2239,7 +2206,6 @@
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="floatable">1</property>
@@ -2265,7 +2231,7 @@
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
                                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_r_calculator_base.h b/pcb_calculator/calculator_panels/panel_r_calculator_base.h
index c03409bda8..a411899223 100644
--- a/pcb_calculator/calculator_panels/panel_r_calculator_base.h
+++ b/pcb_calculator/calculator_panels/panel_r_calculator_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panels/calculator_panel.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp
index 8ffb23511b..ab4ccf3e00 100644
--- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp
@@ -1,10 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
+#include "widgets/html_window.h"
 #include "widgets/std_bitmap_button.h"
 
 #include "panel_rf_attenuators_base.h"
diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp
index d88ebfbf0b..f6ed615af2 100644
--- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp
@@ -1682,7 +1682,7 @@
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="style">wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
                                         <property name="window_extra_style"></property>
@@ -1765,7 +1765,7 @@
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="style">wxHW_SCROLLBAR_AUTO</property>
-                                        <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                        <property name="subclass">HTML_WINDOW; widgets/html_window.h; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
                                         <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h
index 8f6c9a3e2a..5e07c42989 100644
--- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h
+++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,9 +10,10 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
+class HTML_WINDOW;
 class STD_BITMAP_BUTTON;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panel.h"
 #include <wx/string.h>
 #include <wx/radiobox.h>
diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.cpp b/pcb_calculator/calculator_panels/panel_track_width_base.cpp
index 620ab40365..9b26ec43c2 100644
--- a/pcb_calculator/calculator_panels/panel_track_width_base.cpp
+++ b/pcb_calculator/calculator_panels/panel_track_width_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.fbp b/pcb_calculator/calculator_panels/panel_track_width_base.fbp
index 84aed9773d..eaaf71d134 100644
--- a/pcb_calculator/calculator_panels/panel_track_width_base.fbp
+++ b/pcb_calculator/calculator_panels/panel_track_width_base.fbp
@@ -900,7 +900,7 @@
                                 <property name="show">1</property>
                                 <property name="size"></property>
                                 <property name="style">wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO</property>
-                                <property name="subclass">HTML_WINDOW; html_window.h; </property>
+                                <property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.h b/pcb_calculator/calculator_panels/panel_track_width_base.h
index 0814faf14b..4e7e041f0d 100644
--- a/pcb_calculator/calculator_panels/panel_track_width_base.h
+++ b/pcb_calculator/calculator_panels/panel_track_width_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -13,7 +13,7 @@
 class UNIT_SELECTOR_LEN;
 class UNIT_SELECTOR_THICKNESS;
 
-#include "html_window.h"
+#include "widgets/html_window.h"
 #include "calculator_panels/calculator_panel.h"
 #include <wx/string.h>
 #include <wx/stattext.h>