diff --git a/.sandstorm/rocket.chat-128.svg b/.sandstorm/rocket.chat-128.svg
index ed0ba57a158..06b1893ee1e 100644
--- a/.sandstorm/rocket.chat-128.svg
+++ b/.sandstorm/rocket.chat-128.svg
@@ -6,7 +6,7 @@
 <style type="text/css">
 	.st0{opacity:0.6;fill:#D1D1D1;enable-background:new    ;}
 	.st1{clip-path:url(#SVGID_2_);}
-	.st2{fill:#02273E;}
+	.st2{fill:#F7F7F7;}
 	.st3{fill:#C1272D;}
 	.st4{fill:#FFFFFF;}
 	.st5{fill:#CCCCCC;}
diff --git a/.sandstorm/rocket.chat-150.svg b/.sandstorm/rocket.chat-150.svg
index 557c398ab35..c1e19551c19 100644
--- a/.sandstorm/rocket.chat-150.svg
+++ b/.sandstorm/rocket.chat-150.svg
@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="-230 322 150 150" style="enable-background:new -230 322 150 150;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#02273E;}
+	.st0{fill:#F7F7F7;}
 	.st1{fill:#C1272D;}
 	.st2{fill:#FFFFFF;}
 	.st3{fill:#CCCCCC;}
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index e98c3ec9b27..24da0b5d755 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
     appTitle = (defaultText = "Rocket.Chat"),
 
-    appVersion = 14,  # Increment this for every release.
+    appVersion = 16,  # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.18.0"),
+    appMarketingVersion = (defaultText = "0.19.0"),
     # Human-readable representation of appVersion. Should match the way you
     # identify versions of your app in documentation and marketing.
 
@@ -63,7 +63,10 @@ const pkgdef :Spk.PackageDefinition = (
       shortDescription = (defaultText = "Chat app"),
 
       screenshots = [
-        (width = 1203, height = 760, png = embed "screenshot.png")
+        (width = 1024, height = 696, png = embed "screenshot1.png"),
+        (width = 1024, height = 696, png = embed "screenshot2.png"),
+        (width = 1024, height = 696, png = embed "screenshot3.png"),
+        (width = 1024, height = 696, png = embed "screenshot4.png")
       ],
 
       changeLog = (defaultText = embed "CHANGELOG.md"),
diff --git a/.sandstorm/screenshot.png b/.sandstorm/screenshot.png
deleted file mode 100644
index 49a87618974..00000000000
Binary files a/.sandstorm/screenshot.png and /dev/null differ
diff --git a/.sandstorm/screenshot1.png b/.sandstorm/screenshot1.png
new file mode 100644
index 00000000000..ec123d99cd0
Binary files /dev/null and b/.sandstorm/screenshot1.png differ
diff --git a/.sandstorm/screenshot2.png b/.sandstorm/screenshot2.png
new file mode 100644
index 00000000000..30713297c2f
Binary files /dev/null and b/.sandstorm/screenshot2.png differ
diff --git a/.sandstorm/screenshot3.png b/.sandstorm/screenshot3.png
new file mode 100644
index 00000000000..d8e88683c4c
Binary files /dev/null and b/.sandstorm/screenshot3.png differ
diff --git a/.sandstorm/screenshot4.png b/.sandstorm/screenshot4.png
new file mode 100644
index 00000000000..3955cc694a3
Binary files /dev/null and b/.sandstorm/screenshot4.png differ
diff --git a/server/configuration/accounts_meld.coffee b/server/configuration/accounts_meld.coffee
index 8dfe3828d8c..f6c3c22bfdb 100644
--- a/server/configuration/accounts_meld.coffee
+++ b/server/configuration/accounts_meld.coffee
@@ -17,10 +17,6 @@ Accounts.updateOrCreateUserFromExternalService = (serviceName, serviceData, opti
 	if serviceName is 'linkedin'
 		serviceData.email = serviceData.emailAddress
 
-	if serviceName is 'sandstorm'
-		console.log "Grab data from: ", serviceData
-		serviceData.username = serviceData.preferredHandle
-
 	if serviceData.email
 
 		# Remove not verified users that have same email