diff --git a/css/dark.css b/css/dark.css
index 6277790..689a4a6 100644
--- a/css/dark.css
+++ b/css/dark.css
@@ -207,7 +207,7 @@ th {
 }
 
 .machineContainer {
-	background-color: var(--od-row-background);
+	background-color: var(--gray190);
 	padding: 4px;
 	margin: 0;
 	width: 100%;
@@ -220,7 +220,7 @@ th {
 }
 
 .highlighted {
-	color: var(--highlight-color);
+	color: var(--gray40);
 	background-color: var(--themePrimary);
 	padding-left: 2px;
 	padding-right: 2px;
@@ -381,8 +381,6 @@ label {
 	stroke: var(--themePrimary);
 	padding: 2px 4px;
 	justify-content: flex-start;
-	border-top: 1px solid var(--gray190);
-	overflow: hidden;
 }
 
 .toolbar button {
@@ -423,12 +421,13 @@ label {
 }
 
 .toolbar a:hover {
-	background-color: var(--tab-hover);
+	background-color: var(--gray160);
 	text-decoration: none !important;
 	transition-property: all;
 	transition-duration: 0.5s;
 	transition-timing-function: cubic-bezier(0.14, 0.71, 0.38, 1);
 	transition-delay: 0s;
+	border-radius: 2px;
 }
 
 svg {
@@ -437,6 +436,12 @@ svg {
 	stroke-width: 0.1;
 }
 
+th svg {
+	margin-top: 4px;
+	fill: var(--gray10) !important;
+	stroke: var(--gray10) !important;
+}
+
 /* tabs */
 
 .tabHolder {
@@ -564,7 +569,7 @@ svg {
 }
 
 .highlight {
-	color: var(--highlight-color);
+	color: var(--gray40);
 }
 
 .active svg {
diff --git a/css/light.css b/css/light.css
index 8db2c20..e1852a7 100644
--- a/css/light.css
+++ b/css/light.css
@@ -207,7 +207,7 @@ th {
 }
 
 .machineContainer {
-	background-color: var(--od-row-background);
+	background-color: var(--grey30);
 	padding: 4px;
 	margin: 0;
 	width: 100%;
@@ -380,7 +380,6 @@ label {
 	stroke: var(--themePrimary);
 	padding: 2px 4px;
 	justify-content: flex-start;
-	overflow: hidden;
 }
 
 .toolbar button {
@@ -421,12 +420,13 @@ label {
 }
 
 .toolbar a:hover {
-	background-color: var(--tab-hover);
+	background-color: var(--gray20);
 	text-decoration: none !important;
 	transition-property: all;
 	transition-duration: 0.5s;
 	transition-timing-function: cubic-bezier(0.14, 0.71, 0.38, 1);
 	transition-delay: 0s;
+	border-radius: 2px;
 }
 
 svg {
@@ -435,6 +435,12 @@ svg {
 	stroke-width: 0.1;
 }
 
+th svg {
+	margin-top: 4px;
+	fill: var(--gray10) !important;
+	stroke: var(--gray10) !important;
+}
+
 /* tabs */
 
 .tabHolder {
diff --git a/package.json b/package.json
index d8585c1..f9b973d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tmxeditor",
     "productName": "TMXEditor",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "description": "TMX Editor",
     "main": "js/app.js",
     "scripts": {
diff --git a/src/com/maxprograms/tmxserver/Constants.java b/src/com/maxprograms/tmxserver/Constants.java
index 5e0e419..eca3d10 100644
--- a/src/com/maxprograms/tmxserver/Constants.java
+++ b/src/com/maxprograms/tmxserver/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 	}
 
 	public static final String APPNAME = "TMXEditor";
-	public static final String VERSION = "2.5.0";
-	public static final String BUILD = "20210607_1015";
+	public static final String VERSION = "2.5.1";
+	public static final String BUILD = "20210615_0900";
 
 	public static final String REASON = "reason";
 	public static final String STATUS = "status";
diff --git a/ts/app.ts b/ts/app.ts
index 0432832..f40aa04 100644
--- a/ts/app.ts
+++ b/ts/app.ts
@@ -1294,6 +1294,9 @@ class App {
     }
 
     static loadSegments(): void {
+        if (App.currentFile === '') {
+            return;
+        }
         var json: any = {
             command: 'getSegments'
         }