diff --git a/CMakeLists.txt b/CMakeLists.txt
index af8b91d..44a4051 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ pkg_check_modules(DEPS REQUIRED
     gthread-2.0 
     granite 
     gee-0.8 
-    webkit2gtk-3.0 
+    webkit2gtk-4.0 
     libsoup-2.4 
     gdk-pixbuf-2.0
 )
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 97e59ec..21ad495 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -1,3 +1,31 @@
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
+
 public class AppWindow : Granite.Application {
 
     private Settings settings;
@@ -13,28 +41,10 @@ public class AppWindow : Granite.Application {
     private ApplicationsView apps_view;
 
     construct {
-        program_name = "Webby";
-        exec_name = "webby";
-
-        app_years = "2015";
-        app_icon = "webby";
-        app_launcher = "webby.desktop";
-        application_id = "net.launchpad.webby-browser";
-
-        main_url = "https://code.launchpad.net/webby-browser";
-        bug_url = "https://bugs.launchpad.net/webby-browser";
-        help_url = "https://code.launchpad.net/webby-browser";
-        translate_url = "https://translations.launchpad.net/webby-browser";
-
-        about_authors = {"Erasmo Marín <erasmo.marin@gmail.com>",
-                            "Artem Anufrij <artem.anufrij@live.de>"};
-        about_documenters = {"Erasmo Marín",
-                            "Artem Anufrij <artem.anufrij@live.de>"};
-        about_artists = {"Erasmo Marín <erasmo.marin@gmail.com>",
-                            "Artem Anufrij <artem.anufrij@live.de>"};
-        about_comments = "Development release, not all features implemented";
-        about_translators = "";
-        about_license_type = Gtk.License.GPL_3_0;
+        program_name = "Image Burner";
+        exec_name = "com.github.artemanufrij.webpin";
+        application_id = "com.github.artemanufrij.webpin";
+        app_launcher = application_id + ".desktop";
     }
 
     public static AppWindow _instance = null;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d9bfb0..268f30c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,6 @@ vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
     Assistant.vala
     DesktopFile.vala
     InfoDialog.vala
-    Launcher.vala
     Settings.vala
     UrlEntry.vala
     WebApp.vala
@@ -18,7 +17,7 @@ PACKAGES
     gio-2.0
     gee-0.8
     posix
-    webkit2gtk-3.0
+    webkit2gtk-4.0
     libsoup-2.4
     gdk-pixbuf-2.0
 
diff --git a/src/Launcher.vala b/src/Launcher.vala
deleted file mode 100644
index e69de29..0000000
diff --git a/src/WebBar.vala b/src/WebBar.vala
index 7de58a2..ee103c5 100644
--- a/src/WebBar.vala
+++ b/src/WebBar.vala
@@ -15,7 +15,6 @@ public class WebBar : Gtk.HeaderBar {
 
     public WebBar (WebKit.WebView webview) {
 
-
         this.get_style_context ().remove_class ("header-bar");
         this.webview = webview;
 
@@ -48,7 +47,6 @@ public class WebBar : Gtk.HeaderBar {
 
         back_button.clicked.connect( () => { back_event(); });
         back_button.activate.connect( () => { back_event(); });
-
     }
 
     public void set_title_mode (title_mode mode) {
@@ -63,8 +61,8 @@ public class WebBar : Gtk.HeaderBar {
             pack_start (back_button);
             pack_start (url_entry);
             pack_end (share_button);
-            custom_title = new Gtk.Label(null);  
-            this.get_style_context ().add_class ("header-bar");          
+            custom_title = new Gtk.Label(null);
+            this.get_style_context ().add_class ("header-bar");
         }
     }