diff --git a/debian/changelog b/debian/changelog
index 9bcd5ab..6684138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell-extensions (3.18.3-1kali1) kali-dev; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - apps-menu with multiple levels
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 08 Feb 2016 14:53:52 +0100
+
 gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/apps-menu-with-multiple-levels.patch b/debian/patches/apps-menu-with-multiple-levels.patch
index 75f60b5..5ddb598 100644
--- a/debian/patches/apps-menu-with-multiple-levels.patch
+++ b/debian/patches/apps-menu-with-multiple-levels.patch
@@ -205,13 +205,16 @@
          let iter = dir.iter();
          let nextType;
          while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-@@ -407,12 +537,21 @@ const ApplicationsButton = new Lang.Clas
+@@ -404,12 +534,23 @@ const ApplicationsButton = new Lang.Clas
+                     continue;
+                 }
                  let app = appSys.lookup_app(id);
-                 if (appInfo.should_show()) {
-                     let menu_id = dir.get_menu_id();
+-                if (app.get_app_info().should_show())
 -                    this.applicationsByCategory[categoryId].push(app);
++                if (app.get_app_info().should_show()) {
++                    let menu_id = dir.get_menu_id();
 +                    this.applicationsByCategory[menu_id].push(app);
-                 }
++		}
              } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                  let subdir = iter.get_directory();
 -                if (!subdir.get_is_nodisplay())
@@ -226,11 +229,11 @@
 +                    if (this.applicationsByCategory[menu_id].length > 0 || !categoryMenuItem.menu.isEmpty()) {
 +                        parentCategory.menu.addMenuItem(categoryMenuItem);
 +                    }
-+                }
++		}
              }
          }
      },
-@@ -433,8 +572,8 @@ const ApplicationsButton = new Lang.Clas
+@@ -430,8 +571,8 @@ const ApplicationsButton = new Lang.Clas
      },
  
      scrollToCatButton: function(button) {
@@ -241,7 +244,7 @@
          let currentScrollValue = catsScrollBoxAdj.get_value();
          let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
          let buttonAlloc = button.actor.get_allocation_box();
-@@ -448,10 +587,16 @@ const ApplicationsButton = new Lang.Clas
+@@ -445,10 +586,16 @@ const ApplicationsButton = new Lang.Clas
      },
  
      _createLayout: function() {
@@ -260,7 +263,7 @@
          this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
                                                           y_align: St.Align.START,
                                                           style_class: 'apps-menu vfade' });
-@@ -463,41 +608,55 @@ const ApplicationsButton = new Lang.Clas
+@@ -460,41 +607,55 @@ const ApplicationsButton = new Lang.Clas
          vscroll.connect('scroll-stop', Lang.bind(this, function() {
              this.menu.passEvents = false;
          }));
@@ -341,7 +344,7 @@
  
          //Load categories
          this.applicationsByCategory = {};
-@@ -505,7 +664,7 @@ const ApplicationsButton = new Lang.Clas
+@@ -502,7 +663,7 @@ const ApplicationsButton = new Lang.Clas
          tree.load_sync();
          let root = tree.get_root_directory();
          let categoryMenuItem = new CategoryMenuItem(this, null);
@@ -350,7 +353,7 @@
          let iter = root.iter();
          let nextType;
          while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-@@ -514,10 +673,12 @@ const ApplicationsButton = new Lang.Clas
+@@ -511,10 +672,12 @@ const ApplicationsButton = new Lang.Clas
                  if (!dir.get_is_nodisplay()) {
                      let categoryId = dir.get_menu_id();
                      this.applicationsByCategory[categoryId] = [];
@@ -367,7 +370,7 @@
                      }
                  }
              }
-@@ -526,8 +687,9 @@ const ApplicationsButton = new Lang.Clas
+@@ -523,8 +686,9 @@ const ApplicationsButton = new Lang.Clas
          //Load applications
          this._displayButtons(this._listApplications(null));