 
     func stop() {
         webView.stopLoading()
+
+        updateBarItems()
     }
 
     func openInSafari() {
-        let URLToOpenInSafari: NSURL
-        if let URL = webView.request?.URL where URL.absoluteString != "" {
-            URLToOpenInSafari = URL
-        } else {
-            URLToOpenInSafari = self.URLToOpen
-        }
-
+        let URLToOpenInSafari = currentValidURL()
         DDLogDebug("[WebViewController] open in safari:\(URLToOpenInSafari)")
         if UIApplication.sharedApplication().openURL(URLToOpenInSafari) != true {
             DDLogError("[WebViewController] failed to open \(URLToOpenInSafari) in safari")
         }
     }
 
+    private func currentValidURL() -> NSURL {
+        if let URL = webView.request?.URL where URL.absoluteString != "" {
+            return URL
+        } else {
+            return self.URLToOpen
+        }
+    }
+
     func didReceivePaletteChangeNotification(notification: NSNotification) {
+        statusBarSeparatorView.backgroundColor = APColorManager.sharedInstance.colorForKey("default.text.tint")
+
         if APColorManager.sharedInstance.isDarkTheme() {
-            blurBackgroundView.effect = UIBlurEffect(style: .Dark)
-            statusBarOverlayView.effect = UIBlurEffect(style: .Dark)
+            let darkBlurEffect = UIBlurEffect(style: .Dark)
+            blurBackgroundView.effect = darkBlurEffect
+            vibrancyEffectView.effect = UIVibrancyEffect(forBlurEffect: darkBlurEffect)
+            statusBarOverlayView.effect = darkBlurEffect
             toolBar.barStyle = .Black
         } else {
-            blurBackgroundView.effect = UIBlurEffect(style: .Light)
+            let lightBlurEffect = UIBlurEffect(style: .ExtraLight)
+            blurBackgroundView.effect = lightBlurEffect
+            vibrancyEffectView.effect = UIVibrancyEffect(forBlurEffect: lightBlurEffect)
             statusBarOverlayView.effect = UIBlurEffect(style: .ExtraLight)
             toolBar.barStyle = .Default
         }

            make.edges.equalTo(self.view)
        }

        toolBar.barTintColor = nil

        backButtonItem = UIBarButtonItem(image: UIImage(named: "Back"), style: .Plain, target: self, action: #selector(S1WebViewController.back))

    // MARK: UIWebViewDelegate
    func webViewDidStartLoad(webView: UIWebView) {
        updateBarItems()
        backButtonItem?.enabled = webView.canGoBack
        forwardButtonItem?.enabled = webView.canGoForward
        titleLabel.text = currentValidURL().absoluteString
    }

    func webViewDidFinishLoad(webView: UIWebView) {
        updateBarItems()
        backButtonItem?.enabled = webView.canGoBack
        forwardButtonItem?.enabled = webView.canGoForward
        titleLabel.text = currentValidURL().absoluteString
    }

    // MARK: Toolbar
