diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json
index dfe4dc4..6b080c9 100644
--- a/com.visualstudio.code.json
+++ b/com.visualstudio.code.json
@@ -52,27 +52,37 @@
         "cleanup": ["/include", "/lib/*.la", "/lib/pkgconfig"],
         "config-opts": ["--disable-static"],
         "sources": [
-        {
-            "type": "archive",
-            "url": "https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.bz2",
-            "sha256": "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a"
-        }
+            {
+                "type": "archive",
+                "url": "https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.bz2",
+                "sha256": "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a"
+            }
         ]
     },
     {
         "name": "git",
         "make-args": ["NO_PERL=1"],
         "make-install-args": ["NO_PERL=1"],
+        "cleanup": ["/share/git-gui"],        
         "sources": [
             {
                 "type": "archive",
-                "url": "https://www.kernel.org/pub/software/scm/git/git-2.14.1.tar.xz",
-                "sha256": "6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6"
+                "url": "https://www.kernel.org/pub/software/scm/git/git-2.15.0.tar.xz",
+                "sha256": "107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a"
             }
         ]
     },
     {
         "name": "nodejs",
+        "cleanup": [
+            "/include", 
+            "/share",
+            "/app/lib/node_modules/npm/changelogs", 
+            "/app/lib/node_modules/npm/doc",
+            "/app/lib/node_modules/npm/html", 
+            "/app/lib/node_modules/npm/man",
+            "/app/lib/node_modules/npm/scripts"
+        ],                
         "sources": [
             {
                 "type": "archive",
@@ -101,13 +111,11 @@
                     "ar x code.deb",
                     "rm -f code.deb",                    
                     "tar -xf data.tar.xz",
-                    "rm -f control.tar.gz data.tar.gz debian-binary",                    
+                    "rm -f control.tar.xz data.tar.xz debian-binary",                    
                     "mv usr/* .",
                     "rmdir usr",
-                    "mkdir -p export/share/icons/hicolor/512x512/apps",
-                    "cp share/pixmaps/code.png export/share/icons/hicolor/512x512/apps/com.visualstudio.code.png",
-                    "mkdir -p export/share/applications",
-                    "cp share/applications/code.desktop export/share/applications/com.visualstudio.code.desktop",                
+                    "install -Dm644  share/pixmaps/code.png export/share/icons/hicolor/512x512/apps/com.visualstudio.code.png",
+                    "install -Dm644  share/applications/code.desktop export/share/applications/com.visualstudio.code.desktop",                
                     "desktop-file-edit --set-key=Exec --set-value='code %F' export/share/applications/com.visualstudio.code.desktop",
                     "desktop-file-edit --set-key=Icon --set-value='com.visualstudio.code' export/share/applications/com.visualstudio.code.desktop",                    
                     "mkdir -p export/share/appdata",