diff --git a/.notes/build.md b/.notes/build.md
index e49935e..15aa505 100644
--- a/.notes/build.md
+++ b/.notes/build.md
@@ -2,6 +2,8 @@ To build the project, run:
 
 wails build --platform="darwin/universal"
 
-or 
+to build a universal binary for macOS. Or 
 
 mask build
+
+to build a binary for  the current system only.
diff --git a/README.md b/README.md
index 782705f..711eebc 100644
--- a/README.md
+++ b/README.md
@@ -50,11 +50,11 @@ I started my programming career with Emacs as my main text editor on a main fram
 
 With Spacemacs and Doom-emacs, I learned that the Vim style keyboard was much more efficient. But, I kept going back to the Emacs key memory. I finally decided to really give Vim a run with neovim on my MacBook Air. I even installed Spacevim and really liked it. Now, I'm fully comfortable in the Vim style keyboard (but far from mastering it completely) and have adapted it to many other programs along the way. My current editor of choice is [OniVim2](https://github.com/onivim/oni2) which is the fastest programming editor I've ever used. It is great!
 
-But, I've never been happy with the file managers I've used. [fman](https://fman.io/) is great, but not actively being maintained and expanded upon. I also don't really like python, it's API language. So, I decided to jump in and make one to suit me better. This is how Modal File Manager was started. I wanted something that was as configurable as TkDesk was, but with a modal keyboard model for hotkeys. To take it even further, new modes and keymaps can be added with extensions. 
+But, I've never been happy with the file managers I've used. [fman](https://fman.io/) is great, but not actively being maintained and expanded upon. It is very slow in large directories and I also don't really like python: it's API language. So, I decided to jump in and make one to suit me better. This is how Modal File Manager was started. I wanted something that was as configurable as TkDesk was (if anyone remembers it), but with a modal keyboard model for hotkeys. To take it even further, new modes and keymaps can be added with extensions. 
 
-Modal File Manager is also somewhat minimal in the UI. Many graphical file managers have buttons, shelves, etc. all over the place with information everywhere. I decided to make the main interface as low keyed as possible with all other information in the status line or extras panel. Extra file information is on the status line for the current cursor location. More information is displayed in extras panel as well.
+Modal File Manager is also somewhat minimal in the UI. Many graphical file managers have buttons, shelves, etc. all over the place with information everywhere. I decided to make the main interface as low keyed as possible with all other information in the status line or extras panel. Extra file information is on the status line for the current cursor location. More information is displayed in the extras panel as well (the side opposite the current pointer shows extra information instead of the other file pane. When turned off, it automatically goes back to the file pane that was showing before switching.).
 
-Since there are so many dual pane file managers available, I knew this would never be a marketable product (and I did not want the hassle of endless customer complaint over a feature not working the way they want it). Therefore, I'm making this an open source project to hopefully get some help from other to really making this thing shine.
+Since there are so many dual pane file managers available, I knew this would never be a marketable product (and I did not want the hassle of endless customer complaint over a feature not working the way they want it). Therefore, I'm making this an open source project to hopefully get some help from others to help really make this thing shine.
 
 Therefore, I hope you enjoy this little program as much as I have. Feel free to sponsor the project, help code some of it (just send in the pull requests), or just give me some tips along the way. Any help is appreciated.
 
@@ -75,7 +75,7 @@ I've created multiple open source resources (I have around 80 GitHub repositorie
 - Watches for changes in the current directory and updates accordingly.
 - Changing directories in the Directory Bar (normal mode `q`) shows a list of matching entries from history and then below the current directory.
 - File editor is configurable by the `~/.myeditorchoice` file (see `Editing Files` below). Otherwise, the system editor for the file type will be used.
-- Integrated with ScriptPad - another project of mine coming soon!
+- Integrated with [EmailIt](https://github.com/raguay/EmailIt).
 - Quick Search - a input to type text so that any entry at that level is removed that doesn't have that text in it. Just refresh the pane to get back to normal. I think of it as a quick filter more than a quick search.
 - Toggle System files/folders visibility
 - Optionally deletes to the OS's trashcan (external program has to be installed)
@@ -105,6 +105,7 @@ All Dracula based themes are here with permission from the author. Please suppor
 Because this is a web technologies application, there are certain things that it just can't do and I'm not sure if they can be done at this level. Therefore, this will not completely remove your dependency on using the Finder application. But, these instances are not everyday items for which we use a file manager. As I see it, these items are not doable, but I would love for someone to prove me wrong:
 
 - Install applications that the macOS Gatekeeper will allow.
+- Drad and drop with other programs.
 
 ## Installation
 
@@ -468,7 +469,7 @@ This list of tutorials are with the latest version of Modal File Manager:
 
 I finally made my first attempt at an icon for Modal File Manager. The files are in the `frontend/icons` directory. Any constructive criticizm is welcome.
 
-![Icon](https://github.com/raguay/ModalFileManager/blob/main/appicon.png)
+![Icon](https://github.com/raguay/ModalFileManager/blob/main/build/appicon.png)
 
 ## Sponsor this project
 
diff --git a/appicon.png b/appicon.png
deleted file mode 100644
index d8ba4c6..0000000
Binary files a/appicon.png and /dev/null differ
diff --git a/frontend/src/components/CommandPrompt.svelte b/frontend/src/components/CommandPrompt.svelte
index 9ad6e2d..fa0f72e 100644
--- a/frontend/src/components/CommandPrompt.svelte
+++ b/frontend/src/components/CommandPrompt.svelte
@@ -19,7 +19,7 @@
 
   onMount(() => {
     width = window.innerWidth - 30;
-    keyProcess.set(false);
+    $keyProcess = false;
     if (commands != null) filtered = commands.commandList;
   });
 
diff --git a/frontend/src/components/DirectoryListing.svelte b/frontend/src/components/DirectoryListing.svelte
index fa56cbc..3086a61 100644
--- a/frontend/src/components/DirectoryListing.svelte
+++ b/frontend/src/components/DirectoryListing.svelte
@@ -17,12 +17,10 @@
   let newPath;
   let inputPath;
   let dirlist = [];
-  let localTheme = {};
   let dirListDOM;
   let tryagain = false;
   let pending = false;
   let dirIndex = 0;
-  let localDirListeners = [];
   let lastDir = "";
   let rightSet = false;
   let leftSet = false;
@@ -31,15 +29,6 @@
   $: setEditFlag(edit);
 
   onMount(() => {
-    const unsubscribeTheme = theme.subscribe((value) => {
-      localTheme = value;
-    });
-    const unsubscribeDirectoryListeners = directoryListeners.subscribe(
-      (value) => {
-        localDirListeners = value;
-      }
-    );
-    localTheme = get(theme);
     newPath = shortenPath(path);
     if (side === "left") {
       window.runtime.EventsOn("leftDirChange", () => {
@@ -56,10 +45,7 @@
         });
       });
     }
-    return () => {
-      unsubscribeTheme();
-      unsubscribeDirectoryListeners();
-    };
+    return () => {};
   });
 
   afterUpdate(async () => {
@@ -94,7 +80,7 @@
     if (typeof pth !== "undefined") {
       if (lastDir !== pth) {
         lastDir = pth;
-        localDirListeners.map((value) => {
+        $directoryListeners.map((value) => {
           value(pth, "");
         });
       }
@@ -107,7 +93,7 @@
     }
   }
 
-  function setEdit(e) {
+  function setEdit() {
     show = false;
     inputPath = path.path;
     dirIndex = 0;
@@ -118,14 +104,14 @@
     if (inputPath[inputPath.length - 1] !== sep) {
       inputPath = inputPath + sep;
     }
-    keyProcess.set(false);
+    $keyProcess = false;
   }
 
   async function editOff() {
     if (await path.fileSystem.dirExists(inputPath)) {
       show = true;
       dirlist = [];
-      keyProcess.set(true);
+      $keyProcess = true;
       dispatch("dirChange", {
         path: inputPath,
         cursor: true,
@@ -137,7 +123,7 @@
       inputPath = dirlist[dirIndex];
       show = true;
       dirlist = [];
-      keyProcess.set(true);
+      $keyProcess = true;
       if (await path.fileSystem.dirExists(inputPath)) {
         dispatch("dirChange", {
           path: inputPath,
@@ -169,9 +155,7 @@
       //
       // Add to the history.
       //
-      var hist = get(dirHistory);
-      hist.addHistory(result);
-      dirHistory.set(hist);
+      $dirHistory.addHistory(result);
 
       //
       // Fixing the path.
@@ -252,8 +236,7 @@
           //
           // Get matches from history.
           //
-          var hist = get(dirHistory);
-          dirlist = hist.searchHistory(inputPath);
+          dirlist = $dirHistory.searchHistory(inputPath);
           if (dirlist === null) dirlist = [];
           numleft -= dirlist.length;
           if (numleft > 0) {
@@ -317,7 +300,7 @@
     {#if dirlist.length > 0 && dirListDOM !== null && dirInputDOM !== null}
       <div
         id="searchList"
-        style="background-color: {localTheme.backgroundColor}; color: {localTheme.textColor}; top: {dirInputDOM.offsetTop +
+        style="background-color: {$theme.backgroundColor}; color: {$theme.textColor}; top: {dirInputDOM.offsetTop +
           dirListDOM.offsetHeight}px; left: {dirListDOM.offsetLeft}px;"
       >
         <ul>
@@ -325,8 +308,8 @@
             {#if item !== ""}
               <li
                 style="color: {key === dirIndex
-                  ? localTheme.selectedColor
-                  : localTheme.textColor}"
+                  ? $theme.selectedColor
+                  : $theme.textColor}"
                 on:click={() => {
                   processListItem(key);
                 }}
diff --git a/frontend/src/components/Entry.svelte b/frontend/src/components/Entry.svelte
index 3982145..196ebcc 100644
--- a/frontend/src/components/Entry.svelte
+++ b/frontend/src/components/Entry.svelte
@@ -126,8 +126,8 @@
   }
 
   async function dragStart(e) {
-    const lconfig = get(config);
-    var flist = lconfig.extensions.getExtCommand("getSelectedFiles").command();
+    const $config = get(config);
+    var flist = $config.extensions.getExtCommand("getSelectedFiles").command();
     var included = false;
     var data = [];
     flist.map(async (item) => {
@@ -175,7 +175,6 @@
         // Create the entries from the drop.
         //
         const dataTransArray = e.dataTransfer.getData("text/plain").split("\n");
-        const lconfig = get(config);
         var fromEntries = [];
         for (var i = 0; i < dataTransArray.length; i++) {
           var parts = dataTransArray[i].split("|");
@@ -201,11 +200,11 @@
           });
         }
         if (shiftKey) {
-          await lconfig.extensions
+          await $config.extensions
             .getExtCommand("moveEntriesCommand")
             .command(fromEntries, toEntry);
         } else {
-          await lconfig.extensions
+          await $config.extensions
             .getExtCommand("copyEntriesCommand")
             .command(fromEntries, toEntry);
         }
diff --git a/frontend/src/components/Env.svelte b/frontend/src/components/Env.svelte
index b872b7e..c6b1b6d 100644
--- a/frontend/src/components/Env.svelte
+++ b/frontend/src/components/Env.svelte
@@ -1,4 +1,4 @@
-{#if ((localConfig !== null) && (typeof localConfig.configuration.env !== 'undefined'))}
+{#if (($config !== null) && (typeof $config.configuration.env !== 'undefined'))}
   <table>
     <thead>
       <tr>
@@ -15,7 +15,7 @@
       </tr>
     </thead>
     <tbody>
-      {#each Object.entries(localConfig.configuration.env) as kv}
+      {#each Object.entries($config.configuration.env) as kv}
         <EnvTableRow 
           name={kv[0]}
           value={kv[1]}
@@ -74,33 +74,24 @@
 
   let KVname = '';
   let KVvalue = '';
-  let localConfig = null;
   let addNew = false;
    
   onMount(() => {
-    const unsubConfig = config.subscribe(value => {
-      localConfig = value;
-    });
-
     return(() => {
-      unsubConfig();
     });
   });
   
   function deleteCell(kv) {
-    delete localConfig.configuration.env[kv[0]];
-    config.set(localConfig);
+    delete $config.configuration.env[kv[0]];
   }
 
   function saveCell(kv, e) {
-    localConfig.configuration.env[kv[0]] = e.detail.value;
-    config.set(localConfig);
+    $config.configuration.env[kv[0]] = e.detail.value;
   }
 
   function addKV(e) {
-    localConfig.configuration.env[KVname] = KVvalue;
+    $config.configuration.env[KVname] = KVvalue;
     addNew = false;
-    config.set(localConfig);
     KVname = '';
     KVvalue = '';
   }
diff --git a/frontend/src/components/ExtensionPrefs.svelte b/frontend/src/components/ExtensionPrefs.svelte
index 05a7494..3a82d77 100644
--- a/frontend/src/components/ExtensionPrefs.svelte
+++ b/frontend/src/components/ExtensionPrefs.svelte
@@ -9,7 +9,6 @@
 
   const dispatch = createEventDispatcher();
 
-  let localConfig = null;
   let showMsgBox = false;
   let msgText = "";
   let msgTitle = "";
@@ -29,21 +28,13 @@ return({{extName}});
   let scrollDOM = null;
   let first = true;
 
-  onMount(() => {
-    const unsubConfig = config.subscribe(async (value) => {
-      localConfig = value;
-      if (typeof localConfig.OS !== "undefined") {
-        var edir = await localConfig.OS.appendPath(
-          localConfig.configDir,
-          "extensions"
-        );
-        extensionList = await localConfig.OS.getDirList(edir);
-      }
-    });
+  onMount(async () => {
+    if (typeof $config.OS !== "undefined") {
+      var edir = await $config.OS.appendPath($config.configDir, "extensions");
+      extensionList = await $config.OS.getDirList(edir);
+    }
 
-    return () => {
-      unsubConfig();
-    };
+    return () => {};
   });
 
   afterUpdate(() => {
@@ -56,24 +47,18 @@ return({{extName}});
   });
 
   async function reloadExtensions() {
-    const efile = await localConfig.OS.appendPath(
-      localConfig.configDir,
-      "extensions"
-    );
-    extensionList = await localConfig.OS.getDirList(efile);
+    const efile = await $config.OS.appendPath($config.configDir, "extensions");
+    extensionList = await $config.OS.getDirList(efile);
   }
 
   async function editExtension(ext) {
     //
     // Get the extensions file.
     //
-    var extDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
-      "extensions"
-    );
-    extDir = await localConfig.OS.appendPath(extDir, ext.name);
-    const pfile = await localConfig.OS.appendPath(extDir, "package.json");
-    var pkgConfig = await localConfig.OS.readFile(pfile);
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    extDir = await $config.OS.appendPath(extDir, ext.name);
+    const pfile = await $config.OS.appendPath(extDir, "package.json");
+    var pkgConfig = await $config.OS.readFile(pfile);
     pkgConfig = JSON.parse(pkgConfig);
     if (typeof pkgConfig.mfmextension !== "undefined") {
       var extFile = pkgConfig.mfmextension.main;
@@ -81,35 +66,34 @@ return({{extName}});
       //
       // Put the unused pane with the extension's directory
       //
-      var curcursor = get(currentCursor);
-      curcursor.entry.dir = extDir;
-      curcursor.entry.name = extFile;
-      if (curcursor.pane === "left") {
-        rightDir.set({
+      $currentCursor.entry.dir = extDir;
+      $currentCursor.entry.name = extFile;
+      if ($currentCursor.pane === "left") {
+        $rightDir = {
           path: extDir,
-          fileSystem: localConfig.OS,
+          fileSystem: $config.OS,
           fileSystemType: "local",
-        });
-        curcursor.pane = "right";
+        };
+        $currentCursor.pane = "right";
       } else {
-        leftDir.set({
+        $leftDir = {
           path: extDir,
-          fileSystem: localConfig.OS,
+          fileSystem: $config.OS,
           fileSystemType: "local",
-        });
-        curcursor.pane = "left";
+        };
+        $currentCursor.pane = "left";
       }
-      currentCursor.set(curcursor);
+      $currentCursor = $currentCursor;
 
-      if (await localConfig.OS.fileExists(localConfig.userEditor)) {
+      if (await $config.OS.fileExists($config.userEditor)) {
         //
         // There is an editor defined by the user. Use it.
         //
-        var file = await localConfig.OS.appendPath(extDir, extFile);
-        var editor = await localConfig.OS.readFile(localConfig.userEditor);
+        var file = await $config.OS.appendPath(extDir, extFile);
+        var editor = await $config.OS.readFile($config.userEditor);
         editor = editor.toString().trim();
         if (editor.endsWith(".app")) {
-          await localConfig.OS.openFileWithProgram(editor, file);
+          await $config.OS.openFileWithProgram(editor, file);
         } else {
           //
           // It is a command line editor. Open specially.
@@ -118,7 +102,7 @@ return({{extName}});
             //
             // Open emacs.
             //
-            await localConfig.OS.runCommandLine(
+            await $config.OS.runCommandLine(
               'emacsclient -n -q "' + file + '"',
               [],
               (err, result) => {},
@@ -128,14 +112,14 @@ return({{extName}});
             //
             // Open in a terminal program.
             //
-            await localConfig.OS.openInTerminal(editor, file);
+            await $config.OS.openInTerminal(editor, file);
           }
         }
       } else {
         //
         // Open with the system default editor.
         //
-        await localConfig.OS.runCommandLine(
+        await $config.OS.runCommandLine(
           'open "' + file + '"',
           [],
           (err, result) => {},
@@ -162,14 +146,11 @@ return({{extName}});
   }
 
   async function createExtension() {
-    var extDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
-      "extensions"
-    );
-    extDir = await localConfig.OS.appendPath(extDir, extensionName);
-    if (!(await localConfig.OS.dirExists(extDir))) {
-      await localConfig.OS.createDir(extDir);
-      await localConfig.OS.runCommandLine(
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    extDir = await $config.OS.appendPath(extDir, extensionName);
+    if (!(await $config.OS.dirExists(extDir))) {
+      await $config.OS.createDir(extDir);
+      await $config.OS.runCommandLine(
         'cd "' + extDir + '"; npm init -y;',
         [],
         (err, stdout) => {
@@ -204,17 +185,14 @@ return({{extName}});
     // Svelte compiler will not pull from the local closure for some reason. Therefore,
     // I have to create this variable.
     //
-    var extDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
-      "extensions"
-    );
-    extDir = await localConfig.OS.appendPath(extDir, extensionName);
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    extDir = await $config.OS.appendPath(extDir, extensionName);
 
     //
     // Add the needed fields to the package.json file for Modal File Manager.
     //
-    var fileName = await localConfig.OS.appendPath(extDir, "package.json");
-    var pkgConfig = await localConfig.OS.readFile(fileName);
+    var fileName = await $config.OS.appendPath(extDir, "package.json");
+    var pkgConfig = await $config.OS.readFile(fileName);
     pkgConfig = JSON.parse(pkgConfig);
 
     //
@@ -232,18 +210,15 @@ return({{extName}});
       github: "",
       main: extensionName + ".js",
     };
-    const pfile = await localConfig.OS.appendPath(extDir, "package.json");
-    await localConfig.OS.writeFile(pfile, JSON.stringify(pkgConfig));
+    const pfile = await $config.OS.appendPath(extDir, "package.json");
+    await $config.OS.writeFile(pfile, JSON.stringify(pkgConfig));
 
     //
     // Create the actual extension file.
     //
-    var extFile = await localConfig.OS.appendPath(
-      extDir,
-      extensionName + ".js"
-    );
+    var extFile = await $config.OS.appendPath(extDir, extensionName + ".js");
     var newExt = extTemplate.replaceAll("{{extName}}", extensionName);
-    await localConfig.OS.writeFile(extFile, newExt);
+    await $config.OS.writeFile(extFile, newExt);
 
     //
     // Edit the extension.
@@ -255,15 +230,12 @@ return({{extName}});
   }
 
   async function deleteExtension(ext) {
-    var extDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
-      "extensions"
-    );
-    await localConfig.OS.deleteEntries(
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    await $config.OS.deleteEntries(
       {
         dir: extDir,
         name: ext.name,
-        fileSystem: localConfig.OS,
+        fileSystem: $config.OS,
       },
       (err, stdout) => {
         if (!err) {
diff --git a/frontend/src/components/ExtraPanel.svelte b/frontend/src/components/ExtraPanel.svelte
index 6e26d63..484213e 100644
--- a/frontend/src/components/ExtraPanel.svelte
+++ b/frontend/src/components/ExtraPanel.svelte
@@ -29,7 +29,7 @@
     </p>
   {/if}
   <div class='stats'>
-    <p>Date: {localCurrentCursor.entry.datetime}</p>
+    <p>Date: {$currentCursor.entry.datetime}</p>
     <p>Size: {size}</p>
   </div>
 </div>
@@ -69,11 +69,6 @@
   export let side = '';
 
   let extraPDOM = null;
-  let localCurrentCursor = {
-    pane: 'left',
-    entry: {}
-  };
-  let localExtraPanel = [];
   let fullPath = '';
   let extension = '';
   let size = '';
@@ -84,43 +79,28 @@
 
   onMount(async () => {
     // 
-    // Subscribe to the current cursor in order to get the file information.
+    // Get the file information needed.
     //
-    var unsubscribeCurrentCursor = currentCursor.subscribe(async (value) => {
-      // 
-      // Get the file information needed.
-      //
-      localCurrentCursor = value;
-      fullPath = await localCurrentCursor.entry.fileSystem.appendPath(localCurrentCursor.entry.dir, localCurrentCursor.entry.name);
-      extension = localCurrentCursor.entry.ext;
-      size = util.readableSize(localCurrentCursor.entry.size);
+    fullPath = await $currentCursor.entry.fileSystem.appendPath($currentCursor.entry.dir, $currentCursor.entry.name);
+    extension = $currentCursor.entry.ext;
+    size = util.readableSize($currentCursor.entry.size);
 
-      //
-      // Check the new cursor for extra panel items.
-      //
-      isExtra = checkExtraPanel();
-    });
-
-    // 
-    // See if the exta panel has information.
     //
-    var unsubscribeExtraPanel = extraPanel.subscribe(value => {
-      localExtraPanel = value;
-    });
+    // Check the new cursor for extra panel items.
+    //
+    isExtra = checkExtraPanel();
 
     // 
-    // Return the function to unsubscribe to the stores.
+    // Return the function
     //
     return(() => {
-      unsubscribeCurrentCursor();
-      unsubscribeExtraPanel();
     })
   });
   
   afterUpdate(async () => {
     if(isMovie()) {
       await tick();
-      var file = new File(localCurrentCursor.entry.dir, localCurrentCursor.entry.name);
+      var file = new File($currentCursor.entry.dir, $currentCursor.entry.name);
       var fileURL = window.URL.createObjectURL(file);
       var videoNode = window.document.getElementById('videoItem');
       if(videoNode !== null) {
@@ -129,7 +109,7 @@
       getDimensions(fullPath);
     }
     if(isExtra) {
-      localExtraPanel.forEach(item => {
+      $extraPanel.forEach(item => {
         item.after();
       });
     }
@@ -137,8 +117,8 @@
 
   function checkExtraPanel() {
     extraHTML = '';
-    localExtraPanel.forEach(async item => {
-      isExtra = await item.check(localCurrentCursor.entry.dir, localCurrentCursor.entry.name, localCurrentCursor.fileSystem, side);
+    $extraPanel.forEach(async item => {
+      isExtra = await item.check($currentCursor.entry.dir, $currentCursor.entry.name, $currentCursor.fileSystem, side);
       if(isExtra) {
         var newContent = await item.createHTML();
         extraHTML = extraHTML.concat('\n',newContent);
@@ -161,7 +141,7 @@
 
   function getDimensions(fileName) {
     var com = 'ffprobe -v error -of flat=s=_ -select_streams v:0 -show_entries stream=height,width "' + fileName + '"';
-    localCurrentCursor.entry.fileSystem.runCommandLine(com, [], (err, stdout) => {
+    $currentCursor.entry.fileSystem.runCommandLine(com, [], (err, stdout) => {
       if(err) {
         console.log(err);
       } else {
diff --git a/frontend/src/components/GeneralPrefs.svelte b/frontend/src/components/GeneralPrefs.svelte
index d2be040..9a92b70 100644
--- a/frontend/src/components/GeneralPrefs.svelte
+++ b/frontend/src/components/GeneralPrefs.svelte
@@ -1,33 +1,60 @@
-<div
-  id='general' 
-  bind:this={scrollDOM}
->
-  {#if localConfig !== null}
+<script>
+  import { onMount, afterUpdate, createEventDispatcher } from "svelte";
+  import Env from "../components/Env.svelte";
+  import { config } from "../stores/config.js";
+
+  const dispatch = createEventDispatcher();
+
+  let scrollDOM = null;
+  let first = true;
+
+  onMount(async () => {
+    if ($config !== null) {
+      const nfile = await $config.localFS.appendPath(
+        $config.configDir,
+        "config.json"
+      );
+      await $config.localFS.writeFile(
+        nfile,
+        JSON.stringify(value.configuration)
+      );
+      $config.localFS.setConfig(value.configuration);
+    }
+
+    return () => {};
+  });
+
+  afterUpdate(() => {
+    if (scrollDOM !== null && first) {
+      dispatch("setScrollDOM", {
+        DOM: scrollDOM,
+      });
+      first = false;
+    }
+  });
+
+  function trashChanged(e) {
+    $config.configuration.useTrash = e.target.checked;
+  }
+</script>
+
+<div id="general" bind:this={scrollDOM}>
+  {#if $config !== null}
     <h3>Environment for Launching Programs</h3>
     <Env />
 
     <h3>Other Configuration Items</h3>
-    <div 
-      class='row'
-    >
-      <label
-        for='trashcanans'
-      >
-        Use the Trashcan? 
-      </label>
-      {#if localConfig.configuration.useTrash}
-        <input 
-          id='trashcanans'
-          type='checkbox'
+    <div class="row">
+      <label for="trashcanans"> Use the Trashcan? </label>
+      {#if $config.configuration.useTrash}
+        <input
+          id="trashcanans"
+          type="checkbox"
           on:change={trashChanged}
           checked
         />
       {:else}
-        <input 
-          id='trashcanans'
-          type='checkbox'
-          on:change={trashChanged}
-        />
+        <input id="trashcanans" type="checkbox" on:change={trashChanged} />
       {/if}
     </div>
   {/if}
@@ -45,7 +72,7 @@
   #trashcanans {
     margin: auto 0px auto 10px;
   }
-  
+
   h3 {
     margin-left: 10px;
   }
@@ -56,50 +83,3 @@
     margin: 10px;
   }
 </style>
-
-<script>
-  import { onMount, afterUpdate, createEventDispatcher } from 'svelte';
-  import Env from '../components/Env.svelte';
-  import { config } from '../stores/config.js';
-
-  const dispatch = createEventDispatcher();
-
-  let localConfig = null;
-  let scrollDOM = null;
-  let first = true;
-
-  onMount(() => {
-    var unsubscribeConfig = config.subscribe(async (value) => {
-      // 
-      // The Config.configuration is what we can change. It contains:
-      // 
-      // env          The environment to use when executing command line programs.
-      // useTrash     If true, delete to the trashcan, otherwise delete with 'rm' command.
-      //
-      if(localConfig !== null) {
-        const nfile = await localConfig.localFS.appendPath(localConfig.configDir,'config.json');
-        await localConfig.localFS.writeFile(nfile, JSON.stringify(value.configuration));
-        localConfig.localFS.setConfig(value.configuration);
-      }
-      localConfig = value;
-    });
-
-    return(() => {
-      unsubscribeConfig();
-    });
-  });
-
-  afterUpdate(() => {
-    if((scrollDOM !== null)&&(first)) {
-      dispatch('setScrollDOM', {
-        DOM: scrollDOM
-      });
-      first = false;
-    }
-  });
-
-  function trashChanged(e) {
-    localConfig.configuration.useTrash = e.target.checked;
-    config.set(localConfig);
-  }
-</script>
diff --git a/frontend/src/components/GitHub.svelte b/frontend/src/components/GitHub.svelte
index a9e9aca..90c1411 100644
--- a/frontend/src/components/GitHub.svelte
+++ b/frontend/src/components/GitHub.svelte
@@ -9,7 +9,6 @@
 
   const dispatch = createEventDispatcher();
 
-  let octok;
   let repos = null;
   let themes = null;
   let width = null;
@@ -21,7 +20,7 @@
   let loading = true;
 
   onMount(async () => {
-    keyProcess.set(false);
+    $keyProcess = false;
     width = window.innerWidth - 30;
     timeOut = setTimeout(focusInput, 1000);
     await loadRepoInfo();
@@ -36,7 +35,7 @@
   });
 
   function focusInput() {
-    if (once) keyProcess.set(false);
+    if (once) $keyProcess = false;
     once = false;
     clearTimeout(timeOut);
     if (typeof hiddenInput !== "undefined" && hiddenInput !== null)
@@ -67,19 +66,18 @@
   }
 
   function exitGitHub() {
-    keyProcess.set(true);
+    $keyProcess = true;
     inputHidden = null;
     dispatch("closeGitHub", {});
   }
 
   async function installTheme(thm) {
-    var confg = get(config);
-    var thmDir = await confg.OS.appendPath(confg.configDir, "themes");
-    thmDir = await confg.OS.appendPath(thmDir, thm.name);
-    if (!(await confg.OS.dirExists(thmDir))) {
-      await confg.OS.createDir(thmDir);
+    var thmDir = await $config.OS.appendPath($config.configDir, "themes");
+    thmDir = await $config.OS.appendPath(thmDir, thm.name);
+    if (!(await $config.OS.dirExists(thmDir))) {
+      await $config.OS.createDir(thmDir);
     }
-    await confg.OS.runCommandLine(
+    await $config.OS.runCommandLine(
       "git clone '" + thm.url + "' '" + thmDir + "';",
       [],
       (err, stdin, stdout) => {
@@ -94,15 +92,14 @@
   }
 
   async function loadTheme(thm) {
-    var confg = get(config);
-    var thmDir = await confg.OS.appendPath(confg.configDir, "themes");
-    thmDir = await confg.OS.appendPath(thmDir, thm.name);
-    const pfile = await confg.OS.appendPath(thmDir, "package.json");
-    if (await confg.OS.fileExists(pfile)) {
-      var manifest = await confg.OS.readFile(pfile);
+    var thmDir = await $config.OS.appendPath($config.configDir, "themes");
+    thmDir = await $config.OS.appendPath(thmDir, thm.name);
+    const pfile = await $config.OS.appendPath(thmDir, "package.json");
+    if (await $config.OS.fileExists(pfile)) {
+      var manifest = await $config.OS.readFile(pfile);
       manifest = JSON.parse(manifest);
-      const mfile = await confg.OS.appendPath(thmDir, manifest.mfmtheme.main);
-      var newTheme = await confg.OS.readFile(mfile);
+      const mfile = await $config.OS.appendPath(thmDir, manifest.mfmtheme.main);
+      var newTheme = await $config.OS.readFile(mfile);
       newTheme = JSON.parse(newTheme);
       theme.set(newTheme);
       addMsg(thm, "This theme is now being used.");
@@ -112,17 +109,15 @@
   }
 
   async function themeExists(thm) {
-    var confg = get(config);
-    var thmDir = await confg.OS.appendPath(confg.configDir, "themes");
-    thmDir = await confg.OS.appendPath(thmDir, thm.name);
-    var result = await confg.OS.dirExists(thmDir);
+    var thmDir = await $config.OS.appendPath($config.configDir, "themes");
+    thmDir = await $config.OS.appendPath(thmDir, thm.name);
+    var result = await $config.OS.dirExists(thmDir);
     return result;
   }
 
   async function deleteTheme(thm) {
-    var confg = get(config);
-    var thmDir = await confg.OS.appendPath(confg.configDir, "themes");
-    await confg.OS.deleteEntries(
+    var thmDir = await $config.OS.appendPath($config.configDir, "themes");
+    await $config.OS.deleteEntries(
       {
         name: thm.name,
         dir: thmDir,
@@ -139,13 +134,12 @@
   }
 
   async function installExtension(ext) {
-    var confg = get(config);
-    var extDir = await confg.OS.appendPath(confg.configDir, "extensions");
-    extDir = await confg.OS.appendPath(extDir, ext.name);
-    if (!(await confg.OS.dirExists(extDir))) {
-      await confg.OS.createDir(extDir);
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    extDir = await $config.OS.appendPath(extDir, ext.name);
+    if (!(await $config.OS.dirExists(extDir))) {
+      await $config.OS.createDir(extDir);
     }
-    await confg.OS.runCommandLine(
+    await $config.OS.runCommandLine(
       "git clone '" + ext.url + "' '" + extDir + "';",
       [],
       (err, stdin, stdout) => {
@@ -157,17 +151,15 @@
   }
 
   async function extExists(ext) {
-    var confg = get(config);
-    var extDir = await confg.OS.appendPath(confg.configDir, "extensions");
-    extDir = await confg.OS.appendPath(extDir, ext.name);
-    var flag = await confg.OS.dirExists(extDir);
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    extDir = await $config.OS.appendPath(extDir, ext.name);
+    var flag = await $config.OS.dirExists(extDir);
     return flag;
   }
 
   async function deleteExtension(ext) {
-    var confg = get(config);
-    var extDir = await confg.OS.appendPath(confg.configDir, "extensions");
-    await confg.OS.deleteEntries(
+    var extDir = await $config.OS.appendPath($config.configDir, "extensions");
+    await $config.OS.deleteEntries(
       {
         name: ext.name,
         dir: extDir,
diff --git a/frontend/src/components/MessageBox.svelte b/frontend/src/components/MessageBox.svelte
index 58a5af7..2f192d3 100644
--- a/frontend/src/components/MessageBox.svelte
+++ b/frontend/src/components/MessageBox.svelte
@@ -26,14 +26,14 @@
     //
     // Turn off key processing.
     //
-    keyProcess.set(false);
+    $keyProcess = false;
 
     //
     // Return a function to be called when this component no longer
     // is being shown.
     //
     return () => {
-      keyProcess.set(true);
+      $keyProcess = true;
     };
   });
 
@@ -75,7 +75,7 @@
 
   function returnPickerValue(skip) {
     if (typeof skip === "undefined") skip = false;
-    keyProcess.set(true);
+    $keyProcess = true;
     var retItem = {};
     if (pickerItems.length > 0) {
       retItem.value = pickerItems[pickerNum].value;
@@ -108,7 +108,7 @@
 
   function cancel() {
     var skip = false;
-    keyProcess.set(true);
+    $keyProcess = true;
     dispatch("closeMsgBox", {
       skip: skip,
     });
@@ -192,7 +192,7 @@
     //
     // Enter key. Take the highlighted value and return.
     //
-    keyProcess.set(true);
+    $keyProcess = true;
     dispatch("msgReturn", {
       ans: {
         type: "picker",
diff --git a/frontend/src/components/Pane.svelte b/frontend/src/components/Pane.svelte
index e1393f2..91129ae 100644
--- a/frontend/src/components/Pane.svelte
+++ b/frontend/src/components/Pane.svelte
@@ -1,56 +1,15 @@
-<div 
-  class='panel'
-  bind:this={DOM}
->
-  {#each entries as entry,index}
-    <Entry 
-      pane={pane} 
-      index={index}
-      entry={entry}
-      utilities={utilities}
-      on:changeDir={changeDir}
-      on:openFile={openFile}
-      on:changeViewing={changeViewingDOM}
-    />
-  {/each}
-  <div
-    class="empty"
-    draggable="false"
-    on:click={() => {cursorToPane()}}
-    on:drop|preventDefault={(e) => { dropFiles(e, 'drop'); }}
-    on:dragover|preventDefault={(e) => { dropFiles(e,'dragover'); }}
-  >
-  </div>
-</div>
-
-<style>
-  .panel {
-    display: flex;
-    flex-direction: column;
-    padding: 0px;
-    margin: 0px;
-    height: 100%;
-    overflow-y: scroll;
-    overflow-x: hidden;
-  }
-
-  .empty {
-    height: 100%;
-  }
-</style>
-
 <script>
-  import { createEventDispatcher } from 'svelte';
-  import { get } from 'svelte/store';
-  import Entry from './Entry.svelte';
-  import { currentCursor } from '../stores/currentCursor.js';
-  import { currentLeftFile } from '../stores/currentLeftFile.js';
-  import { currentRightFile } from '../stores/currentRightFile.js';
-  import { config } from '../stores/config.js';
-  import { leftDir } from '../stores/leftDir.js';
-  import { rightDir } from '../stores/rightDir.js';
+  import { createEventDispatcher } from "svelte";
+  import { get } from "svelte/store";
+  import Entry from "./Entry.svelte";
+  import { currentCursor } from "../stores/currentCursor.js";
+  import { currentLeftFile } from "../stores/currentLeftFile.js";
+  import { currentRightFile } from "../stores/currentRightFile.js";
+  import { config } from "../stores/config.js";
+  import { leftDir } from "../stores/leftDir.js";
+  import { rightDir } from "../stores/rightDir.js";
 
-  export let pane = 'left';
+  export let pane = "left";
   export let entries = [];
   export let utilities;
 
@@ -59,70 +18,70 @@
   let DOM;
 
   function changeDir(e) {
-    dispatch('changeDir', {
+    dispatch("changeDir", {
       dir: e.detail,
-      pane: pane
+      pane: pane,
     });
   }
 
   function openFile(e) {
-    dispatch('openFile', e.detail);
+    dispatch("openFile", e.detail);
   }
 
   function changeViewingDOM(e) {
     var elDOM = e.detail;
-    if(elDOM !== null) {
+    if (elDOM !== null) {
       DOM.scrollTop += elDOM.dir;
-      if(DOM.scrollTop < 0) DOM.scrollTop = 0;
+      if (DOM.scrollTop < 0) DOM.scrollTop = 0;
     }
   }
 
-  async function dropFiles(e,type) {
+  async function dropFiles(e, type) {
     var shiftKey = e.shiftKey;
-    switch(type) {
-      case 'over':
-        if(shiftKey) {
-          e.dataTransfer.dropEffect = 'move';
+    switch (type) {
+      case "over":
+        if (shiftKey) {
+          e.dataTransfer.dropEffect = "move";
         } else {
-          e.dataTransfer.dropEffect = 'copy';
+          e.dataTransfer.dropEffect = "copy";
         }
         break;
-      case 'drop':
-        // 
+      case "drop":
+        //
         // Get the local information for dropping into.
         //
-        var dirPath = '';
-        var fileName = '';
+        var dirPath = "";
+        var fileName = "";
         var toEntry = {
-          dir: '',
-          name: '',
+          dir: "",
+          name: "",
           fileSystemType: utilities.type,
           fileSystem: utilities,
-          type: 1
+          type: 1,
         };
-        if(entries.length > 0) {
+        if (entries.length > 0) {
           toEntry.dir = entries[0].dir;
-          toEntry.name = ''
+          toEntry.name = "";
         } else {
           var curPane;
-          if(pane === 'left') {
+          if (pane === "left") {
             curPane = get(leftDir);
           } else {
             curPane = get(rightDir);
           }
           toEntry.dir = curPane.path;
-          toEntry.name = '';
+          toEntry.name = "";
         }
 
-        // 
+        //
         // Process the information from the drop.
-        // 
-        const dataTransArray = e.dataTransfer.getData('text/plain').split('\n');
+        //
+        const dataTransArray = e.dataTransfer.getData("text/plain").split("\n");
         const lconfig = get(config);
         var fromEntries = [];
-        dataTransArray.forEach(async dataTrans => {
-          const parts = dataTrans.split('|');
-          if(parts[1] === '1') {
+        dataTransArray.forEach(async (dataTrans) => {
+          const parts = dataTrans.split("|");
+          if (parts[1] === "1") {
             dirPath = parts[0];
             var fdir = await utilities.splitFilePath(dirPath);
             const nwDir = await utilities.appendPath(toEntry.dir, fdir.name);
@@ -137,13 +96,17 @@
             dir: dirPath,
             name: fileName,
             fileSystemType: utilities.type,
-            fileSystem: utilities
+            fileSystem: utilities,
           });
         });
-        if(shiftKey) {
-          lconfig.extensions.getExtCommand('moveEntriesCommand').command(fromEntries, toEntry);
+        if (shiftKey) {
+          lconfig.extensions
+            .getExtCommand("moveEntriesCommand")
+            .command(fromEntries, toEntry);
         } else {
-          lconfig.extensions.getExtCommand('copyEntriesCommand').command(fromEntries, toEntry);
+          lconfig.extensions
+            .getExtCommand("copyEntriesCommand")
+            .command(fromEntries, toEntry);
         }
         break;
       default:
@@ -153,44 +116,85 @@
 
   function cursorToPane() {
     var nEntry = {
-      dir: '',
-      name: '',
+      dir: "",
+      name: "",
       fileSystemType: utilities.type,
       fileSystem: utilities,
       type: 1,
       size: 0,
-      datetime: '',
-      seleted: false
-    }
-    if(entries.length > 0) {
-      nEntry = entries[0];
-    } else {
-      var curPane;
-      if(pane === 'left') {
-        curPane = get(leftDir);
+      datetime: "",
+      seleted: false,
+    };
+
+    if (pane === "right") {
+      if (entries.length > 0 && $currentRightFile.entry === null) {
+        nEntry = entries[0];
       } else {
-        curPane = get(rightDir);
+        nEntry = $currentRightFile.entry;
       }
-      nEntry.dir = curPane.path;
-      nEntry.name = '';
-    }
-    currentCursor.set({
-      pane: pane,
-      entry: nEntry
-    });
-
-    if(pane === 'right') {
-      currentRightFile.set(
-        {
-          entry: nEntry
-        }
-      );
+      $currentCursor = {
+        pane: pane,
+        entry: nEntry,
+      };
+      $currentRightFile = {
+        entry: nEntry,
+      };
     } else {
-      currentLeftFile.set(
-        {
-          entry: nEntry
-        }
-      )
+      if (entries.length > 0 && $currentLeftFile.entry === null) {
+        nEntry = entries[0];
+      } else {
+        nEntry = $currentLeftFile.entry;
+      }
+      $currentCursor = {
+        pane: pane,
+        entry: nEntry,
+      };
+      $currentLeftFile = {
+        entry: nEntry,
+      };
     }
   }
 </script>
+
+<div class="panel" bind:this={DOM}>
+  {#each entries as entry, index}
+    <Entry
+      {pane}
+      {index}
+      {entry}
+      {utilities}
+      on:changeDir={changeDir}
+      on:openFile={openFile}
+      on:changeViewing={changeViewingDOM}
+    />
+  {/each}
+  <div
+    class="empty"
+    draggable="false"
+    on:click={() => {
+      cursorToPane();
+    }}
+    on:drop|preventDefault={(e) => {
+      dropFiles(e, "drop");
+    }}
+    on:dragover|preventDefault={(e) => {
+      dropFiles(e, "dragover");
+    }}
+  />
+</div>
+
+<style>
+  .panel {
+    display: flex;
+    flex-direction: column;
+    padding: 0px;
+    margin: 0px;
+    height: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  }
+
+  .empty {
+    height: 100%;
+  }
+</style>
diff --git a/frontend/src/components/QuickSearch.svelte b/frontend/src/components/QuickSearch.svelte
index bc40cc7..0da9cb6 100644
--- a/frontend/src/components/QuickSearch.svelte
+++ b/frontend/src/components/QuickSearch.svelte
@@ -20,13 +20,11 @@
 
   let qsInput = "";
   let qsInputDOM = null;
-  let cursor = null;
-  let localTheme = null;
   let position = null;
   let origEntries = null;
 
   beforeUpdate(() => {
-    if (cursor === null) {
+    if ($currentCursor === null) {
       getDefaults();
     }
   });
@@ -38,7 +36,7 @@
   });
 
   onMount(() => {
-    if (cursor.pane === "left") {
+    if ($currentCursor.pane === "left") {
       position = leftDOM.clientWidth - 110;
     } else {
       position = rightDOM.clientWidth + leftDOM.clientWidth - 95;
@@ -46,14 +44,12 @@
   });
 
   function getDefaults() {
-    cursor = get(currentCursor);
-    localTheme = get(theme);
-    keyProcess.set(false);
+    $keyProcess = false;
     origEntries = usingEntry(leftEntries, rightEntries);
   }
 
   function usingEntry(leftE, rightE) {
-    if (cursor.pane === "left") {
+    if ($currentCursor.pane === "left") {
       return leftE;
     } else {
       return rightE;
@@ -62,7 +58,7 @@
 
   function exitQS(skip) {
     if (typeof skip === "undefined") skip = false;
-    cursor = null;
+    $currentCursor = null;
     dispatch("closeQuickSearch", {
       skip: skip,
     });
@@ -84,7 +80,7 @@
   }
 
   function processInput() {
-    if (cursor === null) {
+    if ($currentCursor === null) {
       getDefaults();
     }
 
@@ -103,7 +99,7 @@
     //
     if (entries.length > 0) {
       dispatch("changeEntries", {
-        pane: cursor.pane,
+        pane: $currentCursor.pane,
         entries: entries,
       });
     }
@@ -120,8 +116,8 @@
     on:blur={(e) => {
       exitQS();
     }}
-    style="background-color: {localTheme.textColor};
-                text-color: {localTheme.backgroundColor};"
+    style="background-color: {$theme.textColor};
+                text-color: {$theme.backgroundColor};"
   />
 </div>
 
diff --git a/frontend/src/components/ResizeBorder.svelte b/frontend/src/components/ResizeBorder.svelte
index f2130d7..6386163 100644
--- a/frontend/src/components/ResizeBorder.svelte
+++ b/frontend/src/components/ResizeBorder.svelte
@@ -4,8 +4,8 @@
             width: 10px;
             max-width: 10px;
             min-width: 10px;
-            border-left: 3px solid {localTheme.borderColor};
-            border-right: 3px solid {localTheme.borderColor};"
+            border-left: 3px solid {$theme.borderColor};
+            border-right: 3px solid {$theme.borderColor};"
       on:mousedown={e => {
         dispatch('mouseDown', true);
       }}
@@ -30,14 +30,8 @@
 
   const dispatch = createEventDispatcher();
   
-  let localTheme = {};
-
   onMount(() => {
-    var unsubscribeTheme = theme.subscribe(value => {
-      localTheme = value;
-    });
     return(() => {
-      unsubscribeTheme();
     })
   });
 </script>
diff --git a/frontend/src/components/StatusLine.svelte b/frontend/src/components/StatusLine.svelte
index 00c2cbe..11e5b39 100644
--- a/frontend/src/components/StatusLine.svelte
+++ b/frontend/src/components/StatusLine.svelte
@@ -7,17 +7,6 @@
 
   import util from "../modules/util.js";
 
-  let localInputState = "normal";
-  let localCurrentCursor = {
-    entry: {
-      name: "test.txt",
-      size: "",
-      datetime: "",
-    },
-    pane: "",
-  };
-  let localStateMapColors = [];
-  let stateColor = "#6fb1e9";
   let size = 0;
   let DT;
 
@@ -26,41 +15,29 @@
     // Here, we are subscribing to the different stores and setting their
     // default values;
     //
-    var unSubscribeInputState = inputState.subscribe((value) => {
-      localInputState = value;
-      stateColor = localStateMapColors[localInputState];
-    });
-    var unSubscribeCurrentCursor = currentCursor.subscribe((value) => {
-      localCurrentCursor = value;
+    let unsubscribeCurrentCursor = currentCursor.subscribe((value) => {
       if (typeof value.entry === "undefined") {
-        localCurrentCursor = {
+        $currentCursor = {
           entry: {
             name: "",
             size: "",
             datetime: "",
           },
-          pane: localCurrentCursor.pane,
+          pane: value.pane,
         };
         size = "";
       } else {
-        size = util.readableSize(localCurrentCursor.entry.size);
-
+        size = util.readableSize(value.entry.size);
         //
         // Setup a locale dependent way to show date and time.
         // #TODO: make more programmable?
         //
-        DT = new Date(localCurrentCursor.entry.datetime).toLocaleString();
+        DT = new Date(value.entry.datetime).toLocaleString();
         if (DT === "Invalid Date") DT = "";
       }
     });
-    var unSubscribeStateMapColors = stateMapColors.subscribe((value) => {
-      localStateMapColors = value;
-      stateColor = localStateMapColors[localInputState];
-    });
     return () => {
-      unSubscribeCurrentCursor();
-      unSubscribeInputState();
-      unSubscribeStateMapColors();
+      unsubscribeCurrentCursor();
     };
   });
 </script>
@@ -73,21 +50,24 @@
          font-size: {$theme.fontSize};
          border-top: 3px solid {$theme.borderColor};"
 >
-  <span class="state" style="color: 'black'; background-color: {stateColor};">
-    {localInputState}
+  <span
+    class="state"
+    style="color: 'black'; background-color: {$stateMapColors[$inputState]};"
+  >
+    {$inputState}
   </span>
   <span
     class="pane"
     style="color: {$theme.Cyan}; background-color: {$theme.backgroundColor};"
   >
-    {localCurrentCursor.pane}
+    {$currentCursor.pane}
   </span>
   <span
     class="file customdata"
     style="color: {$theme.textColor}; background-color: {$theme.backgroundColor};"
-    data-tooltip={localCurrentCursor.entry.name}
+    data-tooltip={$currentCursor.entry.name}
   >
-    {localCurrentCursor.entry.name}
+    {$currentCursor.entry.name}
   </span>
   <span
     class="file customdata"
@@ -99,8 +79,8 @@
   <span
     class="file"
     style="color: {$theme.Green}; 
-               background-color: {$theme.backgroundColor};
-               flex-grow: 2;"
+           background-color: {$theme.backgroundColor};
+           flex-grow: 2;"
   >
     {size}
   </span>
diff --git a/frontend/src/components/ThemePrefs.svelte b/frontend/src/components/ThemePrefs.svelte
index 367f77a..01ef072 100644
--- a/frontend/src/components/ThemePrefs.svelte
+++ b/frontend/src/components/ThemePrefs.svelte
@@ -6,8 +6,6 @@
 
   const dispatch = createEventDispatcher();
 
-  let localTheme = null;
-  let localConfig = null;
   let themeName = "";
   let showMsgBox = false;
   let msgText = "";
@@ -17,20 +15,12 @@
   let first = true;
 
   onMount(async () => {
-    const unsubTheme = theme.subscribe((value) => {
-      localTheme = value;
-    });
-
-    const unsubConfig = config.subscribe(async (value) => {
-      localConfig = value;
-      if (typeof localConfig.OS !== "undefined") {
-        await loadThemeList();
-      }
-    });
+    $config = value;
+    if (typeof $config.OS !== "undefined") {
+      await loadThemeList();
+    }
 
     return () => {
-      unsubTheme();
-      unsubConfig();
     };
   });
 
@@ -44,11 +34,11 @@
   });
 
   async function loadThemeList() {
-    var themedir = await localConfig.OS.appendPath(
-      localConfig.configDir,
+    var themedir = await $config.OS.appendPath(
+      $config.configDir,
       "themes"
     );
-    themeList = await localConfig.OS.getDirList(themedir);
+    themeList = await $config.OS.getDirList(themedir);
     themeName = "";
   }
 
@@ -59,19 +49,19 @@
   }
 
   function changeValue(kv, e) {
-    localTheme[kv[0]] = e.detail.value;
-    theme.set(localTheme);
+    $theme[kv[0]] = e.detail.value;
+    $theme = $theme;
   }
 
   async function createTheme() {
-    var thmDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
+    var thmDir = await $config.OS.appendPath(
+      $config.configDir,
       "themes"
     );
-    thmDir = await localConfig.OS.appendPath(thmDir, themeName);
-    if (!(await localConfig.OS.dirExists(thmDir))) {
-      await localConfig.OS.createDir(thmDir);
-      await localConfig.OS.runCommandLine(
+    thmDir = await $config.OS.appendPath(thmDir, themeName);
+    if (!(await $config.OS.dirExists(thmDir))) {
+      await $config.OS.createDir(thmDir);
+      await $config.OS.runCommandLine(
         'cd "' + thmDir + '"; npm init -y;',
         [],
         async (err, stdout) => {
@@ -85,11 +75,11 @@
             //
             // Add the needed fields to the package.json file for Modal File Manager.
             //
-            const pfile = await localConfig.OS.appendPath(
+            const pfile = await $config.OS.appendPath(
               thmDir,
               "package.json"
             );
-            var pkgConfig = JSON.parse(await localConfig.OS.readFile(pfile));
+            var pkgConfig = JSON.parse(await $config.OS.readFile(pfile));
             pkgConfig.mfmtheme = {
               name: themeName,
               description: "",
@@ -97,16 +87,16 @@
               github: "",
               main: themeName + ".json",
             };
-            await localConfig.OS.writeFile(pfile, JSON.stringify(pkgConfig));
+            await $config.OS.writeFile(pfile, JSON.stringify(pkgConfig));
           }
           //
           // Create the actual theme file.
           //
-          var thmFile = await localConfig.OS.appendPath(
+          var thmFile = await $config.OS.appendPath(
             thmDir,
             themeName + ".json"
           );
-          await localConfig.OS.writeFile(thmFile, JSON.stringify(localTheme));
+          await $config.OS.writeFile(thmFile, JSON.stringify($theme));
           loadThemeList();
         },
         "."
@@ -125,39 +115,39 @@
   }
 
   async function updateTheme(thm) {
-    var thmDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
+    var thmDir = await $config.OS.appendPath(
+      $config.configDir,
       "themes"
     );
-    thmDir = await localConfig.OS.appendPath(thmDir, thm.name);
-    const pfile = await localConfig.OS.appendPath(thmDir, "package.json");
-    var pkgConfig = await localConfig.OS.readFile(pfile);
+    thmDir = await $config.OS.appendPath(thmDir, thm.name);
+    const pfile = await $config.OS.appendPath(thmDir, "package.json");
+    var pkgConfig = await $config.OS.readFile(pfile);
     pkgConfig = JSON.parse(pkgConfig);
-    var thmFile = await localConfig.OS.appendPath(
+    var thmFile = await $config.OS.appendPath(
       thmDir,
       pkgConfig.mfmtheme.main
     );
-    await localConfig.OS.writeFile(thmFile, JSON.stringify(localTheme));
+    await $config.OS.writeFile(thmFile, JSON.stringify($theme));
   }
 
   async function deleteTheme(thm) {
-    var thmDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
+    var thmDir = await $config.OS.appendPath(
+      $config.configDir,
       "themes"
     );
-    await localConfig.OS.deleteEntries(
+    await $config.OS.deleteEntries(
       {
         dir: thmDir,
         name: thm.name,
-        fileSystem: localConfig.OS,
+        fileSystem: $config.OS,
       },
       async (err, stdout) => {
         if (!err) {
-          var themedir = await localConfig.OS.appendPath(
-            localConfig.configDir,
+          var themedir = await $config.OS.appendPath(
+            $config.configDir,
             "themes"
           );
-          themeList = await localConfig.OS.getDirList(themedir);
+          themeList = await $config.OS.getDirList(themedir);
         } else {
           msgText = "The theme, " + thm.name + ", can't be deleted.";
           msgTitle = "Theme Preferences";
@@ -169,27 +159,26 @@
   }
 
   async function setTheme(thm) {
-    var thmDir = await localConfig.OS.appendPath(
-      localConfig.configDir,
+    var thmDir = await $config.OS.appendPath(
+      $config.configDir,
       "themes"
     );
-    thmDir = await localConfig.OS.appendPath(thmDir, thm.name);
-    const pfile = await localConfig.OS.appendPath(thmDir, "package.json");
-    var pkgConfig = await localConfig.OS.readFile(pfile);
+    thmDir = await $config.OS.appendPath(thmDir, thm.name);
+    const pfile = await $config.OS.appendPath(thmDir, "package.json");
+    var pkgConfig = await $config.OS.readFile(pfile);
     pkgConfig = JSON.parse(pkgConfig);
-    var thmFile = await localConfig.OS.appendPath(
+    var thmFile = await $config.OS.appendPath(
       thmDir,
       pkgConfig.mfmtheme.main
     );
-    localTheme = await localConfig.OS.readFile(thmFile);
-    localTheme = JSON.parse(localTheme);
-    theme.set(localTheme);
+    $theme = await $config.OS.readFile(thmFile);
+    $theme = JSON.parse($theme);
   }
 </script>
 
 <div id="theme" bind:this={scrollDOM}>
   <h3>Current Theme Values</h3>
-  {#if localTheme !== null}
+  {#if $theme !== null}
     <table>
       <thead>
         <tr>
@@ -198,7 +187,7 @@
         </tr>
       </thead>
       <tbody>
-        {#each Object.entries(localTheme) as kv}
+        {#each Object.entries($theme) as kv}
           <ThemeItem
             label={kv[0]}
             value={kv[1]}