diff --git a/src/templates/index.html b/src/templates/index.html
index b69c2b7..822f518 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -188,17 +188,17 @@
             aria-modal="false"
             aria-labelledby="theme-tool-title"
             data-ui-window
-            data-window-title="ThemePicker.exe"
+            data-window-title="Theme.exe"
             data-window-rights="all"
             data-window-order="10"
             data-window-default-left="16"
             data-window-default-top="88"
             data-window-default-width="390"
-            data-window-default-height="250"
+            data-window-default-height="320"
             data-window-icons='{"win98":"/static/img/Windows Icons - PNG/main.cpl_14_109-1.png","modern":"/static/img/Windows Icons - PNG/msconfig.exe_14_128-0.png","none":"/static/img/Windows Icons - PNG/taskmgr.exe_14_118-1.png","default":"/static/img/Windows Icons - PNG/main.cpl_14_109-1.png"}'
         >
             <div class="title-bar ui-tool-title-bar" data-role="drag-handle">
-                <span id="theme-tool-title">ThemePicker.exe</span>
+                <span id="theme-tool-title">Theme.exe</span>
                 <div class="title-bar-controls">
                     <button type="button" data-role="close-window" data-target="theme-tool-window">×</button>
                 </div>
@@ -219,32 +219,7 @@
                         <span>No Theme</span>
                     </button>
                 </div>
-            </div>
-        </section>
-
-        <section
-            id="mode-tool-window"
-            class="window ui-tool-window hidden"
-            role="dialog"
-            aria-modal="false"
-            aria-labelledby="mode-tool-title"
-            data-ui-window
-            data-window-title="DisplayMode.exe"
-            data-window-rights="all"
-            data-window-order="20"
-            data-window-default-left="424"
-            data-window-default-top="88"
-            data-window-default-width="340"
-            data-window-default-height="190"
-            data-window-icons='{"win98":"/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png","modern":"/static/img/Windows Icons - PNG/desk.cpl_14_100-0.png","none":"/static/img/Windows Icons - PNG/timedate.cpl_14_200-6.png","default":"/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png"}'
-        >
-            <div class="title-bar ui-tool-title-bar" data-role="drag-handle">
-                <span id="mode-tool-title">DisplayMode.exe</span>
-                <div class="title-bar-controls">
-                    <button type="button" data-role="close-window" data-target="mode-tool-window">×</button>
-                </div>
-            </div>
-            <div class="window-content">
+                <p class="tool-copy">Set the display mode.</p>
                 <p class="tool-copy" id="mode-status-text">Current mode: Light</p>
                 <button class="btn mode-toggle-btn" type="button" data-role="mode-toggle-action">
                     <img class="taskbar-icon" data-role="mode-icon" src="/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png" alt="">
diff --git a/src/templates/room.html b/src/templates/room.html
index 4f3625a..7d00059 100644
--- a/src/templates/room.html
+++ b/src/templates/room.html
@@ -162,17 +162,17 @@
             aria-modal="false"
             aria-labelledby="theme-tool-title"
             data-ui-window
-            data-window-title="ThemePicker.exe"
+            data-window-title="Theme.exe"
             data-window-rights="all"
             data-window-order="10"
             data-window-default-left="16"
             data-window-default-top="88"
             data-window-default-width="390"
-            data-window-default-height="250"
+            data-window-default-height="320"
             data-window-icons='{"win98":"/static/img/Windows Icons - PNG/main.cpl_14_109-1.png","modern":"/static/img/Windows Icons - PNG/msconfig.exe_14_128-0.png","none":"/static/img/Windows Icons - PNG/taskmgr.exe_14_118-1.png","default":"/static/img/Windows Icons - PNG/main.cpl_14_109-1.png"}'
         >
             <div class="title-bar ui-tool-title-bar" data-role="drag-handle">
-                <span id="theme-tool-title">ThemePicker.exe</span>
+                <span id="theme-tool-title">Theme.exe</span>
                 <div class="title-bar-controls">
                     <button type="button" data-role="close-window" data-target="theme-tool-window">×</button>
                 </div>
@@ -193,32 +193,7 @@
                         <span>No Theme</span>
                     </button>
                 </div>
-            </div>
-        </section>
-
-        <section
-            id="mode-tool-window"
-            class="window ui-tool-window hidden"
-            role="dialog"
-            aria-modal="false"
-            aria-labelledby="mode-tool-title"
-            data-ui-window
-            data-window-title="DisplayMode.exe"
-            data-window-rights="all"
-            data-window-order="20"
-            data-window-default-left="424"
-            data-window-default-top="88"
-            data-window-default-width="340"
-            data-window-default-height="190"
-            data-window-icons='{"win98":"/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png","modern":"/static/img/Windows Icons - PNG/desk.cpl_14_100-0.png","none":"/static/img/Windows Icons - PNG/timedate.cpl_14_200-6.png","default":"/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png"}'
-        >
-            <div class="title-bar ui-tool-title-bar" data-role="drag-handle">
-                <span id="mode-tool-title">DisplayMode.exe</span>
-                <div class="title-bar-controls">
-                    <button type="button" data-role="close-window" data-target="mode-tool-window">×</button>
-                </div>
-            </div>
-            <div class="window-content">
+                <p class="tool-copy">Set the display mode.</p>
                 <p class="tool-copy" id="mode-status-text">Current mode: Light</p>
                 <button class="btn mode-toggle-btn" type="button" data-role="mode-toggle-action">
                     <img class="taskbar-icon" data-role="mode-icon" src="/static/img/Windows Icons - PNG/desk.cpl_14_40-0.png" alt="">
@@ -234,7 +209,7 @@
             aria-modal="false"
             aria-labelledby="terminal-title"
             data-ui-window
-            data-window-title="RoomTerminal.exe"
+            data-window-title="Terminal.exe"
             data-window-rights="admin"
             data-window-order="30"
             data-window-default-left="780"
@@ -244,7 +219,7 @@
             data-window-icons='{"win98":"/static/img/Windows Icons - PNG/taskmgr.exe_14_107-1.png","modern":"/static/img/Windows Icons - PNG/taskmgr.exe_14_137.png","none":"/static/img/Windows Icons - PNG/taskmgr.exe_14_118-1.png","default":"/static/img/Windows Icons - PNG/taskmgr.exe_14_107-1.png"}'
         >
             <div class="title-bar ui-tool-title-bar" data-role="drag-handle">
-                <span id="terminal-title">RoomTerminal.exe</span>
+                <span id="terminal-title">Terminal.exe</span>
                 <div class="title-bar-controls">
                     <button type="button" data-role="close-window" data-target="terminal-tool-window">×</button>
                 </div>