diff --git a/pixel-saver@deadalnix.me/buttons.js b/pixel-saver@deadalnix.me/buttons.js
index ae52df9..94773c8 100644
--- a/pixel-saver@deadalnix.me/buttons.js
+++ b/pixel-saver@deadalnix.me/buttons.js
@@ -1,5 +1,6 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
 const Main = imports.ui.main;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -155,7 +156,7 @@ function close() {
  */
 let activeCSS = false;
 function loadTheme() {
-       let theme = Meta.prefs_get_theme(),
+       let theme = Gtk.Settings.get_default().gtk_theme_name,
                cssPath = GLib.build_filenamev([extensionPath, 'themes', theme, 'style.css']);

        LOG('Load theme ' + theme);
@@ -171,7 +172,8 @@ function loadTheme() {
        unloadTheme();

        // load the new style
-       St.ThemeContext.get_for_stage(global.stage).get_theme().load_stylesheet(cssPath);
+       cssGFile = Gio.file_new_for_path(cssPath);
+       St.ThemeContext.get_for_stage(global.stage).get_theme().load_stylesheet(cssGFile);

        // Force style update.
        for (let i = 0; i < actors.length; ++i) {
@@ -185,7 +187,8 @@ function unloadTheme() {
        if(activeCSS) {
                LOG('Unload ' + activeCSS);

-               St.ThemeContext.get_for_stage(global.stage).get_theme().unload_stylesheet(activeCSS);
+               activeCssGFile = Gio.file_new_for_path(activeCSS);
+               St.ThemeContext.get_for_stage(global.stage).get_theme().unload_stylesheet(activeCssGFile);
                activeCSS = false;
        }
 }
diff --git a/pixel-saver@deadalnix.me/metadata.json b/pixel-saver@deadalnix.me/metadata.json
index e9bcac3..51b87d5 100644
--- a/pixel-saver@deadalnix.me/metadata.json
+++ b/pixel-saver@deadalnix.me/metadata.json
@@ -1 +1 @@
-{"shell-version": ["3.12", "3.14"], "uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way"}
+{"shell-version": ["3.12", "3.14", "3.16"], "uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way"}