diff --git a/analyzers/cppcheck/kdevcppcheck.rc b/analyzers/cppcheck/kdevcppcheck.rc
index 131b891bd5..d327e80b65 100644
--- a/analyzers/cppcheck/kdevcppcheck.rc
+++ b/analyzers/cppcheck/kdevcppcheck.rc
@@ -1,10 +1,10 @@
-<!DOCTYPE kpartgui>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevcppcheck" version="8" translationDomain="kdevcppcheck">
 <MenuBar>
   <Menu name="analyze">
     <Action name="cppcheck_file"/>
     <Action name="cppcheck_project"/>
     <Separator/>
   </Menu>
 </MenuBar>
 </gui>
diff --git a/analyzers/heaptrack/kdevheaptrack.rc b/analyzers/heaptrack/kdevheaptrack.rc
index 2c496b63d3..81ba4ca77a 100644
--- a/analyzers/heaptrack/kdevheaptrack.rc
+++ b/analyzers/heaptrack/kdevheaptrack.rc
@@ -1,12 +1,12 @@
-<!DOCTYPE kpartgui>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevheaptrack" version="2" translationDomain="kdevheaptrack">
 <MenuBar>
   <Menu name="run">
     <Menu name="debug_attach_menu">
       <Action name="heaptrack_attach"/>
     </Menu>
 
     <Action name="heaptrack_launch" group="run_operations"/>
   </Menu>
 </MenuBar>
 </gui>
