diff --git a/braindump/data/braindumpui.rc b/braindump/data/braindumpui.rc
index ecb6106243b..94c68d31bc6 100644
--- a/braindump/data/braindumpui.rc
+++ b/braindump/data/braindumpui.rc
@@ -1,18 +1,18 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 
-<kpartgui name="braindump" version="1" translationDomain="braindump">
+<gui name="braindump" version="1" translationDomain="braindump">
     <MenuBar>
         <Menu name="edit" >
         </Menu>
         <Menu name="Shapes" >
             <Text context="@title:menu">Shapes</Text>
         </Menu>
         <Menu name="view" >
             <!-- XMLGUI will drop standard menus which are not filled when
             calling setupGUI/createGUI, so as workaround adding some dummy entry
             See https://bugs.kde.org/show_bug.cgi?id=317211
             -->
             <DefineGroup name="dummyToKeepViewMenu"/>
         </Menu>
     </MenuBar>
-</kpartgui>
+</gui>
diff --git a/braindump/data/braindumpview.rc b/braindump/data/braindumpview.rc
index 951afe61b9d..edf65406065 100644
--- a/braindump/data/braindumpview.rc
+++ b/braindump/data/braindumpview.rc
@@ -1,51 +1,51 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 
-<kpartgui name="braindump" version="1" translationDomain="braindump">
+<gui name="braindump" version="1" translationDomain="braindump">
     <MenuBar>
         <Menu name="edit">
             <Action name="edit_undo"/>
             <Action name="edit_redo"/>
             <Separator/>
             <Action name="edit_cut"/>
             <Action name="edit_copy"/>
             <Action name="edit_paste"/>
             <Action name="edit_delete"/>
             <Separator/>
             <Action name="edit_select_all"/>
             <Action name="edit_deselect_all"/>
             <Separator/>
             <Action name="edit_find"/>
             <Action name="edit_findnext"/>
             <Action name="edit_findprevious"/>
             <Action name="edit_replace"/>
         </Menu>
         <Menu name="Shapes" >
             <Text>Shapes</Text>
             <Action name="shapes_duplicate" />
             <Action name="shapes_group"/>
             <Action name="shapes_ungroup"/>
         </Menu>
         <Menu name="view">
             <Action name="zoom_out"/>
             <Action name="zoom_in"/>
             <Action name="view_zoom"/>
         </Menu>
     </MenuBar>
 
     <Menu name="default_canvas_popup">
         <ActionList name="toolproxy_action_list"/>
         <Separator/>
         <Action name="edit_delete"/>
     </Menu>
 
     <ToolBar name="mainToolBar">
         <Separator/>
         <Action name="edit_undo"/>
         <Action name="edit_redo"/>
         <Separator/>
         <Action name="edit_cut"/>
         <Action name="edit_copy"/>
         <Action name="edit_paste"/>
         <Action name="edit_delete"/>
     </ToolBar>
-</kpartgui>
+</gui>
diff --git a/braindump/plugins/quickstates/quickstates.rc b/braindump/plugins/quickstates/quickstates.rc
index 3349c8acf8c..a7e1d66847f 100644
--- a/braindump/plugins/quickstates/quickstates.rc
+++ b/braindump/plugins/quickstates/quickstates.rc
@@ -1,7 +1,7 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="braindumpquickstates" version="1" translationDomain="braindump">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui library="braindumpquickstates" version="1" translationDomain="braindump">
 <MenuBar>
     <Action name="States"/>
 </MenuBar>
 
-</kpartgui>
+</gui>
diff --git a/flow/part/flow.rc b/flow/part/flow.rc
index 2cc7be6c061..7c0c86cbbe3 100644
--- a/flow/part/flow.rc
+++ b/flow/part/flow.rc
@@ -1,89 +1,89 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 
-<kpartgui name="flow" version="34" translationDomain="flow">
+<gui name="flow" version="34" translationDomain="flow">
     <MenuBar>
         <Menu name="file">
             <Text>&amp;File</Text>
             <Separator/>
             <Action name="file_encrypt_doc"/>
             <Action name="file_uncompress_doc"/>
         </Menu>
         <Menu name="edit">
             <Text>&amp;Edit</Text>
             <Action name="edit_undo"/>
             <Action name="edit_redo"/>
             <Separator/>
             <Action name="edit_cut"/>
             <Action name="edit_copy"/>
             <Action name="edit_paste"/>
             <Action name="edit_delete"/>
             <Separator/>
             <Action name="edit_select_all"/>
             <Action name="edit_deselect_all"/>
             <Separator/>
             <Action name="edit_find"/>
             <Action name="edit_findnext"/>
             <Action name="edit_findprevious"/>
             <Action name="edit_replace"/>
         </Menu>
         <Menu name="view">
             <Text>&amp;View</Text>
             <Action name="view_newview"/>
             <Separator/>
             <Action name="zoom_out"/>
             <Action name="zoom_in"/>
             <Action name="view_zoom"/>
             <Separator/>
             <Action name="view_masterpages"/>
             <Separator/>
             <Action name="view_rulers"/>
             <Separator/>
             <Action name="view_grid"/>
             <Action name="view_snaptogrid"/>
             <Action name="view_show_guides"/>
             <Action name="view_toggledockers"/>
         </Menu>
         <Menu name="insert"><text>&amp;Insert</text>
             <Action name="insert_variable"/> <!-- menu -->
 	        <Action name="import_document" />
         </Menu>
         <Menu name="format"><text>F&amp;ormat</text>
             <Action name="format_masterpage"/>
             <Separator/>
             <Action name="format_pagelayout"/>
         </Menu>
         <Menu name="page">
             <Text>&amp;Page</Text>
             <Action name="page_insertpage"/>
             <Action name="page_copypage"/>
             <Action name="page_deletepage"/>
             <Separator/>
             <Action name="page_previous"/>
             <Action name="page_next"/>
             <Separator/>
             <Action name="page_first"/>
             <Action name="page_last"/>
         </Menu>
         <Menu name="settings"><text>&amp;Settings</text>
             <Action name="settings_active_author" group="settings_configure"/>
             <Action name="configure" group="settings_configure"/>
         </Menu>
     </MenuBar>
 
     <Menu name="default_canvas_popup">
         <ActionList name="toolproxy_action_list"/>
         <Separator/>
         <Action name="edit_delete"/>
     </Menu>
 
     <ToolBar name="mainToolBar">
         <Separator/>
         <Action name="edit_undo"/>
         <Action name="edit_redo"/>
         <Separator/>
         <Action name="edit_cut"/>
         <Action name="edit_copy"/>
         <Action name="edit_paste"/>
         <Action name="edit_delete"/>
     </ToolBar>
