diff --git a/gaia/tracks.js b/gaia/tracks.js
index deb4afd..d6eae4a 100644
--- a/gaia/tracks.js
+++ b/gaia/tracks.js
@@ -1,35 +1,35 @@
 // ==UserScript==
-// @name						GaiaGps Track Colors Mass Updater
-// @description		 Add missing feature: Mass update of GaiaGps Track Colors
-// @version 		1.0
+// @name			GaiaGps Track Colors Mass Updater
+// @description		Add missing feature: Mass update of GaiaGps Track Colors
+// @version 		1.1
 // @grant					 none
 // @match					 https://www.gaiagps.com/datasummary/tracks/
-// @require			https://ajax.googleapis.com/ajax/libs/jquery/3.5.0/jquery.min.js
-// @namespace		https://greasyfork.org/users/583371
+// @require				 https://ajax.googleapis.com/ajax/libs/jquery/3.5.0/jquery.min.js
+// @namespace			 https://greasyfork.org/users/583371
 // ==/UserScript==
 
 console.log('computes');
 
 function init() {
-    $Selector = $('<div class="MuiPaper-root MuiMenu-paper MuiPopover-paper MuiPaper-elevation8 MuiPaper-rounded" style="opacity: 1; transform: none; min-width: 40px; transition: opacity 100ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, transform 67ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; top: 440px; left: 114px; transform-origin: 0px 0px 0px;" tabindex="-1"><ul class="MuiList-root MuiMenu-list MuiList-padding" role="listbox" tabindex="-1" style="display: flex; flex-wrap: wrap; width: 217px; flex-grow: 1; justify-content: center;"><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FFEF00" data-value="#FFEF00"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 239, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#A4A4A4" data-value="#A4A4A4"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(164, 164, 164); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#000000" data-value="#000000"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 0, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#BAF200" data-value="#BAF200"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(186, 242, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FFC900" data-value="#FFC900"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 201, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#7AD915" data-value="#7AD915"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(122, 217, 21); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#784D3E" data-value="#784D3E"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(120, 77, 62); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#F42410" data-value="#F42410"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(244, 36, 16); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#E834EC" data-value="#E834EC"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(232, 52, 236); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#A726BC" data-value="#A726BC"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(167, 38, 188); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#5726C2" data-value="#5726C2"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(87, 38, 194); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root Mui-selected MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button Mui-selected" tabindex="0" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#2D3FC7" aria-selected="true" data-value="#2D3FC7"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(45, 63, 199); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#0479FF" data-value="#0479FF"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(4, 121, 255); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00B2FF" data-value="#00B2FF"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 178, 255); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00DAE1" data-value="#00DAE1"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 218, 225); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00A478" data-value="#00A478"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 164, 120); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#4ABD32" data-value="#4ABD32"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(74, 189, 50); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FF9D00" data-value="#FF9D00"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 157, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FF6200" data-value="#FF6200"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 98, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#5E7A8C" data-value="#5E7A8C"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(94, 122, 140); border-radius: 4px;"></div></li></ul></div>');
+	$Selector = $('<div class="MuiPaper-root MuiMenu-paper MuiPopover-paper MuiPaper-elevation8 MuiPaper-rounded" style="opacity: 1; transform: none; min-width: 40px; transition: opacity 100ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, transform 67ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; top: 440px; left: 114px; transform-origin: 0px 0px 0px;" tabindex="-1"><ul class="MuiList-root MuiMenu-list MuiList-padding" role="listbox" tabindex="-1" style="display: flex; flex-wrap: wrap; width: 217px; flex-grow: 1; justify-content: center;"><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FFEF00" data-value="#FFEF00"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 239, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#A4A4A4" data-value="#A4A4A4"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(164, 164, 164); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#000000" data-value="#000000"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 0, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#BAF200" data-value="#BAF200"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(186, 242, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FFC900" data-value="#FFC900"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 201, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#7AD915" data-value="#7AD915"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(122, 217, 21); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#784D3E" data-value="#784D3E"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(120, 77, 62); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#F42410" data-value="#F42410"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(244, 36, 16); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#E834EC" data-value="#E834EC"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(232, 52, 236); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#A726BC" data-value="#A726BC"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(167, 38, 188); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#5726C2" data-value="#5726C2"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(87, 38, 194); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root Mui-selected MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button Mui-selected" tabindex="0" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#2D3FC7" aria-selected="true" data-value="#2D3FC7"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(45, 63, 199); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#0479FF" data-value="#0479FF"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(4, 121, 255); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00B2FF" data-value="#00B2FF"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 178, 255); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00DAE1" data-value="#00DAE1"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 218, 225); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#00A478" data-value="#00A478"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(0, 164, 120); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#4ABD32" data-value="#4ABD32"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(74, 189, 50); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FF9D00" data-value="#FF9D00"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 157, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#FF6200" data-value="#FF6200"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(255, 98, 0); border-radius: 4px;"></div></li><li class="MuiButtonBase-root MuiListItem-root MuiMenuItem-root MuiMenuItem-gutters MuiListItem-gutters MuiListItem-button" tabindex="-1" role="option" aria-disabled="false" style="padding-left: 8px; padding-right: 8px;" title="#5E7A8C" data-value="#5E7A8C"><div style="position: relative; height: 24px; width: 24px; background-color: rgb(94, 122, 140); border-radius: 4px;"></div></li></ul></div>');
 
-    $Selector.css('z-index', '10000').find('li').click(setColor);
-    //Background
-    $Background = $('<div>', {'aria-hidden':'true', 'style':'position: fixed; inset: 0px; background-color: transparent;'}).click(function(){toggleSelector(false);});
+	$Selector.css('z-index', '10000').find('li').click(setColor);
+	//Background
+	$Background = $('<div>', {'aria-hidden':'true', 'style':'position: fixed; inset: 0px; background-color: transparent;'}).click(function(){toggleSelector(false);});
 
-    //Add Selector & background to DOM
-    $Selector.add($Background).hide().appendTo('body');
+	//Add Selector & background to DOM
+	$Selector.add($Background).hide().appendTo('body');
 
-    //Extra style
-    $('body').append($('<style>').text('@keyframes rainbow { 0%, 100% {background-color: red;} 17% {background-color: orange;} 33% {background-color: yellow;} 50% {background-color: green;} 67% {background-color: blue;} 83% {background-color: purple;} }'));
+	//Extra style
+	$('body').append($('<style>').text('@keyframes rainbow { 0%, 100% {background-color: red;} 17% {background-color: orange;} 33% {background-color: yellow;} 50% {background-color: green;} 67% {background-color: blue;} 83% {background-color: purple;} }'));
 
 	//Button for mass update
-    $MassUpdate = $('<button>', {'type':'button', 'class':'ga-button ga-button-flat ga-toolbar-button', 'disabled':'disabled'})
-        .data('track-id', 'mass')
-        .click(function(){toggleSelector(true, $(this));})
-        .append($('<i>', {'class':'material-icons ibmid'}).text('color_lens'))
-        .append(' ')
-        .append($('<span>', {'class':'ibmid ga-toolbar-button-text'}).text('Change Color'));
+	$MassUpdate = $('<button>', {'type':'button', 'class':'ga-button ga-button-flat ga-toolbar-button', 'disabled':'disabled'})
+		.data('track-id', 'mass')
+		.click(function(){toggleSelector(true, $(this));})
+		.append($('<i>', {'class':'material-icons ibmid'}).text('color_lens'))
+		.append(' ')
+		.append($('<span>', {'class':'ibmid ga-toolbar-button-text'}).text('Change Color'));
 
 	$('#DatasummaryController .ga-toolbar .ga-toolbar-left .ga-button').eq(1).after($MassUpdate);
 
@@ -72,7 +72,7 @@ function wait(fIsFinished, fAction) {
 	console.log('waiting for page to load');
 	if(typeof oWaitTimer != "undefined") clearTimeout(oWaitTimer);
 	if(fIsFinished()) fAction();
-	else oWaitTimer = setTimeout(function(){wait(fIsFinished, fAction);}, 100);
+	else { oWaitTimer = setTimeout(function(){wait(fIsFinished, fAction);}, 100); }
 }
 
 function update(bWaited) {
@@ -93,57 +93,68 @@ function update(bWaited) {
 		var $Row = $(elem);
 		var sTrackId = $Row.find('.col1 a.ng-binding').attr('href').split('/')[3];
 
-        if(!asTracks[sTrackId].post) {
-            $.get({url:'https://www.gaiagps.com/api/objects/track/'+sTrackId+'/', id:sTrackId}).done(function(asTrack) {
-                asTracks[this.id].post = asTrack;
-                refreshRow($Row, this.id);
-            });
-        }
-        else refreshRow($Row, sTrackId);
+ 		setTrackInfo(sTrackId, function(oData){refreshRow(oData.row, oData.track.id);}, {row:$Row});
 	});
 }
 