diff --git a/app/kdevelopui.rc b/app/kdevelopui.rc
index c230b27955..f2d25cce63 100644
--- a/app/kdevelopui.rc
+++ b/app/kdevelopui.rc
@@ -1,200 +1,200 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui version="144" name="kdevelop" translationDomain="kdevelop">
 <MenuBar>
 
   <Menu name="session" append="first_menu">
     <text context="@title:menu">Session</text>
   </Menu>
 
   <Menu name="project" append="first_menu">
     <text context="@title:menu">&amp;Project</text>
     <DefineGroup name="project_new"/>
     <Separator/>
     <Action name="project_open"/>
     <Action name="project_fetch"/>
     <Action name="project_open_recent"/>
     <Action name="project_open_for_file"/>
     <Separator/>
 
     <Merge />
     <Separator />
     <Action name="project_open_config" />
 
     <Separator/>
     <Action name="project_close"/>
     <Action name="project_close_all"/>
   </Menu>
 
   <Menu name="run" append="first_menu">
     <text name="@title:menu">&amp;Run</text>
 
     <Action name="run_default_target" />
     <Action name="configure_launches" />
     <Action name="run_execute" /> <!-- ### remove me -->
     <Action name="run_debug" /> <!-- ### remove me -->
     <Action name="run_profile" /> <!-- ### remove me -->
 
     <Menu name="debug_core_menu">
       <text name="@title:menu">Examine Core File</text>
     </Menu>
 
     <Menu name="debug_attach_menu">
       <text name="@title:menu">Attach to Process</text>
     </Menu>
 
     <Separator />
     <DefineGroup name="run_operations" />
     <Separator />
 
     <Action name="run_stop_all" />
     <Action name="run_stop_menu" />
 
 
     <Separator />
     <DefineGroup name="debug" /> <!-- ### remove me -->
 
     <Separator />
     <Merge />
   </Menu>
 
   <Menu name="analyze" append="first_menu">
     <text name="@title:menu">Analy&amp;ze</text>
     <Merge />
   </Menu>
 
   <Menu name="navigation" append="first_menu">
     <text context="@title:menu">&amp;Navigation</text>
     <DefineGroup name="navigation_file"/>
     <Separator />
     <Action name="prev_error" />
     <Action name="next_error" />
     <Separator />
     <DefineGroup name="navigation_code"/>
     <Separator />
     <DefineGroup name="navigation_fxn"/>
     <Separator />
     <DefineGroup name="navigation_jmp"/>
     <Separator />
     <DefineGroup name="navigation_use"/>
     <Separator />
     <DefineGroup name="navigation_cxt"/>
     <Separator />
     <Action name="source_browse_mode"/>
     <Separator />
     <Merge />
   </Menu>
 
   <Separator append="first_menu" style="visible"/>
 
   <Menu name="file">
     <text context="@title:menu">&amp;File</text>
     <DefineGroup append="new_merge" name="new_merge"/>
     <DefineGroup append="open_merge" name="open_merge"/>
     <DefineGroup append="save_merge" name="save_merge"/>
     <DefineGroup append="revert_merge" name="revert_merge"/>
     <DefineGroup append="print_merge" name="print_merge"/>
     <Action name="file_closeother" append="close_merge"/>
     <DefineGroup append="close_merge" name="close_merge"/>
   </Menu>
 
   <Menu name="edit">
     <text context="@title:menu">&amp;Edit</text>
     <DefineGroup append="edit_undo_merge" name="edit_undo_merge"/>
     <DefineGroup append="edit_paste_merge" name="edit_paste_merge"/>
     <DefineGroup append="edit_select_merge" name="edit_select_merge"/>
     <DefineGroup append="edit_find_merge" name="edit_find_merge"/>
     <DefineGroup name="edit_formatting"/>
     <Separator/>
     <Merge/>
   </Menu>
 
   <Merge />
 
   <Menu name="code">
     <text context="@title:menu">Code</text>
     <Merge/>
   </Menu>
 
   <Separator style="visible" />
 
   <Menu name="window">
     <text context="@title:menu">&amp;Window</text>
     <Action name="new_window"/>
     <Separator/>
     <Action name="add_toolview"/>
     <Action name="select_previous_dock"/>
     <Action name="select_next_dock"/>
     <Action name="docks_submenu"/>
     <Action name="user_interface"/>
     <DefineGroup name="history_operations"/>
     <Action name="history_back"/>
     <Action name="history_forward"/>
     <Separator/>
     <Action name="file_switchto"/>
     <Separator/>
     <DefineGroup name="error_operations"/>
     <Separator/>
     <Merge/>
     <Separator/>
     <DefineGroup name="view_operations"/>
     <Action name="view_previous_window"/>
     <Action name="view_next_window"/>
     <Separator/>
     <Action name="split_horizontal"/>
     <Action name="split_vertical"/>
     <Action name="view_previous_split"/>
     <Action name="view_next_split"/>
     <Separator/>
     <DefineGroup name="window_operations"/>
     <Separator/>
     <Action name="focus_editor"/>
     <Separator/>
     <Action name="show_left_dock"/>
     <Action name="show_right_dock"/>
     <Action name="show_bottom_dock"/>
     <Action name="hide_all_docks"/>
     <Separator/>
     <Merge/>
   </Menu>
 
   <Menu name="settings">
     <text context="@title:menu">Settings</text>
     <Action name="colorscheme_menu"/>
     <DefineGroup append="show_toolbar_merge" name="show_toolbar_merge"/>
     <DefineGroup append="show_merge" name="show_merge" />
     <DefineGroup append="configure_merge" name="configure_merge" />
   </Menu>
 
   <Menu name="help">
     <text context="@title:menu">Help</text>
     <Action name="loaded_plugins" append="about_merge" />
     <Action name="about_platform" append="about_merge" />
   </Menu>
 
 </MenuBar>
 
 <ToolBar name="mainToolBar" position="Top" noMerge="1">
   <text>Main Toolbar</text>
   <Action name="area_switcher"/>
   <Separator/>
   <DefineGroup append="build_operations" name="build_operations"/>
   <DefineGroup append="run_operations" name="run_operations"/>
   <Action name="run_execute" group="run_operations"/>
   <Action name="run_debug" group="run_operations"/>
   <Action name="run_stop_all" group="run_operations" />
   <Action name="run_stop_menu" group="run_operations" />
   <Separator/>
   <Action name="file_new" />
   <DefineGroup append="file_operations" name="file_operations"/>
   <DefineGroup append="edit_operations" name="edit_operations"/>
   <Separator/>
   <Action name="commit_current_project" />
 </ToolBar>
 
 <Menu name="rb_popup">
   <Separator/>
   <Action name="file_close"/>
   <Action name="file_closeother"/>
 </Menu>
 
 </gui>