-</kpartgui>
+</gui>
diff --git a/libs/main/calligra_shell.rc b/libs/main/calligra_shell.rc
index 1123c7bff95..798801e81f8 100644
--- a/libs/main/calligra_shell.rc
+++ b/libs/main/calligra_shell.rc
@@ -1,55 +1,55 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="Calligra" version="27" translationDomain="calligra">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="Calligra" version="27" translationDomain="calligra">
 <MenuBar>
  <Menu name="file" noMerge="1"><text>&amp;File</text>
   <Action name="file_new" />
   <Action name="activeauthor" />
   <Action name="file_open" />
   <Action name="file_open_recent" />
   <Separator />
   <Action name="file_save" />
   <Action name="file_save_as" />
   <Action name="file_reload_file" />
   <Action name="file_versions_file"/>
   <Separator />
   <Action name="file_import_file" />
   <Action name="file_export_file" />
   <Action name="file_export_pdf" />
   <Action name="file_send_file" />
   <Separator />
   <Merge/>
   <Separator />
   <Action name="file_print" />
   <Action name="file_print_preview" />
   <Separator/>
   <Action name="file_documentinfo" />
   <DefineGroup name="file_infos" />
   <Separator />
   <Action name="file_close" />
   <Action name="file_quit" />
  </Menu>
  <Merge />
  <Menu name="settings" noMerge="1"><text>&amp;Settings</text>
   <DefineGroup name="settings_top"/>
   <Merge/>
 <!--  <ActionList name="toolbarlist"/> -->
   <Action name="view_toggledockertitlebars"/>
   <Action name="settings_dockers_menu"/>
   <DefineGroup name="settings_show"/>
   <Separator/>
   <Action name="options_configure_keybinding"/>
   <Action name="options_configure_toolbars"/>
   <Action name="theme_menu" />
   <DefineGroup name="settings_configure"/>
  </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar" fullWidth="false" noMerge="1"><Text>File</Text>
   <Action name="file_new" />
   <Action name="file_open" />
   <Action name="file_save" />
   <!--
   <Action name="file_print" />
   <Action name="file_print_preview" />
   //-->
 </ToolBar>
-</kpartgui>
+</gui>
diff --git a/plan/calligraplan.rc b/plan/calligraplan.rc
index c50d2bd345e..bb2eb7a3143 100644
--- a/plan/calligraplan.rc
+++ b/plan/calligraplan.rc
@@ -1,173 +1,173 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
-<kpartgui name="Calligra Plan" version="25" translationDomain="calligraplan">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd" >
+<gui name="Calligra Plan" version="25" translationDomain="calligraplan">
     <MenuBar>
         <Menu name="file"><text>&amp;File</text>
             <Separator/>
             <Action name="file_createtemplate"/>
             <Action name="file_createnewproject"/>
         </Menu>
        <Menu name="edit"><text>&amp;Edit</text>
             <Action name="edit_undo"/>
             <Action name="edit_redo"/>
             <Separator/>
             <ActionList name="edit_copypaste"/>
             <Separator/>
             <Action name="project_edit"/>
             <!--            <Action name="edit_cut"/>
             <Action name="edit_copy"/>
             <Action name="edit_paste"/>
             <Separator/> -->
             <Separator/>
             <ActionList name="taskeditor_add_list"/>
             <Separator/>
             <ActionList name="taskeditor_move_list"/>
             <Separator/>
             <ActionList name="resourceeditor_edit_list"/>
             <Separator/>
             <ActionList name="scheduleeditor_edit_list"/>
             <Separator/>
             <ActionList name="accountseditor_edit_list"/>
             <Separator/>
             <ActionList name="calendareditor_calendar_list"/>
             <Separator/>
             <ActionList name="calendareditor_day_list"/>
         </Menu>
         <Menu name="view"><text>&amp;View</text>
             <Action name="view_newview"/>
             <Separator/>
             <ActionList name="view_docker_list"/>
             <Separator/>
             <ActionList name="view_schedule_list"/>
         </Menu>
 <!--        <Menu name="project"><text>&amp;Project</text>
             <Action name="project_edit"/>
             <Action name="project_worktime"/>
             <Action name="project_calendar"/>
             <Action name="project_accounts"/>
             <Action name="project_resources"/>
         </Menu>-->
         <Menu name="tools"><text>&amp;Tools</text>
             <Action name="insert_file"/>
             <Action name="project_worktime"/>
             <Action name="tools_define_wbs"/>
             <Action name="config_currency"/>
             <Action name="reportdesigner_open_file"/>
         </Menu>
         <Menu name="settings"><text>&amp;Settings</text>
             <Action name="configure" group="settings_configure"/>
         </Menu>
         <Menu name="help"><text>&amp;Help</text>
             <Action name="plan_introduction"/>
         </Menu>
     </MenuBar>
     <ToolBar name="project" position="top"><Text>Project</Text>
         <Action name="edit_undo"/>
         <Action name="edit_redo"/>
         <Separator/>
         <Action name="project_edit"/>
         <Separator/>
         <ActionList name="dummy"/> <!-- HACK to get a separator -->
 
         <Separator/>
         <ActionList name="taskeditor_add_list"/>
         <Separator/>
         <ActionList name="taskeditor_move_list"/>
         <Separator/>
         <ActionList name="resourceeditor_edit_list"/>
         <Separator/>
         <ActionList name="accountseditor_edit_list"/>
         <Separator/>
         <ActionList name="scheduleeditor_edit_list"/>
         <Separator/>
         <ActionList name="calendareditor_calendar_list"/>
         <Separator/>
         <ActionList name="calendareditor_day_list"/>
         <Separator/>
         <ActionList name="workpackage_list"/>
         <Separator/>
         <ActionList name="reportview_list"/>
         <Separator/>
         <ActionList name="reportdesigner_list"/>
     </ToolBar>
     <Menu name="task_edit_popup">
         <Action name="node_properties"/>
     </Menu>
     <Menu name="task_popup">
         <Action name="node_properties"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="summarytask_popup">
         <Action name="node_properties"/>
     </Menu>
     <Menu name="taskstatus_popup">
         <Action name="task_description"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="taskview_popup">
         <Action name="task_description"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="taskeditor_milestone_popup">
         <Action name="node_properties"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="taskview_milestone_popup">
         <Action name="task_description"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="taskview_summary_popup">
         <Action name="task_description"/>
    </Menu>
      <Menu name="workpackage_popup">
     </Menu>
    <Menu name="resourceappointment_popup">
         <Action name="task_description"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="resourceassigment_popup">
         <Action name="task_description"/>
         <Action name="task_progress"/>
     </Menu>
     <Menu name="resourceeditor_resource_popup">
         <Action name="edit_resource"/>
     </Menu>
     <Menu name="accountseditor_popup">
         <Action name="add_account"/>
     </Menu>
     <Menu name="accountseditor_account_popup">
         <Action name="add_account"/>
         <Action name="add_subaccount"/>
         <Action name="delete_account"/>
     </Menu>
     <Menu name="accountseditor_edit_list">
         <Action name="add_account"/>
         <Action name="add_subaccount"/>
         <Action name="delete_account"/>
     </Menu>
     <Menu name="calendareditor_calendar_list">
         <Action name="add_calendar"/>
         <Action name="add_subcalendar"/>
         <Action name="delete_calendar_selection"/>
     </Menu>
     <Menu name="calendareditor_day_list">
         <Action name="delete_day_selection"/>
         <Action name="add_calendarday"/>
         <Action name="add_workinterval"/>
     </Menu>
     <Menu name="calendareditor_popup">
         <Action name="add_calendar"/>
     </Menu>
     <Menu name="calendareditor_calendar_popup">
         <Action name="edit_calendar"/>
         <Action name="delete_calendar_selection"/>
     </Menu>
     <Menu name="calendareditor_day_popup">
         <Action name="add_calendarday"/>
         <Action name="add_workinterval"/>
         <Action name="delete_workinterval"/>
     </Menu>
     <Menu name="relation_popup">
         <Action name="edit_dependency"/>
         <Action name="delete_dependency"/>
     </Menu>
