diff --git a/ui/js/page/settings/view.jsx b/ui/js/page/settings/view.jsx
index 8fa7c93a8..aa9d59f9f 100644
--- a/ui/js/page/settings/view.jsx
+++ b/ui/js/page/settings/view.jsx
@@ -85,6 +85,7 @@ class SettingsPage extends React.PureComponent {
   }
 
   onThemeChange(event) {
+    // Todo: Add better way to handle this
     const value = event.target.value;
     const link = document.getElementById("theme");
     link.href = `./themes/${value}.css`;
@@ -272,8 +273,8 @@ class SettingsPage extends React.PureComponent {
               defaultValue={lbry.getClientSetting("theme")}
               className="form-field__input--inline"
             >
-              {themes.map((i, k) =>
-                <option key={k} value={i}>{__(`${i} theme`)}</option>
+              {themes.map((name, index) =>
+                <option key={index} value={name}>{__(`${name} theme`)}</option>
               )}
             </FormField>
 
diff --git a/ui/js/util/getThemes.js b/ui/js/util/getThemes.js
index d82bc4d0c..09926502c 100644
--- a/ui/js/util/getThemes.js
+++ b/ui/js/util/getThemes.js
@@ -1,3 +1,4 @@
+// Todo: Add  a better way to do this
 const { readdirSync } = require("fs");
 const { extname } = require("path");
 const { remote } = require("electron");