+function setTrackInfo(sTrackId, fOnDone, oVars) {
+		oVars = oVars || {};
+		if(!asTracks[sTrackId].post) {
+			$.get({url:'https://www.gaiagps.com/api/objects/track/'+sTrackId+'/', id:sTrackId})
+				.done(function(asTrack) {
+					asTracks[this.id].post = asTrack;
+					oVars.track = asTracks[this.id];
+					fOnDone(oVars);
+				})
+				.fail(function(){
+					setTrackInfo(sTrackId, fOnDone, oVars);
+				});
+		}
+		else {
+			oVars.track = asTracks[sTrackId];
+			fOnDone(oVars);
+		}
+}
+
 function refreshRow($Row, sTrackId) {
+		//Color
+		var sColor = asTracks[sTrackId].post.features[0].properties.hexcolor;
+		if(!sColor) sColor = 'rgb(0,0,0)';
 
-    //Color
-    var sColor = asTracks[sTrackId].post.features[0].properties.hexcolor;
-    if(!sColor) sColor = 'rgb(0,0,0)';
+		//Add Color
+		if(!$Row.find('.ngCell.col0-1.colt0-1').length) {
+			//Move Col1
+			$Row.find('.colt1').width(iCol1Width - iColorColWidth);
+			$Row.find('.col1').width(iCol1Width - iColorColWidth).css('left', (iCol1Left + iColorColWidth)+'px');
 
-    //Add Color
-    if(!$Row.find('.ngCell.col0-1.colt0-1').length) {
-
-        //Move Col1
-        $Row.find('.colt1').width(iCol1Width - iColorColWidth);
-        $Row.find('.col1').width(iCol1Width - iColorColWidth).css('left', (iCol1Left + iColorColWidth)+'px');
-
-        $Row.find('.ngCell.col0.colt0').after(
-        $('<div>', {'class':'ngCell col0-1 colt0-1', 'style':'cursor: pointer; width:'+iColorColWidth+'px; left:'+iColorColLeft+'px;'})
-            .data('color', sColor)
-            .data('track-id', this.id)
-            .append($('<div>', {'class':'ngVerticalBar ngVerticalBarVisible', 'style':'height: '+iColorColHeight+'px;'}))
-            .append($('<div>')
-                .append($('<div>', {'style':'ngSelectionCell'})
-                    .append($('<div>', {'class':'track-color', 'style':'position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); height: 24px; width: 24px; background-color: '+sColor+'; border-radius: 4px;'}))
-                )
-            )
-            //Display Selector
-            .click(function(){
-                toggleSelector(null, $(this));
-            })
-        );
-    }
-    //Update Color
-    else {
-        $Row.find('.ngCell.col0-1.colt0-1')
-            .data('color', sColor)
-            .data('track-id', sTrackId)
-            .find('.track-color')
-            .css('background', sColor);
-    }
+			$Row.find('.ngCell.col0.colt0').after(
+			$('<div>', {'class':'ngCell col0-1 colt0-1', 'style':'cursor: pointer; width:'+iColorColWidth+'px; left:'+iColorColLeft+'px;'})
+				.data('color', sColor)
+				.data('track-id', sTrackId)
+				.append($('<div>', {'class':'ngVerticalBar ngVerticalBarVisible', 'style':'height: '+iColorColHeight+'px;'}))
+				.append($('<div>')
+					.append($('<div>', {'style':'ngSelectionCell'})
+						.append($('<div>', {'class':'track-color', 'style':'position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); height: 24px; width: 24px; background-color: '+sColor+'; border-radius: 4px;'}))
+					)
+				)
+				//Display Selector
+				.click(function(){
+					toggleSelector(null, $(this));
+				})
+			);
+		}
+		//Update Color
+		else {
+			$Row.find('.ngCell.col0-1.colt0-1')
+				.data('color', sColor)
+				.data('track-id', sTrackId)
+				.find('.track-color')
+				.css('background', sColor);
+		}
 }
 
 function toggleSelector(bShow, $Track){
-	bShow = bShow || !$Selector.is(':visible');
+	bShow = (bShow == null)?(!$Selector.is(':visible')):bShow;
 	$Selector.add($Background).toggle(bShow);
 	if(bShow) {
 		$Selector
@@ -158,54 +169,97 @@ function toggleSelector(bShow, $Track){
 	return bShow;
 }
 
+function getTrackDOm(sTrackId) {
+	var $Link = $('a[href="/datasummary/track/'+sTrackId+'/"]');
+	return ($Link.length == 0)?null:$Link.parents('.ngRow').find('.ngCell.col0-1');
+}
+
 function setColor(){
 	var sColor = $(this).attr('data-value');
 
-    //List of tracks to change (selected checkboxes or just the one)
-	var a$Tracks = [];
-	if($Selector.data('track').data('track-id') == 'mass') a$Tracks = $('.ngGrid .ngViewport .ngRow .ngCell.col0 .ngSelectionCheckbox:checked').parents('.ngRow').find('.ngCell.col0-1').toArray();
-	else a$Tracks.push($Selector.data('track'));
+		//List of tracks to change (selected checkboxes or just the one)
+	a$Tracks = [];
+	if($Selector.data('track').data('track-id') == 'mass') {
+		if($('[ng-show="selectAllFromAllPages"]').is(':visible')) {
+			for(i in asTracks) {
+				var $Row = getTrackDOm(asTracks[i].id);
+				if(!$Row) {
+					$Row = $('<div>')
+						.data('track-id', asTracks[i].id)
+						.append($('<div>', {'class':'track-color'}));
+				}
 
-	$.each(a$Tracks, function(iKey, oTrack){
-		var $Track = $(oTrack);
-		$Track.find('.track-color').css('animation', 'rainbow 1s infinite');
-		var sTrackId = $Track.data('track-id');
+				a$Tracks.push($Row);
+			}
+		}
+		else { a$Tracks = $('.ngGrid .ngViewport .ngRow .ngCell.col0 .ngSelectionCheckbox:checked').parents('.ngRow').find('.ngCell.col0-1').toArray(); }
+	}
+	else { a$Tracks.push($Selector.data('track')); }
 
-        asTracks[sTrackId].post.features[0].properties.color = sColor;
-        asTracks[sTrackId].post.features[0].properties.hexcolor = sColor;
+	console.log('nb of tracks to modify: '+a$Tracks.length);
 
-       	var asPost = {
-            type: asTracks[sTrackId].post.features[0].type,
-            properties: asTracks[sTrackId].post.features[0].properties,
-            geometry: asTracks[sTrackId].post.features[0].geometry,
-        };
+	setTrackColor(sColor, 0);
+}
 
-        asPost.properties.localId = sTrackId;
+function setTrackColor(sColor, iIndex) {
+	var $Track = $(a$Tracks[iIndex]);
 
-        $.ajax({
-            url: 'https://www.gaiagps.com/api/objects/track/'+sTrackId+'/',
-            type: 'PUT',
-            contentType: 'application/json',
-            data: JSON.stringify(asPost)
-        })
-        .done(function(asResult){
-            $.ajax({url:'https://www.gaiagps.com/api/objects/track/'+sTrackId+'/'}).done(function(asTrack){
-                asTracks[sTrackId].post = asTrack;
-                $Track.find('.track-color').css({'background': asTrack.features[0].properties.hexcolor, 'animation':'none'});
-                toggleSelector(false);
-            });
-        })
-        .fail(()=>{
-            $Track.find('.track-color').css({'animation':'none'});
-        });
-	});
+	//Ajax Loader
+	$Track.find('.track-color').css('animation', 'rainbow 1s infinite');
+
+	var sTrackId = $Track.data('track-id');
+
+	setTrackInfo(
+		sTrackId,
+		function(oData){
+			asTracks[oData.track.id].post.features[0].properties.color = oData.color;
+			asTracks[oData.track.id].post.features[0].properties.hexcolor = oData.color;
+
+			var asPost = {
+				type: asTracks[oData.track.id].post.features[0].type,
+				properties: asTracks[oData.track.id].post.features[0].properties,
+				geometry: asTracks[oData.track.id].post.features[0].geometry,
+			};
+			asPost.properties.localId = oData.track.id;
+
+			$.ajax({
+				url: 'https://www.gaiagps.com/api/objects/track/'+oData.track.id+'/',
+				type: 'PUT',
+				contentType: 'application/json',
+				data: JSON.stringify(asPost),
+				id: oData.track.id
+			})
+			.done(function(){
+				setTrackInfo(
+					this.id,
+					function(oData) {
+						iIndex++;
+						$('[ng-show="selectAllFromAllPages"]:visible').text(iIndex+'/'+a$Tracks.length);
+						var $Track = getTrackDOm(oData.track.id);
+						if($Track) {
+							$Track.find('.track-color').css({'background': oData.color, 'animation':'none'});
+							toggleSelector(false, $Track);
+						}
+						if(iIndex < a$Tracks.length) setTrackColor(oData.color, iIndex);
+					},
+					{color:oData.color, force_update:true}
+				);
+			})
+			.fail(()=>{
+				var $Track = getTrackDOm(oData.track.id);
+				if($Track) $Track.find('.track-color').css({'animation':'none'});
+				setTrackColor(oData.color, iIndex);
+			});
+		},
+		{color:sColor}
+	);
 }
 
 var iColorColWidth = 50, iColorColHeight = 59;
 
 //Tracks
 asTracks = {};
-$.ajax({url:'https://www.gaiagps.com/api/objects/track/?routepoints=false&show_archived=true&show_filed=true'}).done((asData) => {
-	for(var i in asData) asTracks[asData[i].id] = asData[i];
+$.ajax({url:'https://www.gaiagps.com/api/objects/track/?routepoints=false&show_archived=false&show_filed=true'}).done((asData) => {
+	for(var i in asData) { asTracks[asData[i].id] = asData[i]; }
 	wait(function(){return ($('.ngViewport .ngRow').length > 0);}, init);
 });
diff --git a/gaia/upload.js b/gaia/upload.js
index b1ab5ce..5cc52bc 100644
--- a/gaia/upload.js
+++ b/gaia/upload.js
@@ -591,11 +591,11 @@ class Gaia {
       	//Waypoints
       	for(var w in oGPX.waypoints) {
             oGPX.waypoints[w].filename = sFileName;
-            var sWaypointName = oGPX.waypoints[w].name;
+            /*var sWaypointName = oGPX.waypoints[w].name;
             if(sWaypointName.indexOf('Milestone - ') != -1 && sWaypointName.substr(-2) != '00') { //1 milestone every 100 miles
                 this.feedback('info', 'Ignoring milestone waypoint "'+sWaypointName+'"');
             }
-            else this.aoWaypoints.push(oGPX.waypoints[w]);
+            else */this.aoWaypoints.push(oGPX.waypoints[w]);
         }
 
       	//Tracks
@@ -648,11 +648,30 @@ class Gaia {
         let aoTrack =  this.aoTracks[iIndex];
         this.feedback('info', 'Uploading track "'+aoTrack.name+'"');
 
-        //Set color
+        //Set color: Convert Garmin Colors
         let sColor = '#4ABD32';
         switch(aoTrack.color) {
-            case 'DarkBlue':	sColor = '#2D3FC7';	break;
-            case 'Magenta':		sColor = '#B60DC3';	break;
+            case 'DarkBlue':	sColor = '#2D3FC7';	break; //Personal Color
+            case 'Magenta':		sColor = '#B60DC3';	break; //Personal Color
+
+            //Garmin Colors
+            case 'Black':		sColor = '#000000';	break;
+            case 'DarkRed':		sColor = '#F90553';	break;
+            case 'DarkGreen':	sColor = '#009B89';	break;
+            case 'DarkYellow':	sColor = '#DCEE0E';	break;
+            //case 'DarkBlue':	sColor = '#5E23CA';	break;
+            case 'DarkMagenta':	sColor = '#B60DC3';	break;
+            case 'DarkCyan':	sColor = '#00ACF8';	break;
+            case 'LightGray':	sColor = '#A4A4A4';	break;
+            case 'DarkGray':	sColor = '#577B8E';	break;
+            case 'Red':			sColor = '#F90553';	break;
+            case 'Green':		sColor = '#36C03B';	break;
+            case 'Yellow':		sColor = '#FFF011';	break;
+            case 'Blue':		sColor = '#2D3FC7';	break;
+            //case 'Magenta':	sColor = '#B60DC3';	break;
+            case 'Cyan':		sColor = '#00C3DD';	break;
+            case 'White':		sColor = '#FFFFFF';	break;
+            case 'Transparent':	sColor = '#784D3E';	break;
         }
 
         //Add track points