-</kpartgui>
+</gui>
diff --git a/plan/calligraplan_readonly.rc b/plan/calligraplan_readonly.rc
index e64bd36e9b2..7f725bce6c2 100644
--- a/plan/calligraplan_readonly.rc
+++ b/plan/calligraplan_readonly.rc
@@ -1,24 +1,25 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KPlato" version="4" translationDomain="calligraplan">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KPlato" version="4" translationDomain="calligraplan">
 <MenuBar>
     <Menu name="view"><text>&amp;View</text>
         <Separator/>
         <Action name="view_gantt"/>
         <Separator/>
         <Action name="view_gantt_showResources"/>
         <Action name="view_gantt_showTaskName"/>
         <Action name="view_gantt_showTaskLinks"/>
         <Action name="view_gantt_showProgress"/>
         <Action name="view_gantt_showFloat"/>
         <Action name="view_gantt_showCriticalPath"/>
         <Action name="view_gantt_showCriticalTasks"/>
         <Separator/>
         <Separator/>
         <Action name="view_pert"/>
         <Separator/>
         <Action name="view_resources"/>
         <Separator/>
         <Action name="view_resourceuse"/>
         <Separator/>
     </Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/plan/plugins/scripting/scripting.rc b/plan/plugins/scripting/scripting.rc
index cf306700d3a..65e70049b65 100644
--- a/plan/plugins/scripting/scripting.rc
+++ b/plan/plugins/scripting/scripting.rc
@@ -1,11 +1,11 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KPlatoPluginScripting" library="krossmoduleplan" version="1" translationDomain="krossmoduleplan">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KPlatoPluginScripting" library="krossmoduleplan" version="1" translationDomain="krossmoduleplan">
 <MenuBar>
     <Menu name="tools"><text>&amp;Tools</text>
     <Separator/>
     <Action name="executescriptfile"/>
     <Action name="scripts"/>
     <Action name="scriptmanager"/>
     </Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/plan/workpackage/calligraplanwork.rc b/plan/workpackage/calligraplanwork.rc
index 4bdb1b3b055..03e0fa5edea 100644
--- a/plan/workpackage/calligraplanwork.rc
+++ b/plan/workpackage/calligraplanwork.rc
@@ -1,29 +1,29 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
-<kpartgui name="PlanWork" version="4" translationDomain="calligraplanwork">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd" >
+<gui name="PlanWork" version="4" translationDomain="calligraplanwork">
     <MenuBar>
         <Menu name="edit"><text>&amp;Edit</text>
            <Action name="package_remove_current"/>
         </Menu>
     </MenuBar>
     <ToolBar name="view_selection" position="left"><text>View</text>
         <Action name="view_list"/>
         <Action name="view_gantt"/>
     </ToolBar>
     <Menu name="taskstatus_popup">
         <Action name="task_progress"/>
         <Action name="task_description"/>
         <Action name="edit_sendpackage"/>
         <Action name="edit_packagesettings"/>
         <Action name="package_remove_current"/>
     </Menu>
     <Menu name="editdocument_popup">
         <Action name="view_document"/>
         <Action name="edit_document"/>
         <Action name="remove_document"/>
     </Menu>
     <Menu name="viewdocument_popup">
         <Action name="view_document"/>
         <Action name="remove_document"/>
     </Menu>
 
-</kpartgui>
+</gui>
diff --git a/plan/workpackage/calligraplanwork_readonly.rc b/plan/workpackage/calligraplanwork_readonly.rc
index 28fe616e275..364caf5997f 100644
--- a/plan/workpackage/calligraplanwork_readonly.rc
+++ b/plan/workpackage/calligraplanwork_readonly.rc
@@ -1,6 +1,7 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KPlatoWork" version="0" translationDomain="calligraplanwork">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KPlatoWork" version="0" translationDomain="calligraplanwork">
 <MenuBar>
     <Menu name="view"><text>&amp;View</text>
     </Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/plan/workpackage/calligraplanworkui.rc b/plan/workpackage/calligraplanworkui.rc
index a76d3ab2a67..cac00d4f426 100644
--- a/plan/workpackage/calligraplanworkui.rc
+++ b/plan/workpackage/calligraplanworkui.rc
@@ -1,7 +1,7 @@
-<!DOCTYPE kpartgui>
-<kpartgui name="planwork_mainwindow" version="2" translationDomain="calligraplanwork">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="planwork_mainwindow" version="2" translationDomain="calligraplanwork">
   <MenuBar>
     <Menu name="edit"><text>&amp;Edit</text>
     </Menu>
   </MenuBar>
