diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss
index 6fc318af..f217458c 100644
--- a/src/css/states/main_menu.scss
+++ b/src/css/states/main_menu.scss
@@ -381,7 +381,10 @@
         justify-content: center;
         flex-direction: column;
         background: $colorBlueBright;
-        grid-row: 1 / 2;
+        height: 100%;
+        grid-row: 1 / 4;
+        width: 100%;
+        box-sizing: border-box;
         position: relative;
         @include S(padding, 20px);
         @include S(border-radius, $globalBorderRadius);
@@ -529,6 +532,7 @@
             width: 100%;
             display: flex;
             flex-direction: column;
+            @include S(border-radius, $globalBorderRadius);
             pointer-events: all;
 
             :last-child {
@@ -1009,15 +1013,16 @@
             > a,
             .sidelinks > a {
                 background-color: rgba($darkModeControlsBackground, 0.3);
-                color: #eee;
+                color: #333538;
 
                 &:hover {
-                    background-color: rgba(darken($darkModeControlsBackground, 5), 0.5);
+                    background-color: rgba(darken($darkModeControlsBackground, 5), 0.4);
                 }
             }
 
             .thirdpartyLogo.githubLogo {
-                filter: invert(1);
+                // filter: invert(1);
+                opacity: 0.7;
             }
         }
     }
diff --git a/src/js/changelog.js b/src/js/changelog.js
index 34c8feb4..4e3be61e 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -6,6 +6,7 @@ export const CHANGELOG = [
             "Reworked the tutorial to be simpler and more interactive",
             "General polishing",
             "Fix being unable to delete savegame when the savegame file was deleted externally",
+            "New sfx when unlocking upgrades",
             "Updated translations",
         ],
     },
diff --git a/src/js/game/hud/parts/interactive_tutorial.js b/src/js/game/hud/parts/interactive_tutorial.js
index ca83bd87..7548ce43 100644
--- a/src/js/game/hud/parts/interactive_tutorial.js
+++ b/src/js/game/hud/parts/interactive_tutorial.js
@@ -16,9 +16,9 @@ import { Vector } from "../../../core/vector";
 import { MetaMinerBuilding } from "../../buildings/miner";
 import { gMetaBuildingRegistry } from "../../../core/global_registries";
 import { MetaBeltBuilding } from "../../buildings/belt";
-import { BeltComponent } from "../../components/belt";
 import { MetaTrashBuilding } from "../../buildings/trash";
 import { SOUNDS } from "../../../platform/sound";
+import { THEME } from "../../theme";
 
 // @todo: Make dictionary
 const tutorialsByLevel = [
@@ -174,9 +174,15 @@ export class HUDInteractiveTutorial extends BaseHUDPart {
         this.elementGif = makeDiv(this.element, null, ["helperGif"]);
     }
 
+    cleanup() {
+        document.documentElement.setAttribute("data-tutorial-step", "");
+    }
+
     initialize() {
         this.domAttach = new DynamicDomAttach(this.root, this.element, { trackHover: true });
         this.currentHintId = new TrackedState(this.onHintChanged, this);
+
+        document.documentElement.setAttribute("data-tutorial-step", "");
     }
 
     onHintChanged(hintId) {
@@ -376,7 +382,7 @@ export class HUDInteractiveTutorial extends BaseHUDPart {
                         parameters.context.translate(-worldPos.x, -worldPos.y);
                     }
 
-                    parameters.context.fillStyle = "rgb(30, 40, 60)";
+                    parameters.context.fillStyle = THEME.map.tutorialDragText;
                     parameters.context.font = "15px GameFont";
 
                     if (staticComp.rotation === 0) {
diff --git a/src/js/game/hud/parts/waypoints.js b/src/js/game/hud/parts/waypoints.js
index f973a925..5aac95dc 100644
--- a/src/js/game/hud/parts/waypoints.js
+++ b/src/js/game/hud/parts/waypoints.js
@@ -607,7 +607,8 @@ export class HUDWaypoints extends BaseHUDPart {
             // Render the background rectangle
             parameters.context.globalAlpha = this.currentMarkerOpacity * (isSelected ? 1 : 0.7);
             parameters.context.fillStyle = "rgba(255, 255, 255, 0.7)";
-            parameters.context.fillRect(bounds.x, bounds.y, bounds.w, bounds.h);
+            parameters.context.beginRoundedRect(bounds.x, bounds.y, bounds.w, bounds.h, 6);
+            parameters.context.fill();
 
             // Render the text
             if (waypointData.item) {
diff --git a/src/js/game/themes/dark.json b/src/js/game/themes/dark.json
index a46f638a..8650d56f 100644
--- a/src/js/game/themes/dark.json
+++ b/src/js/game/themes/dark.json
@@ -12,6 +12,8 @@
 
         "chunkBorders": "rgba(127, 190, 255, 0.04)",
 
+        "tutorialDragText": "rgb(74, 237, 134)",
+
         "directionLock": {
             "regular": {
                 "color": "rgb(74, 237, 134)",
diff --git a/src/js/game/themes/light.json b/src/js/game/themes/light.json
index 75faa5ad..cd7677e2 100644
--- a/src/js/game/themes/light.json
+++ b/src/js/game/themes/light.json
@@ -13,6 +13,8 @@
 
         "chunkBorders": "rgba(0, 30, 50, 0.03)",
 
+        "tutorialDragText": "rgb(30, 40, 60)",
+
         "directionLock": {
             "regular": {
                 "color": "rgb(74, 237, 134)",
diff --git a/src/js/platform/api.js b/src/js/platform/api.js
index 4e7a82f9..95398ca8 100644
--- a/src/js/platform/api.js
+++ b/src/js/platform/api.js
@@ -112,7 +112,10 @@ export class ClientAPI {
             return Promise.resolve({ token });
         }
 
-        return ipcRenderer.invoke("steam:get-ticket").then(
+        return Promise.race([
+            ipcRenderer.invoke("steam:get-ticket"),
+            new Promise((resolve, reject) => setTimeout(() => reject("timeout"), 15000)),
+        ]).then(
             ticket => {
                 logger.log("Got auth ticket:", ticket);
                 return this._request("/v1/public/login", {