diff --git a/debuggers/gdb/kdevgdbui.rc b/debuggers/gdb/kdevgdbui.rc
index 0e09db5390..6b053cef53 100644
--- a/debuggers/gdb/kdevgdbui.rc
+++ b/debuggers/gdb/kdevgdbui.rc
@@ -1,25 +1,25 @@
-<!DOCTYPE kpartgui>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevdgdb" version="56" translationDomain="kdevgdb">
 <MenuBar>
  <Menu name="run">
     <Menu name="debug_core_menu">
       <Action name="debug_core"/>
     </Menu>
 
     <Menu name="debug_attach_menu">
       <Action name="debug_attach"/>
     </Menu>
 
   <Separator group="debug"/>
   <Action name="debug_memview" group="debug"/>
  </Menu>
 </MenuBar>
 
 <ToolBar name="debugToolBar">
   <text>Debugger Toolbar</text>
   <Separator/>
   <Action name="debug_memview"/>
   <WeakSeparator/>
 </ToolBar>
 </gui>
 
diff --git a/debuggers/lldb/kdevlldbui.rc b/debuggers/lldb/kdevlldbui.rc
index 522769bf5e..627a754b57 100644
--- a/debuggers/lldb/kdevlldbui.rc
+++ b/debuggers/lldb/kdevlldbui.rc
@@ -1,25 +1,25 @@
-<!DOCTYPE kpartgui>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevdgdb" version="56" translationDomain="kdevgdb">
 <MenuBar>
  <Menu name="run">
    <Menu name="debug_core_menu">
      <Action name="debug_core"/>
    </Menu>
 
    <Menu name="debug_attach_menu">
      <Action name="debug_attach"/>
    </Menu>
 
    <Separator group="debug"/>
    <Action name="debug_memview" group="debug"/>
  </Menu>
 </MenuBar>
 
 <ToolBar name="debugToolBar">
   <text>Debugger Toolbar</text>
   <Separator/>
   <Action name="debug_memview"/>
   <WeakSeparator/>
 </ToolBar>
 </gui>
 
diff --git a/languages/clang/kdevclangsupport.rc b/languages/clang/kdevclangsupport.rc
index 0541afe63f..01f22a6198 100644
--- a/languages/clang/kdevclangsupport.rc
+++ b/languages/clang/kdevclangsupport.rc
@@ -1,8 +1,8 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="KDevClangSupport" version="1" translationDomain="kdevclang">
 <MenuBar>
   <Menu name="code">
     <Action name="code_rename_declaration"/>
   </Menu>
 </MenuBar>
 </gui>
diff --git a/projectbuilders/makebuilder/kdevmakebuilder.rc b/projectbuilders/makebuilder/kdevmakebuilder.rc
index cb2e6fe71f..a0d6a909ab 100644
--- a/projectbuilders/makebuilder/kdevmakebuilder.rc
+++ b/projectbuilders/makebuilder/kdevmakebuilder.rc
@@ -1,9 +1,9 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevmakebuilder" version="5" translationDomain="kdevmakebuilder">
 <MenuBar>
   <Menu name="view">
     <Action name="next_make_error" />
     <Action name="prev_make_error" />
   </Menu>
 </MenuBar>
 </gui>
diff --git a/projectmanagers/custommake/kdevcustommakemanager.rc b/projectmanagers/custommake/kdevcustommakemanager.rc
index 9e0d208a42..3386f0b4ff 100644
--- a/projectmanagers/custommake/kdevcustommakemanager.rc
+++ b/projectmanagers/custommake/kdevcustommakemanager.rc
@@ -1,8 +1,8 @@
-<!DOCTYPE kpartgui>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="kdevcustommakemanager" version="5" translationDomain="kdevcustommake">
   <MenuBar>
   <Menu name="run">
    <Action name="build_target"/>
   </Menu>
 </MenuBar>
 </gui>