-</kpartgui>
+</gui>
diff --git a/sheets/calligrasheets.rc b/sheets/calligrasheets.rc
index 0efa5c878d6..163ab892c93 100644
--- a/sheets/calligrasheets.rc
+++ b/sheets/calligrasheets.rc
@@ -1,425 +1,425 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
 <gui name="Calligra Sheets" version="42" translationDomain="calligrasheets">
 <MenuBar>
 <!-- <<<<<<<<<<<<<<<<<<<<<>>>>><   File Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="file"><text>&amp;File</text>
   <Separator/>
   <Action name="createTemplate"/>
   <Separator/>
   <Action name="file_encrypt_doc" />
   <Action name="file_uncompress_doc" />
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<><   Edit Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="Edit"><text>&amp;Edit</text>
   <Action name="edit_undo"/>
   <Action name="edit_redo"/>
   <Separator/>
   <Action name="cut"/>
   <Action name="copy"/>
   <Action name="paste"/>
   <Action name="specialPaste"/>
   <Action name="pasteWithInsertion"/>
   <Menu name="Fill"><text>Fi&amp;ll</text>
         <Action name="fillDown"/>
         <Action name="fillRight"/>
         <Action name="fillUp"/>
         <Action name="fillLeft"/>
   </Menu>
   <Separator/>
   <Action name="selectAll"/>
   <Separator/>
   <Action name="edit_find"/>
   <Action name="edit_find_next"/>
   <Action name="edit_find_last"/>
   <Action name="edit_replace"/>
   <Menu name="Clear" icon ="edit-clear"><text>Clear</text>
         <Action name="clearAll"/>
         <Separator/>
         <Action name="clearContents"/>
         <Action name="clearComment"/>
         <Action name="clearConditional"/>
         <Action name="clearHyperlink"/>
         <Action name="clearValidity"/>
   </Menu>
   <Menu name="Delete" icon ="edit-delete"><text>Delete</text>
         <Action name="deleteCell"/>
         <Action name="deleteColumn"/>
         <Action name="deleteRow"/>
         <Action name="deleteSheet"/>
   </Menu>
   <Separator/>
   <Action name="editCell"/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<   View Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="View"><text>&amp;View</text>
   <Action name="view_newview"/>
   <Action name="showPageOutline"/>
 <!--   <Action name="showCommentIndicator"/> -->
   <Separator/>
   <Action name="zoom_out"/>
   <Action name="zoom_in"/>
   <Action name="view_zoom"/>
   <Action name="view_fullscreen"/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<   Go Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="go"><text>&amp;Go</text>
    <Action name="go_next"/>
    <Action name="go_previous"/>
    <Action name="gotoCell"/>
    <Separator/>
    <Action name="go_first"/>
    <Action name="go_last"/>
    <Separator/>
    <ActionList name="go_goto_sheet_actionlist"/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<   Insert Menu   >>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="Insert"><text>&amp;Insert</text>
   <Action name="comment"/>
   <Action name="insertMathExpr"/>
   <Action name="insertFormula"/>
   <Action name="insertSeries"/>
   <Action name="insertHyperlink"/>
   <Action name="insertSpecialChar"/>
   <Separator/>
   <Action name="insertCell"/>
   <Action name="insertColumn"/>
   <Action name="insertRow"/>
   <Action name="insertSheet"/>
   <Separator/>
   <Menu name="ExternalData"><text>&amp;External Data</text>
     <Action name="insertFromClipboard"/>
     <Action name="insertFromTextfile"/>
     <Action name="insertFromDatabase"/>
   </Menu>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<   Format Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="Format"><text>F&amp;ormat</text>
   <Action name="cellStyle"/>
   <Action name="styleDialog"/>
   <Action name="setStyle"/>
   <Action name="createStyleFromCell"/>
   <Action name="conditional"/>
   <Action name="sheetFormat"/>
   <Separator/>
   <Menu name="MergeCellMenu" icon="mergecell"><text>Merge Cells</text>
     <Action name="mergeCells"/>
     <Action name="mergeCellsHorizontal"/>
     <Action name="mergeCellsVertical"/>
   </Menu>
   <Action name="dissociateCells"/>
   <Separator/>
   <Action name="adjust"/>
   <Menu name="Row"><text>&amp;Row</text>
     <Action name="resizeRow"/>
     <Action name="equalizeRow"/>
     <Action name="hideRow"/>
     <Action name="showRow"/>
   </Menu>
   <Menu name="Column"><text>&amp;Column</text>
     <Action name="resizeCol"/>
     <Action name="equalizeCol"/>
     <Action name="hideColumn"/>
     <Action name="showColumn"/>
   </Menu>
   <Menu name="Sheet"><text>&amp;Sheet</text>
   <Action name="hideSheet"/>
   <Action name="showSheet"/>
   <Separator/>
   <Action name="sheetProperties" />
   </Menu>
   <Separator/>
   <Action name="paperLayout"/>
   <Menu name="PrintRange"><text>&amp;Print Range</text>
     <Action name="definePrintRange"/>
     <Action name="resetPrintRange"/>
   </Menu>
   <Menu>
     <text>Manual Page Breaks</text>
     <Action name="format_break_before_column"/>
     <Action name="format_break_before_row"/>
   </Menu>
   <Separator/>
   <Action name="shapeAnchor"/>
   <Separator/>
   <Action name="documentSettingsDialog"/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<   Data Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="Data"><text>&amp;Data</text>
   <Action name="sort"/>
   <Menu name="Filter" icon="view-filter"><text>Filter</text>
     <Action name="autoFilter"/>
     <Action name="customFilter"/>
   </Menu>
   <Action name="textToColumns"/>
   <Separator/>
   <Action name="namedAreaDialog"/>
   <Separator/>
   <Action name="consolidate"/>
   <Action name="subtotals"/>
   <Action name="validity"/>
   <Separator/>
   <Action name="goalSeek"/>
   <Action name="Pivot"/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<   Tools Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="tools"><text>&amp;Tools</text>
   <Action name="tools_spelling"/>
   <Separator/>
   <Action name="sortList"/>
   <Separator/>
   <Action name="protectSheet"/>
   <Action name="protectDoc"/>
   <Separator/>
   <Action name="RecalcWorkSheet"/>
   <Action name="RecalcWorkBook"/>
   <Separator/>
  </Menu>
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<   Settings Menu   >>>>>>>>>>>>>>>>>>>>>>>>>>> -->
  <Menu name="settings"><text>&amp;Settings</text>
   <Action name="showColumnHeader" group="settings_show"/>
   <Action name="showRowHeader" group="settings_show"/>
   <Action name="showHorizontalScrollBar" group="settings_show"/>
   <Action name="showVerticalScrollBar" group="settings_show"/>
   <Action name="showTabBar" group="settings_show" />
   <Action name="showStatusBar" group="settings_show" />
   <Action name="settings_active_author" group="settings_configure"/>
   <Action name="configureNotifications" group="settings_configure"/>
   <Action name="preference" group="settings_configure"/>
  </Menu>
 </MenuBar>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<   Flake Canvas Popup   >>>>>>>>>>>>>>>>>>>>>>>> -->
 <Menu name="default_canvas_popup">
     <ActionList name="toolproxy_action_list"/>
 </Menu>
 
 <!-- <<<<<<<<<<<<<   Function for Selected Cells Popup   >>>>>>>>>>>>>>>>>> -->
 <Menu name="calc_popup">
  <Action name="menu_none"/>
  <Separator/>
  <Action name="menu_average"/>
  <Action name="menu_count"/>
  <Action name="menu_counta"/>
  <Action name="menu_max"/>
  <Action name="menu_min"/>
  <Action name="menu_sum"/>
 </Menu>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<   Edit ToolBar   >>>>>>>>>>>>>>>>>>>>>>>>>>> -->
 <ToolBar fullWidth="true" name="editToolBar"><text>Edit</text>
  <Action name="edit_undo"/>
  <Action name="edit_redo"/>
  <Separator/>
  <Action name="cut"/>
  <Action name="copy"/>
  <Action name="paste"/>
 </ToolBar>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<   Navigation ToolBar   >>>>>>>>>>>>>>>>>>>>>>>> -->
 <ToolBar fullWidth="true" hidden="true" name="navigationToolBar"><text>Navigation</text>
  <Action name="go_first"/>
  <Action name="go_previous"/>
  <Action name="go_next"/>
  <Action name="go_last"/>
  <Menu icon="x-office-spreadsheet">
    <text>Activate</text>
    <ActionList name="go_goto_sheet_actionlist"/>
  </Menu>
 </ToolBar>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<   Format ToolBar   >>>>>>>>>>>>>>>>>>>>>>>>>> -->
 <ToolBar fullWidth="true" hidden="true" name="fontPropertyToolBar"><text>Font</text>
  <Action name="font"/>
  <Action name="fontSize"/>
 </ToolBar>
 <ToolBar fullWidth="true" name="formatToolBar"><text>Format</text>
  <Action name="bold"/>
  <Action name="italic"/>
  <Action name="underline"/>
  <Separator/>
  <Action name="alignLeft"/>
  <Action name="alignCenter"/>
  <Action name="alignRight"/>
  <!--
  <Separator/>
  <Action name="alignTop"/>
  <Action name="alignMiddle"/>
  <Action name="alignBottom"/>
  -->
  <Action name="wrapText"/>
  <Separator/>
  <Action name="cellStyle"/>
  <!--
  <Action name="percent"/>
  <Action name="increasePrecision"/>
  <Action name="decreasePrecision"/>
  <Action name="currency"/>
  //-->
 </ToolBar>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<   Color/Border ToolBar   >>>>>>>>>>>>>>>>>>>>>>> -->
 <ToolBar fullWidth="true" hidden="true" name="colorAndBorderToolBar"><text>Color/Border</text>
  <Action name="borderLeft"/>
  <Action name="borderTop"/>
  <Action name="borderRight"/>
  <Action name="borderBottom"/>
  <Action name="borderOutline"/>
  <Action name="borderAll"/>
  <Action name="borderRemove"/>
  <Action name="borderColor"/>
  <Separator/>
  <Action name="dissociateCells"/>
  <Action name="mergeCells"/>
  <Separator/>
  <Action name="textColor"/>
  <Action name="backgroundColor"/>
 </ToolBar>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<   TabBar Popup   >>>>>>>>>>>>>>>>>>>>>>>>>> -->
 <Menu name="menupage_popup">
   <Action name="renameSheet"/>
   <!--<Action name="insertSheet"/>-->
   <Action name="duplicateSheet"/>
   <!--<Action name="deleteSheet"/>-->
   <Action name="hideSheet"/>
   <Action name="showSheet"/>
   <Separator/>
   <Action name="sheetProperties" />
 </Menu>
 
 <!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<   States   >>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
 <State name="map_is_protected">
   <disable>
     <Action name="hideSheet"/>
     <Action name="showSheet"/>
     <Action name="insertSheet"/>
     <Action name="duplicateSheet"/>
     <Action name="deleteSheet"/>
   </disable>
 </State>
 
 <State name="map_contains_one_sheet">
   <disable>
     <Action name="hideSheet"/>
     <Action name="deleteSheet"/>
   </disable>
 </State>
 
 <State name="sheet_is_protected">
   <disable>
     <Action name="sheetProperties"/>
     <Action name="renameSheet"/>
   </disable>
 </State>
 
 <State name="cell_is_protected">
   <disable>
     <!-- Edit Menu Actions -->
     <Action name="cut"/>
     <Action name="paste"/>
     <Action name="specialPaste"/>
     <Action name="pasteWithInsertion"/>
     <Action name="fillDown"/>
     <Action name="fillLeft"/>
     <Action name="fillRight"/>
     <Action name="fillUp"/>
     <Action name="edit_replace"/>
     <Action name="clearAll"/>
     <Action name="clearComment"/>
     <Action name="clearConditional"/>
     <Action name="clearContents"/>
     <Action name="clearHyperlink"/>
     <Action name="clearValidity"/>
     <Action name="deleteCell"/>
     <Action name="deleteColumn"/>
     <Action name="deleteRow"/>
     <Action name="editCell"/>
     <!-- Insert Menu Actions -->
     <Action name="comment"/>
     <Action name="insertMathExpr"/>
     <Action name="insertFormula"/>
     <Action name="series"/>
     <Action name="insertHyperlink"/>
     <Action name="insertSpecialChar"/>
     <Action name="insertCell"/>
     <Action name="insertColumn"/>
     <Action name="insertRow"/>
     <Action name="insertFromClipboard"/>
     <Action name="insertFromTextfile"/>
     <Action name="insertFromDatabase"/>
     <!-- Format Menu Actions -->
     <Action name="cellStyle"/>
     <Action name="styleDialog"/>
     <Action name="setStyle"/>
     <Action name="createStyleFromCell"/>
     <Action name="conditional"/>
     <Action name="sheetFormat"/><!--Auto-Format..-->
     <Action name="mergeCells"/>
     <Action name="mergeCellsHorizontal"/>
     <Action name="mergeCellsVertical"/>
     <Action name="dissociateCells"/>
     <Action name="adjust"/>
     <Action name="resizeRow"/>
     <Action name="equalizeRow"/>
     <Action name="hideRow"/>
     <Action name="showRow"/>
     <Action name="resizeCol"/>
     <Action name="equalizeCol"/>
     <Action name="hideColumn"/>
     <Action name="showColumn"/>
     <Action name="sheetProperties" />
     <Action name="paperLayout"/>
     <Action name="definePrintRange"/>
     <Action name="resetPrintRange"/>
     <Action name="shapeAnchor"/>
     <!-- Data Menu Actions -->
     <Action name="sort"/>
     <Action name="autoFilter"/>
     <Action name="customFilter"/>
     <Action name="textToColumns"/>
     <Action name="namedAreaDialog"/><!--FIXME also jumps to named area-->
     <Action name="consolidate"/>
     <Action name="subtotals"/>
     <Action name="validity"/>
     <Action name="goalSeek"/>
     <!-- Tools Menu Actions -->
     <Action name="tools_spelling"/><!--FIXME just spell check without correction?-->
     <Action name="sortList"/>
     <!-- Format ToolBar Actions -->
     <Action name="font"/>
     <Action name="fontSize"/>
     <Action name="bold"/>
     <Action name="italic"/>
     <Action name="underline"/>
     <Action name="alignLeft"/>
     <Action name="alignCenter"/>
     <Action name="alignRight"/>
     <Action name="alignTop"/>
     <Action name="alignMiddle"/>
     <Action name="alignBottom"/>
     <Action name="wrapText"/>
     <Action name="cellStyle"/>
     <!-- Color/Border ToolBar Actions -->
     <Action name="borderLeft"/>
     <Action name="borderTop"/>
     <Action name="borderRight"/>
     <Action name="borderBottom"/>
     <Action name="borderOutline"/>
     <Action name="borderAll"/>
     <Action name="borderRemove"/>
     <Action name="borderColor"/>
     <Action name="dissociateCells"/>
     <Action name="mergeCells"/>
     <Action name="textColor"/>
     <Action name="backgroundColor"/>
   </disable>
 </State>
 
 <State name="show_formulas">
   <disable>
     <Action name="alignLeft"/>
     <Action name="alignCenter"/>
     <Action name="alignRight"/>
   </disable>
 </State>
 </gui>
