diff --git a/public/res/extensions/googleAnalytics.js b/public/res/extensions/googleAnalytics.js
index 62b0f606..caf9046b 100644
--- a/public/res/extensions/googleAnalytics.js
+++ b/public/res/extensions/googleAnalytics.js
@@ -67,11 +67,17 @@ define([
             'layoutOrientation',
             "" + settings.layoutOrientation
         ]);
+        _gaq.push([
+            '_trackEvent',
+            "Settings",
+            'editMode',
+            "" + settings.editMode
+        ]);
         _gaq.push([
             '_trackEvent',
             "Settings",
             'theme',
-            "" + window.theme
+            "" + window.themeV4
         ]);
         _gaq.push([
             '_trackEvent',
@@ -82,14 +88,26 @@ define([
         _gaq.push([
             '_trackEvent',
             "Settings",
-            'editorFontFamily',
-            "" + settings.editorFontFamily
+            'editorFontClass',
+            "" + settings.editorFontClass
         ]);
         _gaq.push([
             '_trackEvent',
             "Settings",
-            'editorFontSize',
-            "" + settings.editorFontSize
+            'fontSizeRatio',
+            "" + settings.fontSizeRatio
+        ]);
+        _gaq.push([
+            '_trackEvent',
+            "Settings",
+            'maxWidthRatio',
+            "" + settings.maxWidthRatio
+        ]);
+        _gaq.push([
+            '_trackEvent',
+            "Settings",
+            'cursorFocusRatio',
+            "" + settings.cursorFocusRatio
         ]);
         // Check if user has removed back links
         _gaq.push([
@@ -104,13 +122,6 @@ define([
             'commitMsg backlink',
             "" + (settings.commitMsg.indexOf(constants.MAIN_URL) !== -1)
         ]);
-        // Check if user has changed sshProxy
-        _gaq.push([
-            '_trackEvent',
-            "Settings",
-            'sshProxy unchanged',
-            "" + (settings.sshProxy == constants.SSH_PROXY_URL)
-        ]);
         // Check if extensions have been disabled
         _.each(settings.extensionSettings, function(config, extensionId) {
             _gaq.push([
@@ -165,7 +176,7 @@ define([
         _gaq.push([
             '_trackEvent',
             'Sync',
-            'SyncImport',
+            'SyncImport'
         ]);
         _gaq.push([
             '_trackEvent',
@@ -179,7 +190,7 @@ define([
         _gaq.push([
             '_trackEvent',
             'Sync',
-            'SyncExport',
+            'SyncExport'
         ]);
         _gaq.push([
             '_trackEvent',
diff --git a/public/res/helpers/googleHelper.js b/public/res/helpers/googleHelper.js
index c2f52df1..b3ddd472 100644
--- a/public/res/helpers/googleHelper.js
+++ b/public/res/helpers/googleHelper.js
@@ -565,7 +565,9 @@ define([
 			}
 
 			$.ajax({
-				url: constants.PICASA_PROXY_URL + "upload/" + albumId,
+				url: constants.PICASA_IMPORT_IMG_URL + '?' + $.param({
+					albumId: albumId
+				}),
 				headers: headers,
 				data: content,
 				processData: false,