diff --git a/utils/okteta/kdevokteta.rc b/utils/okteta/kdevokteta.rc
index 6c8bcaf497..08300303f1 100644
--- a/utils/okteta/kdevokteta.rc
+++ b/utils/okteta/kdevokteta.rc
@@ -1,86 +1,86 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="okteta" version="4" translationDomain="kdevokteta">
 <MenuBar>
   <Menu name="file">
     <Action name="file_save" group="save_merge" /> <!-- TODO: why isn't this offered by the host? -->
     <Action name="file_save_as" group="save_merge" />
     <Action name="export" group="save_merge" />
     <Action name="file_print" group="print_merge" />
     <Menu name="permission" group="print_merge">
       <text context="@title:menu">Permissions</text>
       <Action name="isreadonly" />
       <Action name="isoverwriteonly" />
     </Menu>
   </Menu>
   <Menu name="edit">
     <Action name="edit_undo" group="edit_undo_merge" />
     <Action name="edit_redo" group="edit_undo_merge" />
     <Separator group="edit_undo_merge" />
     <Action name="edit_cut" group="edit_paste_merge" />
     <Action name="edit_copy" group="edit_paste_merge" />
     <Action name="edit_paste" group="edit_paste_merge" />
     <Action name="copy_as" group="edit_paste_merge" />
     <Action name="insert" group="edit_paste_merge" />
     <Separator group="edit_paste_merge" />
     <Action name="edit_select_all" group="edit_select_merge" />
     <Action name="edit_deselect" group="edit_select_merge" />
     <Action name="edit_select" group="edit_select_merge" />
     <Separator group="edit_select_merge" />
     <Action name="edit_find" group="edit_find_merge" />
     <Action name="edit_find_next" group="edit_find_merge" />
     <Action name="edit_find_prev" group="edit_find_merge" />
     <Action name="edit_replace" group="edit_find_merge" />
     <Separator group="edit_find_merge" />
     <Action name="set_overwrite" group="edit_select_merge" />
     <Separator group="edit_find_merge" />
     <Action name="goto_offset" group="edit_find_merge" />
   </Menu>
 
   <Menu name="view"><text>View</text>
     <Action name="view_zoom_in" group="view_operations" />
     <Action name="view_zoom_out" group="view_operations" />
     <Separator group="view_operations" />
     <Action name="view_showsnonprinting" group="view_operations" />
     <Action name="view_lineoffset" group="view_operations" />
     <Action name="togglecolumns" group="view_operations" />
     <Separator group="view_operations" />
     <Action name="view_valuecoding" group="view_operations" />
     <Action name="view_charencoding" group="view_operations" />
     <Separator group="view_operations" />
     <Action name="view_bytesperline" group="view_operations" />
     <Action name="view_bytespergroup" group="view_operations" />
     <Action name="resizestyle" group="view_operations" />
     <Action name="viewmode" group="view_operations" />
     <Separator/>
     <Action name="view_profile" />
   </Menu>
   <Menu name="bookmarks"><text>Bookmarks</text>
     <Action name="bookmark_add" />
     <Action name="bookmark_edit" />
     <Separator/>
     <Action name="bookmark_replace" />
     <Action name="bookmark_remove" />
     <Action name="bookmark_remove_all" />
     <Separator/>
     <Action name="bookmark_previous" />
     <Action name="bookmark_next" />
     <Separator/>
     <ActionList name="bookmark_list" />
   </Menu>
 
   <Menu name="settings">
     <Action name="settings_viewprofiles_manage" group="configure_merge" />
   </Menu>
 </MenuBar>
 
 <ToolBar name="mainToolBar">
   <Action name="file_save" group="file_operations"/>
   <Action name="edit_undo" group="edit_operations" />
   <Action name="edit_redo" group="edit_operations" />
   <Separator/>
   <Action name="edit_find" group="edit_operations" />
   <Action name="edit_find_next" group="edit_operations" />
   <Action name="edit_find_last" group="edit_operations" />
 </ToolBar>
 
 </gui>