diff --git a/sheets/calligrasheets_readonly.rc b/sheets/calligrasheets_readonly.rc
index 37e9dff8e95..8330e137221 100644
--- a/sheets/calligrasheets_readonly.rc
+++ b/sheets/calligrasheets_readonly.rc
@@ -1,16 +1,17 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KSpread" version="2" translationDomain="calligrasheets">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KSpread" version="2" translationDomain="calligrasheets">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="copy"/>
   <Separator/>
   <Action name="edit_find"/>
  </Menu>
  <Menu name="view"><text>&amp;View</text>
   <Separator/>
   <Action name="gotoCell"/>
   <Action name="showPageOutline"/>
   <Separator/>
   <Action name="view_zoom"/>
  </Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/sheets/plugins/scripting/scripting.rc b/sheets/plugins/scripting/scripting.rc
index 2a103334266..bbbcb62157b 100644
--- a/sheets/plugins/scripting/scripting.rc
+++ b/sheets/plugins/scripting/scripting.rc
@@ -1,12 +1,12 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KSpreadPluginScripting" library="krossmodulesheets" version="7" translationDomain="krossmodulesheets">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KSpreadPluginScripting" library="krossmodulesheets" version="7" translationDomain="krossmodulesheets">
 <MenuBar>
 	<Menu name="tools"><text>&amp;Tools</text>
 		<Separator/>
 		<Action name="executescriptfile"/>
 		<Action name="scripts"/>
 		<Action name="scriptmanager"/>
 		<Separator/>
 	</Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/sheets/plugins/solver/solver.rc b/sheets/plugins/solver/solver.rc
