From 002fb0f4aa807151f0dadd33f5a60824a180bc7b Mon Sep 17 00:00:00 2001
From: Beelink <volynko.ua@gmail.com>
Date: Tue, 1 Oct 2019 17:42:28 +0300
Subject: [PATCH] beta v3.0.1

---
 css/modules/titlebar.css               | 128 +++++++++++++
 css/settings.css                       |  11 +-
 html/browser.html                      |  39 +---
 html/overlay.html                      |   1 +
 html/settings.html                     |   8 +
 imgs/engines/ecosia.png                | Bin 0 -> 882 bytes
 js/settings.js                         |  33 ++++
 main.js                                |  36 +++-
 modules/Overlay/Overlay.js             |  16 +-
 modules/SearchManager/SearchManager.js |   3 +
 modules/TabManager/Tab.js              |   9 +-
 modules/TabManager/TabManager.js       |   4 +-
 modules/applyWinControls.js            |  10 +-
 package-lock.json                      | 252 ++++++++++++++++++++++---
 package.json                           |   4 +-
 15 files changed, 465 insertions(+), 89 deletions(-)
 create mode 100644 css/modules/titlebar.css
 create mode 100644 imgs/engines/ecosia.png

diff --git a/css/modules/titlebar.css b/css/modules/titlebar.css
new file mode 100644
index 0000000..e97c97b
--- /dev/null
+++ b/css/modules/titlebar.css
@@ -0,0 +1,128 @@
+/*
+.########.####.########.##.......########.########.....###....########.
+....##.....##.....##....##.......##.......##.....##...##.##...##.....##
+....##.....##.....##....##.......##.......##.....##..##...##..##.....##
+....##.....##.....##....##.......######...########..##.....##.########.
+....##.....##.....##....##.......##.......##.....##.#########.##...##..
+....##.....##.....##....##.......##.......##.....##.##.....##.##....##.
+....##....####....##....########.########.########..##.....##.##.....##
+*/
+
+#titlebar-icon {
+    float: left;
+    padding: 8px;
+  }
+  
+  #titlebar-title {
+    position: absolute;
+    top: 6px;
+    left: 30px;
+  }
+  
+  #drag-zone {
+    -webkit-app-region: drag;
+    position: absolute;
+    left: 4px;
+    right: 4px;
+    top: 4px;
+    bottom: calc(100% - 32px);
+    z-index: -100;
+  }
+  
+  #titlebar {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    height: 33px;
+    border-bottom: 1px solid var(--color-border);
+    background-color: var(--color-element);
+  }
+
+  #titlebar-icon {
+    padding: 8px;
+  }
+
+  #window-controls #close-btn:hover {
+    background-color: #E81022;
+    color: white;
+    opacity: 1 !important;
+  }
+
+  #titlebar-label {
+    position: absolute;
+    top: 6px;
+    left: 34px;
+    font-size: var(--px-font);
+    color: var(--color-top);
+  }
+
+#titlebar.blur #titlebar-label {
+  opacity: 0.5;
+}
+
+  #titlebar.blur #window-controls .button, #titlebar.blur .theme-icon, #window-controls .button:active, #window-controls #close-btn:active {
+    opacity: 0.5 !important;
+  }
+  
+  /*
+  .##......##.####.##....##.....######...#######..##....##.########.########...#######..##........######.
+  .##..##..##..##..###...##....##....##.##.....##.###...##....##....##.....##.##.....##.##.......##....##
+  .##..##..##..##..####..##....##.......##.....##.####..##....##....##.....##.##.....##.##.......##......
+  .##..##..##..##..##.##.##....##.......##.....##.##.##.##....##....########..##.....##.##........######.
+  .##..##..##..##..##..####....##.......##.....##.##..####....##....##...##...##.....##.##.............##
+  .##..##..##..##..##...###....##....##.##.....##.##...###....##....##....##..##.....##.##.......##....##
+  ..###..###..####.##....##.....######...#######..##....##....##....##.....##..#######..########..######.
+  */
+  
+  #window-controls {
+    -webkit-app-region: no-drag;
+    float: right;
+    height: 32px;
+    display: grid;
+    grid-template-columns: repeat(3, 46px);
+  }
+  
+  #window-controls.linux {
+    grid-template-columns: repeat(1, 32px);
+  }
+  
+  #window-controls span {
+    font-family: SegMDL2;
+    font-size: 10px;
+  }
+  
+  #window-controls .nav-btn {
+    grid-row: 1 / span 1;
+    border-radius: 0;
+    width: 34px;
+    height: 34px;
+    margin: -1px;
+    border: none;
+    background-color: transparent;
+    border: 1px solid transparent;
+  }
+  
+  #window-controls .nav-btn:hover {
+    background-color: var(--color-second);
+    border-color: var(--color-border);
+  }
+  
+  #window-controls .nav-btn:focus {
+    border-color: var(--color-border);
+  }
+  
+  #window-controls .nav-btn:active {
+    background-color: var(--color-border);
+  }
+  
+  #window-controls .button {
+    grid-row: 1 / span 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    color: var(--color-top);
+    transition: background-color 0.25s;
+  }
\ No newline at end of file
diff --git a/css/settings.css b/css/settings.css
index 80c382d..31f351c 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -57,7 +57,6 @@
 */
 
 body {
-    border-top: 1px solid var(--color-border);
     padding: 0;
     margin: 0;
     overflow: hidden;
@@ -76,11 +75,11 @@ body {
 .sidebar {
     position: absolute;
     left: 0;
-    top: 0;
+    top: 33px;
     bottom: 0;
-    width: 30%;
+    width: 35%;
     border-right: 1px solid var(--color-border);
-    padding: 2px;
+    padding: 16px;
 }
 
 .sidebar button {
@@ -106,9 +105,9 @@ hr {
 .container {
     position: absolute;
     right: 0;
-    top: 0;
+    top: 33px;
     bottom: 0;
-    width: 70%;
+    width: 65%;
     animation: append-center;
     animation-duration: 0.25s;
     display: none;
diff --git a/html/browser.html b/html/browser.html
index bd25761..a9f6236 100755
--- a/html/browser.html
+++ b/html/browser.html
@@ -40,44 +40,7 @@
       <button id="menu-btn" class='nav-btn' title="Menu" onclick="requestSideMenu()"><img name="menu-16" class="theme-icon"></button>
     </div>
 
-    <main>
-      <!-- <div id="sidebar" style="display: none;" class="hide">
-        <div id="sidebar-div">
-          <button class="nav-btn" title="Hide sidebar" onclick="hideSidebar()"><img name='forward-16' class='theme-icon'></button>
-          <hr>
-          <button id="bookmarks-btn" class="nav-btn tab-btn active" onclick="goToBookmarksTab()" title="Bookmarks">
-            <img class="theme-icon" name="bookmarks-16">
-            <label>Bookmarks</label>
-          </button>
-          <button id="history-btn" class="nav-btn tab-btn" onclick="goToHistoryTab()" title="History">
-            <img class="theme-icon" name="history-16">
-            <label>History</label>
-          </button>
-          <button id="downloads-btn" class="nav-btn tab-btn" onclick="goToDownloadsTab()" title="Downloads">
-            <img class="theme-icon" name="download-16">
-            <label>Downloads</label>
-          </button>
-          <hr>
-          <button id="certificate-btn" class="nav-btn tab-btn" onclick="goToCertificateTab()" title="Certificate">
-            <img class="theme-icon" name="license-16">
-            <label>Certificate</label>
-          </button>
-          <hr>
-          <button id="settings-btn" class="nav-btn tab-btn" onclick="goToSettingsTab()" title="Settings">
-            <img class="theme-icon" name="settings-16">
-            <label>Settings</label>
-          </button>
-          <button id="about-btn" class="nav-btn tab-btn" onclick="goToAboutTab()" title="About">
-            <img class="theme-icon" name="about-16">
-            <label>About</label>
-          </button>
-          <button id="pin-sidebar-btn" class='nav-btn' title="Toggle pin sidebar" onclick="pinSidebar()"><img name='pin-16' class='theme-icon'></button>
-          <button id="resize-sidebar-btn" class='nav-btn' title="Toggle collapse sidebar" onclick="collapseSidebar()"><img name='resize-horizontal-16' class='theme-icon'></button>
-        </div>
-        <webview id="sidebar-webview" nodeintegration src="../html/bookmarks.html"></webview>
-      </div> -->
-      <div id="notif-panel"></div>
-    </main>
+    <div id="notif-panel"></div>
 
     <!-- <center id="find-panel" style="display: none;" class="hide">
       <img name="search-16" class="theme-icon find-panel-icon">
diff --git a/html/overlay.html b/html/overlay.html
index 5f4e839..0e5dccd 100755
--- a/html/overlay.html
+++ b/html/overlay.html
@@ -40,6 +40,7 @@
                         <button name="naver" class="nav-btn search-engine" title="Search with Naver"><img src="../imgs/engines/naver.png"></button>
                         <button name="qwant" class="nav-btn search-engine" title="Search with Qwant"><img src="../imgs/engines/qwant.png"></button>
                         <button name="youtube" class="nav-btn search-engine" title="Search with YouTube"><img src="../imgs/engines/youtube.png"></button>
+                        <button name="ecosia" class="nav-btn search-engine" title="Search with Ecosia"><img src="../imgs/engines/ecosia.png"></button>
                     </div>
                 </div>
             </div>
diff --git a/html/settings.html b/html/settings.html
index da6318c..1d4a15c 100644
--- a/html/settings.html
+++ b/html/settings.html
@@ -8,9 +8,17 @@
         <link rel="stylesheet" href="../css/modules/checkbox.css">
         <link rel="stylesheet" href="../css/modules/radio.css">
         <link rel="stylesheet" href="../css/modules/link.css">
+        <link rel="stylesheet" href="../css/modules/titlebar.css">
         <link rel="stylesheet" href="../css/settings.css">
     </head>
     <body>
+        <div id="drag-zone"></div>
+        <div id="titlebar">
+            <img id="titlebar-icon" class="theme-icon" name="settings-16">
+            <label id="titlebar-label">Settings</label>
+            <div id="window-controls"></div>
+        </div>
+        
         <div class="sidebar" id="sidebar">
             <button class="nav-btn active" onclick="showCategory('themes')">
                 <img name="theme-16" class="theme-icon">
diff --git a/imgs/engines/ecosia.png b/imgs/engines/ecosia.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7169c8c4a55e3bfb96671b7654abe44fd7d67fb
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0009iNkl<ZIE_t{O>9(E7>1v7?!9w6Q%c*Ep|(tBN})7XD;9r3n`+q*(L|>b
z6XL=jk{SslE{qW9LW)>u6E-dg3mZ@{(L^w9VlWz%M59cC)-bfG6sv756j~U@JDr)%
z+<WeEf!2Q8H_y9yzelj_^!_-YW2j;eZlMi`04ACnSk^Eya17H-h$Dkbj97vXbb_Hz
z;(0s$tzF3GRtQ($51qR(HVj{%f<@;7!rJ;@iCBVhFY4&VE#i&CINmtl{*mP4i7-kF
z8p~G@UmxSC+A#X_<A}>cQ&^>S;>aL|?(PJW4|H|o4zZ_?{+};XOuf$aw9UEs2BLu(
zMx7k*Uz=lU?iSmge+eV)REXJY?LF;HXM{cwheb!zd!EGYvvmKWnJPxGq{o|UE)cIh
zL%}a2r&bV>Q<#AlSQ|Tu+4C|iW}lWQ_bBZ<_)7~~f2bg%!mKo0o+!P+mhd-Zyc(1r
z!WKTBj*`s}@%KUk|CuiE3U5o?LL1GS`SSV<4W>j0jT9cc>Q7?{%~+-hSDOGB!b6H`
z(&;bIjgNyWwn(&E?N>(Vs2pHJ@E&>JB5J3Ig)Sk4rg>!&OSlxZ$#0pB*hUWJUPV`y
z10o{PXssb+C=NgP9uJ3RnaEeOCpo}uJ_bP0Owl|37RM*Ib82!I$#e^b2Edm{<0f;{
z*d;AkVxF6B8Mai6<!YG8$FQZtxtX1eW@~X&kWc3xLz#~v?%oENmIO*J%3r@@Rn>F6
zGun^i1(9e>;ZtfZkXL0a_?nRPkZ5v#j)t0NVdO_J1Bv@H=F^II&&t!Y4*Q0$60-v+
zEm#-4gDDhOvTG=nF7vL(D|HbLZGHs0<AAwV;%g|c+Rur7yxLUHu}u##QE<un9;4YR
zt}LuZ>jJ+Qigc}ua;U8Z{oz3{jZctb^50i}5e)w$LRGJ^yPsRZ3ceculaW*!<!d%n
zl(B7n9rd<E5A-0WlL-j4ioU^RGIe)?_V-fA^zme;WK##MssSnC-W?dZ1mAxKC7}~|
z>=s9t$@IU@+d(LB3kOkd2U<M<LLfv6Bk&WZy%z&S@6ZzS4;P<Sc$_wUFaQ7m07*qo
IM6N<$f}%o<<NyEw

literal 0
HcmV?d00001

diff --git a/js/settings.js b/js/settings.js
index 93f3131..fe02e15 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -17,6 +17,7 @@ const loadFileFromJsonFolder = require("../modules/loadFileFromJsonFolder.js");
 const loadTheme = require("../modules/loadTheme.js");
 const applyTheme = require("../modules/applyTheme.js");
 const bytesToSize = require("../modules/bytesToSize.js");
+const applyWinControls = require("../modules/applyWinControls.js");
 
 /*
  ###### #    # #    #  ####              ##### #    # ###### #    # ######  ####
@@ -94,6 +95,19 @@ function requestTheme(theme) {
   });
 }
 
+/*
+ ###### #    # #    #  ####              #    # # #    # #####   ####  #    #
+ #      #    # ##   # #    #             #    # # ##   # #    # #    # #    #
+ #####  #    # # #  # #         #####    #    # # # #  # #    # #    # #    #
+ #      #    # #  # # #                  # ## # # #  # # #    # #    # # ## #
+ #      #    # #   ## #    #             ##  ## # #   ## #    # #    # ##  ##
+ #       ####  #    #  ####              #    # # #    # #####   ####  #    #
+*/
+
+function closeWindow() {
+  ipcRenderer.send("settings-closeWindow");
+}
+
 /*
  ###### #    # #    #  ####              #####   ##   #####      ####  #       ####   ####  ###### #####
  #      #    # ##   # #    #               #    #  #  #    #    #    # #      #    # #      #      #    #
@@ -279,6 +293,23 @@ ipcRenderer.on("action-set-cache-size", (event, arg) => {
   document.getElementById("cache-size-label").innerHTML = "Cache size: " + bytesToSize(arg.cacheSize);
 });
 
+/*
+ # #####   ####              #    # # #    # #####   ####  #    #
+ # #    # #    #             #    # # ##   # #    # #    # #    #
+ # #    # #         #####    #    # # # #  # #    # #    # #    #
+ # #####  #                  # ## # # #  # # #    # #    # # ## #
+ # #      #    #             ##  ## # #   ## #    # #    # ##  ##
+ # #       ####              #    # # #    # #####   ####  #    #
+*/
+
+ipcRenderer.on("window-blur", (event) => {
+  document.getElementById("titlebar").classList.add("blur");
+});
+
+ipcRenderer.on("window-focus", (event) => {
+  document.getElementById("titlebar").classList.remove("blur");
+});
+
 /*
  # #    # # #####
  # ##   # #   #
@@ -289,6 +320,8 @@ ipcRenderer.on("action-set-cache-size", (event, arg) => {
 */
 
 function init() {
+  applyWinControls("only-close");
+
   updateTheme();
 
   loadThemesFromFolder();
diff --git a/main.js b/main.js
index fa9e025..75ca1df 100755
--- a/main.js
+++ b/main.js
@@ -371,6 +371,10 @@ ipcMain.on("action-open-settings", (event) => {
   showSettingsWindow();
 });
 
+ipcMain.on("settings-closeWindow", (event) => {
+  settingsWindow.close();
+});
+
 /*
  # #####   ####               ####  #    # ###### #####  #        ##   #   #
  # #    # #    #             #    # #    # #      #    # #       #  #   # #
@@ -664,6 +668,7 @@ function showSettingsWindow() {
       settingsWindow = new BrowserWindow({
         title: "Settings",
         modal: true,
+        frame: false,
         parent: mainWindow,
         width: 640, height: 480,
         resizable: false,
@@ -677,6 +682,14 @@ function showSettingsWindow() {
   
       settingsWindow.loadFile(app.getAppPath() + "/html/settings.html");
 
+      settingsWindow.on("focus", () => {
+        settingsWindow.webContents.send("window-focus");
+      });
+    
+      settingsWindow.on("blur", () => {
+        settingsWindow.webContents.send("window-blur");
+      });
+
       settingsWindow.once("ready-to-show", () => {
         settingsWindow.show();
         // settingsWindow.webContents.openDevTools();
@@ -747,22 +760,31 @@ function showMainWindow() {
       });
 
       mainWindow.on("resize", () => {
-        // overlay.refreshBounds();
+        setTimeout(() => {
+          
+          overlay.refreshBounds();
+        }, 150);
+        if(tabManager.hasActiveTab()) {
+            tabManager.getActiveTab().activate();
+          }
       });
     
       mainWindow.on("maximize", () => {
         mainWindow.webContents.send("window-maximize");
-        if(tabManager.hasActiveTab()) {
-          tabManager.getActiveTab().activate();
-        }
+        // if(tabManager.hasActiveTab()) {
+        //   tabManager.getActiveTab().activate();
+        // }
+        // setTimeout(() => {
+        //   overlay.refreshBounds();
+        // }, 150);
         // overlay.refreshBounds();
       });
     
       mainWindow.on("unmaximize", () => {
         mainWindow.webContents.send("window-unmaximize");
-        if(tabManager.hasActiveTab()) {
-          tabManager.getActiveTab().activate();
-        }
+        // if(tabManager.hasActiveTab()) {
+        //   tabManager.getActiveTab().activate();
+        // }
         // overlay.refreshBounds();
       });
     
diff --git a/modules/Overlay/Overlay.js b/modules/Overlay/Overlay.js
index e3d3cda..a0f2c4d 100755
--- a/modules/Overlay/Overlay.js
+++ b/modules/Overlay/Overlay.js
@@ -18,10 +18,10 @@ class Overlay extends EventEmitter {
                 nodeIntegration: true
             }
         });
-        this.view.setAutoResize({
-            width: true,
-            height: true
-        });
+        // this.view.setAutoResize({
+        //     width: true,
+        //     height: true
+        // });
         this.view.webContents.loadFile(this.appPath + "/html/overlay.html");
 
         this.show();
@@ -29,7 +29,13 @@ class Overlay extends EventEmitter {
 
     refreshBounds() {
         let size = this.window.getBounds();
-        this.view.setBounds({ x: 0, y: this.top, width: size.width, height: size.height - this.top });
+        // console.log(size);
+        this.view.setBounds({ 
+            x: 0,
+            y: this.top, 
+            width: size.width, 
+            height: size.height - this.top 
+        });
     }
 
     show() {
diff --git a/modules/SearchManager/SearchManager.js b/modules/SearchManager/SearchManager.js
index 7dafed9..b460788 100755
--- a/modules/SearchManager/SearchManager.js
+++ b/modules/SearchManager/SearchManager.js
@@ -211,6 +211,9 @@ class SearchManager extends EventEmitter {
             case "youtube":
                 this.newTab("https://www.youtube.com/results?search_query=" + text);
                 break;
+            case "ecosia":
+                this.newTab("https://www.ecosia.org/search?q=" + text);
+                break;
         }
     }
       
diff --git a/modules/TabManager/Tab.js b/modules/TabManager/Tab.js
index 2d962e8..c397e22 100755
--- a/modules/TabManager/Tab.js
+++ b/modules/TabManager/Tab.js
@@ -25,10 +25,10 @@ class Tab extends EventEmitter {
             }
         });
         this.view.setBackgroundColor("#FFFFFF");
-        this.view.setAutoResize({
-            width: true,
-            height: true
-        });
+        // this.view.setAutoResize({
+        //     width: true,
+        //     height: true
+        // });
 
         this.view.webContents.on("page-title-updated", (event, title, explicitSet) => {
             this.window.webContents.send("tabRenderer-setTabTitle", { id: this.id, title });
@@ -253,7 +253,6 @@ class Tab extends EventEmitter {
 
     activate() {
         this.window.setBrowserView(this.view);
-        this.view.setBackgroundColor("#FFFFFF");
         this.window.webContents.send("tabRenderer-activateTab", this.id);
         this.window.webContents.send("tabRenderer-updateNavigationButtons", {
             canGoBack: this.view.webContents.canGoBack(),
diff --git a/modules/TabManager/TabManager.js b/modules/TabManager/TabManager.js
index f841632..2b77802 100755
--- a/modules/TabManager/TabManager.js
+++ b/modules/TabManager/TabManager.js
@@ -66,7 +66,9 @@ class TabManager extends EventEmitter {
         });
 
         tab.on("activate", (activatedTab) => {
-            activatedTab.setBounds(this.left, this.top, this.getWidth(), this.getHeight());
+            setTimeout(() => {
+                activatedTab.setBounds(this.left, this.top, this.getWidth(), this.getHeight());
+            }, 100);
             this.emit("tab-activated");
         });
 
diff --git a/modules/applyWinControls.js b/modules/applyWinControls.js
index 2c56070..a1434ed 100755
--- a/modules/applyWinControls.js
+++ b/modules/applyWinControls.js
@@ -9,8 +9,8 @@ function applyWinControls(type) {
 }
 
 function setWindows(type) {
-    var windowControls = document.getElementById('window-controls');
-    windowControls.classList.add('windows');
+    var windowControls = document.getElementById("window-controls");
+    windowControls.classList.add("windows");
 
     if(type == null) {
         windowControls.innerHTML = `
@@ -35,8 +35,8 @@ function setWindows(type) {
 }
 
 function setLinux(type) {
-    var windowControls = document.getElementById('window-controls');
-    windowControls.classList.add('linux');
+    var windowControls = document.getElementById("window-controls");
+    windowControls.classList.add("linux");
 
     if(type == null) {
         windowControls.innerHTML = `
@@ -47,7 +47,7 @@ function setLinux(type) {
         `;
     } else if(type == "only-close") {
         windowControls.innerHTML = `
-            <button class="nav-btn" title="Close" id="close-btn" onclick="restoreWindow()"><img name="cancel-12" class="theme-icon"></button>
+            <button class="nav-btn" title="Close" id="close-btn" onclick="closeWindow()"><img name="cancel-12" class="theme-icon"></button>
         `;
     }
 }
diff --git a/package-lock.json b/package-lock.json
index ab122b3..ce5f8a2 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferny",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,6 +10,117 @@
       "integrity": "sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA==",
       "dev": true
     },
+    "@electron/get": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.5.0.tgz",
+      "integrity": "sha512-tafxBz6n08G6SX961F/h8XFtpB/DdwRvJJoDeOH9x78jDSCMQ2G/rRWqSwLFp9oeMFBJf0Pf5Kkw6TKt5w9TWg==",
+      "requires": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "got": "^9.6.0",
+        "sanitize-filename": "^1.6.2",
+        "sumchecker": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "env-paths": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+          "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="
+        },
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "got": {
+          "version": "9.6.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+          "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+          "requires": {
+            "@sindresorhus/is": "^0.14.0",
+            "@szmarczak/http-timer": "^1.1.2",
+            "cacheable-request": "^6.0.0",
+            "decompress-response": "^3.3.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^4.1.0",
+            "lowercase-keys": "^1.0.1",
+            "mimic-response": "^1.0.1",
+            "p-cancelable": "^1.0.0",
+            "to-readable-stream": "^1.0.0",
+            "url-parse-lax": "^3.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
+        },
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
+        },
+        "sanitize-filename": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
+          "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
+          "requires": {
+            "truncate-utf8-bytes": "^1.0.0"
+          }
+        },
+        "sumchecker": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.0.tgz",
+          "integrity": "sha512-yreseuC/z4iaodVoq07XULEOO9p4jnQazO7mbrnDSvWAU/y2cbyIKs+gWJptfcGu9R+1l27K8Rkj0bfvqnBpgQ==",
+          "requires": {
+            "debug": "^4.1.0"
+          }
+        },
+        "url-parse-lax": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+          "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+          "requires": {
+            "prepend-http": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
+    },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
     "@types/node": {
       "version": "10.14.19",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.19.tgz",
@@ -869,6 +980,35 @@
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
     },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
+        }
+      }
+    },
     "cached-path-relative": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
@@ -1005,6 +1145,14 @@
         }
       }
     },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1301,12 +1449,25 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true
     },
+    "defer-to-connect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
+      "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="
+    },
     "defined": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
@@ -1538,8 +1699,7 @@
     "duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -1633,6 +1793,23 @@
       "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-2.2.17.tgz",
       "integrity": "sha512-v+Af5W5z99ehhaLOfE9eTSXUwjzh2wFlQjz51dvkZ6ZIrET6OB/zAZPvsuwT6tm3t5x+M1r+Ed3U3xtPZYAyuQ=="
     },
+    "electron-nightly": {
+      "version": "8.0.0-nightly.20190930",
+      "resolved": "https://registry.npmjs.org/electron-nightly/-/electron-nightly-8.0.0-nightly.20190930.tgz",
+      "integrity": "sha512-uyZrNkYLsrT7GKl5GOp25UJWlgIAhSWxooX2/KQaHOg1sE70GFyEHIWXZoY+QhaNAqKF7gQ2P0adfkaZ+21V2g==",
+      "requires": {
+        "@electron/get": "^1.0.1",
+        "@types/node": "^12.0.12",
+        "extract-zip": "^1.0.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "12.7.8",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.8.tgz",
+          "integrity": "sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A=="
+        }
+      }
+    },
     "electron-osx-sign": {
       "version": "0.4.11",
       "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz",
@@ -1751,7 +1928,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -1899,7 +2075,6 @@
       "version": "1.6.7",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
       "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
-      "dev": true,
       "requires": {
         "concat-stream": "1.6.2",
         "debug": "2.6.9",
@@ -1911,7 +2086,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -1919,8 +2093,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -1943,7 +2116,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "dev": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -2261,6 +2433,11 @@
         }
       }
     },
+    "http-cache-semantics": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -2587,6 +2764,11 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -2671,6 +2853,14 @@
         "verror": "1.10.0"
       }
     },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -2807,8 +2997,7 @@
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
     },
     "lru-cache": {
       "version": "4.1.5",
@@ -2932,6 +3121,11 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -2959,7 +3153,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       },
@@ -2967,8 +3160,7 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
       }
     },
@@ -3104,6 +3296,11 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
+    "normalize-url": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -3251,6 +3448,11 @@
         "get-size": "^2.0.2"
       }
     },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -3433,8 +3635,7 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
     },
     "performance-now": {
       "version": "2.1.0",
@@ -3557,7 +3758,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -3834,6 +4034,14 @@
         "path-parse": "^1.0.6"
       }
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -4380,6 +4588,11 @@
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
     },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
+    },
     "tough-cookie": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
@@ -4413,7 +4626,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
       "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
-      "dev": true,
       "requires": {
         "utf8-byte-length": "^1.0.1"
       }
@@ -4556,8 +4768,7 @@
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
-      "dev": true
+      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
     },
     "util": {
       "version": "0.10.4",
@@ -4857,7 +5068,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
       "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-      "dev": true,
       "requires": {
         "fd-slicer": "~1.0.1"
       }
diff --git a/package.json b/package.json
index ccf317e..8acd917 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferny",
   "companyName": "Module Art",
   "description": "Your favorite web browser",
-  "version": "3.1.0",
+  "version": "3.0.1",
   "license": "GPL-3.0",
   "keywords": [
     "web-browser",
@@ -38,6 +38,7 @@
     "color.js": "^0.1.3",
     "dragula": "^3.7.2",
     "electron-log": "^2.2.17",
+    "electron-nightly": "^8.0.0-nightly.20190930",
     "electron-updater": "^4.0.6",
     "file-extension": "^4.0.5",
     "get-ssl-certificate": "^2.3.2",
@@ -102,6 +103,7 @@
       "category": "public.app-category.navigation"
     },
     "linux": {
+      "icon": "imgs/icon256.png",
       "category": "Network",
       "target": [
         {