diff --git a/scripts/wk/cfg/repairs.py b/scripts/wk/cfg/repairs.py
index cb80f816..86c09868 100644
--- a/scripts/wk/cfg/repairs.py
+++ b/scripts/wk/cfg/repairs.py
@@ -60,6 +60,7 @@ BLEACH_BIT_CLEANERS = (
   'windows_explorer.thumbnails',
   )
 CUSTOM_POWER_PLAN_NAME = f'{KIT_NAME_SHORT} Power Plan'
+CUSTOM_POWER_PLAN_DESC = 'Customized for the best experience.'
 POWER_PLANS = {
   'Balanced':         '381b4222-f694-41f0-9685-ff5bb260df2e',
   'Custom':           '01189998-8199-9119-725c-ccccccccccc3',
diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py
index 53d68e1b..5ad229fa 100644
--- a/scripts/wk/cfg/setup.py
+++ b/scripts/wk/cfg/setup.py
@@ -12,11 +12,11 @@ BROWSER_PATHS = {
   }
 FAB_TIMEFRAME = 14 # If it's been at least this many days don't prompt for an AV scan
 LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.Present
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDoc
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"
-<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>fal
+<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Calc MS Excel 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>MS Word 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>false</value></prop></item>
 </oor:items>
 '''
 REG_CHROME_UBLOCK_ORIGIN = {
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 1246494d..176d6c0d 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -16,6 +16,7 @@ from wk.cfg.repairs   import (
   AUTO_REPAIR_DELAY_IN_SECONDS,
   AUTO_REPAIR_KEY,
   BLEACH_BIT_CLEANERS,
+  CUSTOM_POWER_PLAN_DESC,
   CUSTOM_POWER_PLAN_NAME,
   POWER_PLANS,
   POWER_PLAN_SLEEP_TIMEOUTS,
@@ -1274,7 +1275,10 @@ def create_custom_power_plan(enable_sleep=True, keep_display_on=False):
     LOG.error("Failed to create custom power plan.\n  Details: %s", proc)
 
   # Change the name
-  cmd = ['powercfg', '-ChangeName', custom_guid, CUSTOM_POWER_PLAN_NAME]
+  cmd = [
+    'powercfg', '-ChangeName', custom_guid,
+    CUSTOM_POWER_PLAN_NAME, CUSTOM_POWER_PLAN_DESC,
+    ]
   run_program(cmd)
 
   # Set as active plan