index fcfe6b9f282..13a7cc316ad 100644
--- a/sheets/plugins/solver/solver.rc
+++ b/sheets/plugins/solver/solver.rc
@@ -1,8 +1,8 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KSpreadSolverPlugin" library="sheetssolver" version="1" translationDomain="sheetssolver">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KSpreadSolverPlugin" library="sheetssolver" version="1" translationDomain="sheetssolver">
 <MenuBar>
  <Menu name="tools"><text>&amp;Tools</text>
   <Action name="sheetssolver" />
  </Menu>
 </MenuBar>
-</kpartgui>
+</gui>
diff --git a/stage/part/calligrastage.rc b/stage/part/calligrastage.rc
index 604e96f428d..b0505ff92ca 100644
--- a/stage/part/calligrastage.rc
+++ b/stage/part/calligrastage.rc
@@ -1,104 +1,103 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-
-<kpartgui name="stage" version="124" translationDomain="calligrastage">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="stage" version="124" translationDomain="calligrastage">
     <MenuBar>
         <Menu name="file">
             <Action name="file_export_html" />
             <Separator/>
             <Action name="file_encrypt_doc" />
             <Action name="file_uncompress_doc" />
         </Menu>
         <Menu name="edit"><text>&amp;Edit</text>
             <Action name="edit_undo"/>
             <Action name="edit_redo"/>
             <Separator/>
             <Action name="edit_cut"/>
             <Action name="edit_copy"/>
             <Action name="edit_paste"/>
             <Action name="edit_delete"/>
             <Separator/>
             <Action name="edit_select_all"/>
             <Action name="edit_deselect_all"/>
             <Separator/>
             <Action name="edit_find"/>
             <Action name="edit_findnext"/>
             <Action name="edit_findprevious"/>
             <Action name="edit_replace"/>
             <Separator/>
             <Action name="edit_customslideshows"/>
         </Menu>
         <Menu name="view"><text>&amp;View</text>
             <Action name="view_newview"/>
             <Separator/>
             <Action name="view_normal"/>
             <Action name="view_notes"/>
             <Action name="view_slides_sorter"/>
             <Separator/>
             <Action name="view_masterpages"/>
             <Separator/>
             <Action name="view_rulers"/>
             <Action name="view_grid"/>
             <Action name="view_snaptogrid"/>
             <Action name="view_show_guides"/>
             <Separator/>
             <Action name="zoom_out"/>
             <Action name="zoom_in"/>
             <Action name="view_zoom"/>
             <Action name="view_fullscreen"/>
         </Menu>
         <Menu name="insert"><text>&amp;Insert</text>
             <Action name="insert_variable"/> <!-- menu -->
 	        <Action name="import_document"/>
 	        <Action name="insert_pictures"/>
         </Menu>
         <Menu name="format"><text>F&amp;ormat</text>
             <Action name="format_masterpage"/>
             <Action name="format_font"/>
             <Action name="format_paragraph"/>
             <Action name="format_stylist"/>
             <Separator/>
             <Action name="format_pagelayout"/>
         </Menu>
         <Menu name="page">
             <Text>&amp;Slide</Text>
             <Action name="page_insertpage"/>
             <Action name="page_copypage"/>
             <Action name="page_deletepage"/>
             <Separator/>
             <Action name="page_previous"/>
             <Action name="page_next"/>
             <Separator/>
             <Action name="page_first"/>
             <Action name="page_last"/>
         </Menu>
         <Menu name="slideshow"><text>Sli&amp;de Show</text>
             <Action name="slideshow_start"/>
             <Separator/>
             <Action name="slideshow_configure"/>
             <Action name="slideshow_presenterview"/>
             <Separator/>
         </Menu>
         <Menu name="settings"><text>&amp;Settings</text>
             <Action name="showStatusBar" group="settings_show"/>
             <Action name="configure" group="settings_configure"/>
         </Menu>
     </MenuBar>
     <ToolBar name="mainToolBar">
         <Separator/>
         <Action name="page_insertpage"/>
         <Action name="slideshow_start"/>
         <Separator/>
         <Action name="edit_undo"/>
         <Action name="edit_redo"/>
         <Separator/>
         <Action name="edit_cut"/>
         <Action name="edit_copy"/>
         <Action name="edit_paste"/>
         <Action name="edit_delete"/>
     </ToolBar>
     <Menu name="default_canvas_popup">
         <ActionList name="toolproxy_action_list"/>
         <Separator/>
         <Action name="edit_delete"/>
     </Menu>
-</kpartgui>
+</gui>
diff --git a/stage/part/calligrastage_readonly.rc b/stage/part/calligrastage_readonly.rc
index 2601cc58619..fad28fd72f2 100644
--- a/stage/part/calligrastage_readonly.rc
+++ b/stage/part/calligrastage_readonly.rc
@@ -1,7 +1,8 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="KPresenter" version="7" translationDomain="calligrastage">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="KPresenter" version="7" translationDomain="calligrastage">
     <ToolBar name="mainToolBar">
         <Action name="view_zoom"/>
         <Action name="view_zoom_out"/>
         <Action name="view_zoom_in"/>
     </ToolBar>
-</kpartgui>
+</gui>
diff --git a/words/part/calligrawords.rc b/words/part/calligrawords.rc
index dd6b18869bd..a50eb57b860 100644
--- a/words/part/calligrawords.rc
+++ b/words/part/calligrawords.rc
@@ -1,253 +1,254 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="Calligra Words" version="141" translationDomain="calligrawords">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="Calligra Words" version="141" translationDomain="calligrawords">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="extra_template"/>
   <Separator/>
   <Action name="file_encrypt_doc" />
   <Action name="file_uncompress_doc" />
  </Menu>
 
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="edit_undo"/>
   <Action name="edit_redo"/>
   <Separator/>
   <Action name="edit_cut"/>
   <Action name="edit_copy"/>
   <Action name="edit_paste"/>
   <Action name="edit_paste_text"/>
   <Action name="edit_select_all"/>
   <Action name="edit_selectcurrentframe"/>
   <Action name="edit_delete"/>
   <Separator/>
   <Action name="edit_find"/>
   <Action name="edit_findnext"/>
   <Action name="edit_findprevious"/>
   <Action name="edit_replace"/>
   <Action name="select_bookmark"/>
  </Menu>
 
  <Menu name="view"><text>&amp;View</text>
   <Action name="view_newview"/>
   <!-- Menu name="view_displaymodes"><text>&amp;Display Mode</text>
     <Action name="view_pagemode"/>
     <Action name="view_previewmode"/>
     <Action name="view_textmode"/>
   </Menu -->
   <Separator/>
   <Action name="view_formattingchars"/>
   <Action name="view_frameborders"/>
   <Action name="view_tableborders"/>
   <Action name="view_sectionbounds"/>
   <Action name="view_fieldshadings"/>
   <Separator/>
   <Action name="view_toggledockers"/>
   <Action name="show_docstruct"/>
   <Separator/>
   <Action name="show_ruler"/>
   <Action name="view_show_guides"/>
   <Action name="view_grid"/>
   <Action name="view_snaptogrid"/>
   <Separator/>
   <Action name="view_notes"/>
   <Action name="view_wordCount"/>
   <Separator/>
   <Action name="zoom_out"/>
   <Action name="zoom_in"/>
   <Action name="view_zoom"/>
   <Action name="view_fullscreen"/>
   <Action name="view_distractionfreemode"/>
  </Menu>
 
  <!-- THIS SHOULD BE LEFT DISABLED
  <Menu name="semantic"><text>Semantics</text>
   <Action name="insert_semanticobject_ref"/>
   <Action name="insert_semanticobject_new"/>
   <Action name="edit_semantic_stylesheets"/>
  </Menu>
   -->
 
  <!-- leftovers from insert menu - to be moved to texttool
   <Action name="insert_link"/>
   <Action name="add_bookmark"/>
  -->
 
  <Menu name="format"><text>S&amp;tyles</text>
   <Action name="format_stylist"/>
  </Menu>
 
  <Menu name="settings"><text>&amp;Settings</text>
   <Menu name="SpellCheck"><text>Spellcheck</text>
       <Action name="tool_auto_spellcheck"/>
       <Action name="tool_configure_spellcheck"/>
   </Menu>
   <Action name="enable_autocorrection"/>
   <Action name="configure_autocorrection"/>
   <Action name="showStatusBar" group="settings_show"/>
   <Action name="configure_completion" group="settings_show"/>
   <Action name="settings_active_author" group="settings_configure"/>
   <Action name="configure" group="settings_configure"/>
  </Menu>
 </MenuBar>
 
 <ToolBar name="edit_toolbar" position="top"><Text>Edit</Text>
   <Action name="edit_undo"/>
   <Action name="edit_redo"/>
   <Separator/>
   <Action name="edit_cut"/>
   <Action name="edit_copy"/>
   <Action name="edit_paste"/>
   <Separator/>
   <Action name="edit_find"/>
   <!--
   <Action name="edit_findprevious"/>
   <Action name="edit_findnext"/>
   <Action name="edit_replace"/>
   <Action name="select_bookmark"/>
   -->
 </ToolBar>
 <Menu name="text_popup">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <ActionList name="datatools"/>
  <ActionList name="tableactions"/>
 </Menu>
 <Menu name="text_popup_spell">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <ActionList name="datatools"/>
  <Action name="ignore_all"/>
  <Action name="add_word_to_dictionary"/>
  <ActionList name="tableactions"/>
 </Menu>
 <Menu name="text_popup_spell_with_result">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <ActionList name="datatools"/>
  <Action name="ignore_all"/>
  <Action name="add_word_to_dictionary"/>
  <ActionList name="tableactions"/>
  <Separator/>
  <Menu name="check_spell_list"><text>Spell Check Result</text>
    <ActionList name="spell_result_action"/>
  </Menu>
 </Menu>
 <Menu name="custom_var_popup">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <Action name="edit_customvars"/>
  <!--<ActionList name="datatools"/> Spell check doesn't work for variables (yet?)-->
 </Menu>
 <Menu name="variable_popup">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <Menu name="variable_list"><text>Change Variable To</text>
   <ActionList name="variable_action"/>
  </Menu>
  <!--<ActionList name="datatools"/> Spell check doesn't work on variables (yet?)-->
 </Menu>
 <Menu name="text_popup_link">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <Action name="open_link"/>
  <Action name="change_link"/>
  <Action name="copy_link"/>
  <Action name="remove_link"/>
  <Action name="add_to_bookmark"/>
  <!--<ActionList name="datatools_link"/> Spell check doesn't work on links (yet?)-->
 </Menu>
 <Menu name="footnote_popup">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <Action name="edit_footendnote"/>
  <Action name="change_footendtype"/>
  <!--<ActionList name="datatools"/> Spell check doesn't work for variables (yet?)-->
 </Menu>
 <Menu name="comment_popup">
  <Action name="format_font"/>
  <Action name="format_paragraph"/>
  <Separator/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <Action name="edit_comment"/>
  <Action name="remove_comment"/>
  <Action name="copy_text_comment"/>
  <ActionList name="datatools"/>
  <ActionList name="spell_action"/>
 </Menu>
 <Menu name="action_popup">
   <Action name="insert_table"/>
   <Action name="insert_picture"/>
   <Separator />
   <Action name="tools_createtext"/>
   <Action name="tools_formula"/>
   <Action name="tools_part"/>
   <Separator />
   <Action name="delete_page"/>
 </Menu>
 <Menu name="frame_popup">
  <Action name="edit_delframe"/>
  <Separator/>
  <Action name="create_framestyle"/>
  <Action name="border_backgroundcolor"/>
  <Separator/>
  <Action name="edit_cut"/>
  <Action name="edit_copy"/>
  <Action name="edit_paste"/>
  <Separator/>
  <ActionList name="frameset_type_action"/> <!-- Used for frameset type (picture, part...) specific actions -->
  <Action name="spelling_suggestions"/>
  <Separator/>
  <Action name="anchor"/>
  <Action name="format_frameset"/>
 </Menu>
-</kpartgui>
+</gui>
diff --git a/words/part/calligrawords_readonly.rc b/words/part/calligrawords_readonly.rc
index e1107854a7a..b3568f48c5f 100644
--- a/words/part/calligrawords_readonly.rc
+++ b/words/part/calligrawords_readonly.rc
@@ -1,55 +1,56 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="Calligra Words" version="4" translationDomain="calligrawords">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="Calligra Words" version="4" translationDomain="calligrawords">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="file_statistics"/>
  </Menu>
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="edit_copy"/>
   <Action name="edit_select_all"/>
   <Separator/>
   <Action name="edit_find"/>
  </Menu>
  <Menu name="view"><text>&amp;View</text>
   <Separator/>
   <Menu name="view_displaymodes"><text>&amp;Display Mode</text>
     <Action name="view_pagemode"/>
     <Action name="view_previewmode"/>
     <Action name="view_textmode"/>
   </Menu>
   <Separator/>
   <Action name="view_formattingchars"/>
   <Action name="view_frameborders"/>
   <Separator/>
   <Action name="show_docstruct"/>
   <Action name="show_ruler"/>
   <Action name="view_grid"/>
   <Separator/>
   <Action name="view_zoom"/>
  </Menu>
  <Menu name="tools"><text>&amp;Tools</text>
   <Separator/>
   <Action name="select_bookmark"/>
  </Menu>
 </MenuBar>
 <Menu name="text_popup">
 </Menu>
 <Menu name="custom_var_popup">
 </Menu>
 <Menu name="variable_popup">
 </Menu>
 <Menu name="text_popup_link">
 </Menu>
 <Menu name="footnote_popup">
 </Menu>
 <Menu name="comment_popup">
 </Menu>
 <Menu name="action_popup">
 </Menu>
 <Menu name="frame_popup">
 </Menu>
 <Menu name="frame_popup_table">
 </Menu>
 <Menu name="docstruct_popup">
 </Menu>
-</kpartgui>
+</gui>
 
diff --git a/words/plugins/scripting/scripting.rc b/words/plugins/scripting/scripting.rc
index 14b6db22b6c..5d1b09fc362 100644
--- a/words/plugins/scripting/scripting.rc
+++ b/words/plugins/scripting/scripting.rc
@@ -1,11 +1,11 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="WordsPluginScripting" library="krossmodulewords" version="8" translationDomain="krossmodulewords">
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="WordsPluginScripting" library="krossmodulewords" version="8" translationDomain="krossmodulewords">
 <MenuBar>
 	<Menu name="tools"><text>&amp;Tools</text>
 		<Separator/>
 		<Action name="executescriptfile"/>
 		<Action name="scripts"/>
 		<Action name="scriptmanager"/>
 	</Menu>
 </MenuBar>
-</kpartgui>
+</gui>