diff --git a/src/main.tsx b/src/main.tsx
index 65f8fbdf..9f70d708 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1278,6 +1278,28 @@ class ScreenTabs extends React.Component<{session : Session}, {}> {
         })();
     }
 
+    renderTab(screen : Screen, activeScreenId : string, index : number) : any {
+        let tabIndex = null;
+        if (index+1 <= 9) {
+            tabIndex = (<div className="tab-index">{renderCmdText(String(index+1))}</div>);
+        }
+        let settings = (<div onClick={(e) => this.openScreenSettings(e, screen)} title="Settings" className="tab-gear"><i className="fa-sharp fa-solid fa-gear"/></div>);
+        let archived = (screen.archived.get() ? (<i title="archived" className="fa-sharp fa-solid fa-box-archive"/>) : null);
+
+        let webShared = (screen.isWebShared() ? (<i title="shared to web" className="fa-sharp fa-solid fa-share-nodes web-share-icon"/>) : null);
+        return (
+            <div key={screen.screenId} data-screenid={screen.screenId} className={cn("screen-tab", {"is-active": activeScreenId == screen.screenId, "is-archived": screen.archived.get()}, "color-" + screen.getTabColor())} onClick={() => this.handleSwitchScreen(screen.screenId)} onContextMenu={(event) => this.openScreenSettings(event, screen)}>
+                <div className="tab-name">
+                    {archived}
+                    {webShared}
+                    {screen.name.get()}
+                </div>
+                {tabIndex}
+                {settings}
+            </div>
+        );
+    }
+
     render() {
         let {session} = this.props;
         if (session == null) {
@@ -1308,18 +1330,7 @@ class ScreenTabs extends React.Component<{session : Session}, {}> {
             <div className="screen-tabs-container">
                 <div className={cn("screen-tabs", {"scrolling": this.scrolling.get()})} ref={this.tabsRef} onScroll={this.handleScroll}>
                     <For each="screen" index="index" of={showingScreens}>
-                        <div key={screen.screenId} data-screenid={screen.screenId} className={cn("screen-tab", {"is-active": activeScreenId == screen.screenId, "is-archived": screen.archived.get()}, "color-" + screen.getTabColor())} onClick={() => this.handleSwitchScreen(screen.screenId)} onContextMenu={(event) => this.openScreenSettings(event, screen)}>
-                            <If condition={screen.archived.get()}><i title="archived" className="fa-sharp fa-solid fa-box-archive"/></If>
-                            <If condition={screen.isWebShared()}><i title="archived" className="fa-sharp fa-solid fa-share-nodes web-share-icon"/></If>
-                            {screen.name.get()}
-                            <If condition={index+1 <= 9}>
-                                <div className="tab-index">{renderCmdText(String(index+1))}</div>
-                                <div onClick={(e) => this.openScreenSettings(e, screen)} title="Settings" className="tab-gear"><i className="fa-sharp fa-solid fa-gear"/></div>
-                            </If>
-                            <If condition={index+1 > 9}>
-                                <div onClick={(e) => this.openScreenSettings(e, screen)} title="Settings" className="tab-gear"><i className="fa-sharp fa-solid fa-gear"/></div>
-                            </If>
-                        </div>
+                        {this.renderTab(screen, activeScreenId, index)}
                     </For>
                     <div key="new-screen" className="screen-tab new-screen" onClick={this.handleNewScreen}>
                         <i className="fa-sharp fa-solid fa-plus"/>
diff --git a/src/model.ts b/src/model.ts
index 76f06829..60fdb0b3 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -1479,14 +1479,14 @@ class InputModel {
     setCurLine(val : string) : void {
         let hidx = this.historyIndex.get();
         mobx.action(() => {
-            if (val == "\" ") {
-                this.setInputMode("comment");
-                val = "";
-            }
-            if (val == "//") {
-                this.setInputMode("global");
-                val = "";
-            }
+            // if (val == "\" ") {
+            //     this.setInputMode("comment");
+            //     val = "";
+            // }
+            // if (val == "//") {
+            //     this.setInputMode("global");
+            //     val = "";
+            // }
             if (this.modHistory.length <= hidx) {
                 this.modHistory.length = hidx + 1;
             }
diff --git a/src/sh2.less b/src/sh2.less
index ce458f73..5dab3d7f 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -17,10 +17,10 @@
 
 @tab-black: rgb(0, 0, 0);
 @tab-red: rgb(205, 49, 49);
-@tab-green: rgb(0, 177, 10);   /* #00B10A */
+@tab-green: rgb(0, 128, 0);
 @tab-orange: rgb(255, 199, 6);
 @tab-yellow: rgb(229, 229, 16);
-@tab-blue: rgb(36, 114, 200);
+@tab-blue: rgb(0, 71, 171);
 @tab-magenta: rgb(188, 63, 188);
 @tab-cyan: rgb(17, 168, 205);
 @tab-white: rgb(249, 249, 249);
@@ -32,7 +32,7 @@
 
 @soft-blue: #729fcf;
 
-@active-menu-color: #485fc7;
+@active-menu-color: rgb(0, 71, 171);
 
 :root {
     --fa-style-family: "Font Awesome 6 Sharp";
@@ -904,13 +904,20 @@ body::-webkit-scrollbar {
         justify-content: center;
         align-items: center;
         font-size: 12px;
-        font-weight: bold;
-        padding-left: 10px;
-        padding-right: 10px;
+        font-weight: 500;
+        padding-left: 0;
+        padding-right: 0;
         cursor: pointer;
         position: relative;
         border-right: 1px solid #777;
-        opacity: 0.8;
+
+        .tab-name {
+            flex-grow: 1;
+            flex-basis: 50px;
+            padding-left: 2px;
+            padding-right: 2px;
+            text-align: center;
+        }
 
         &.is-active {
             box-shadow: 0 3px 0 #fff inset;
@@ -924,22 +931,44 @@ body::-webkit-scrollbar {
             }
         }
 
-        .tab-index, .tab-gear {
+        .tab-index {
+            font-size: 11px;
             position: absolute;
-            right: 5px;
+            right: 2px;
+            top: 4px;
+            bottom: 0;
             font-weight: normal;
             display: none;
+            padding-left: 4px;
+            padding-top: 6px;
+            background-color: inherit;
         }
 
-        &:hover .tab-gear {
-            display: block;
+        .tab-gear {
+            position: absolute;
+            right: 5px;
+            top: 4px;
+            bottom: 0;
+            font-weight: normal;
+            display: none;
+            padding-left: 5px;
+            padding-top: 5px;
+            background-color: inherit;
+        }
 
-            &:hover {
-                i {
+        &:hover {
+            .tab-gear {
+                display: block;
+
+                &:hover {
                     display: block;
-                    position: relative;
-                    top: 2px;
-                    font-size: 15px;
+                    top: 4px;
+                    padding-top: 4px;
+                    right: 3px;
+                    padding-left: 4px;
+                    i {
+                        font-size: 15px;
+                    }
                 }
             }
         }
@@ -1170,6 +1199,7 @@ body::-webkit-scrollbar {
         &.is-active {
             color: #ddd;
             font-weight: bold;
+            background-color: @active-menu-color;
 
             .session-num {
                 color: #aaa;
@@ -2420,13 +2450,13 @@ input[type=checkbox] {
 
 #main .screen-tabs .screen-tab {
     &.color-green {
-        color: @tab-black-text;
-        background-color: desaturate(@tab-green, 30%);
+        color: @tab-white-text;
+        background-color: desaturate(@tab-green, 50%);
         &:hover {
             background-color: @tab-green;
         }
         &.is-active {
-            color: black;
+            color: white;
             background-color: @tab-green;
         }
     }
@@ -2444,20 +2474,20 @@ input[type=checkbox] {
     }
 
     &.color-red {
-        color: @tab-black-text;
-        background-color: desaturate(@tab-red, 20%);
+        color: @tab-white-text;
+        background-color: desaturate(@tab-red, 40%);
         &:hover {
             background-color: @tab-red;
         }
         &.is-active {
-            color: black;
+            color: white;
             background-color: @tab-red;
         }
     }
 
     &.color-yellow {
         color: @tab-black-text;
-        background-color: desaturate(@tab-yellow, 30%);
+        background-color: desaturate(@tab-yellow, 40%);
         &:hover {
             background-color: @tab-yellow;
         }
@@ -2471,25 +2501,25 @@ input[type=checkbox] {
     }
 
     &.color-blue {
-        color: @tab-black-text;
-        background-color: desaturate(@tab-blue, 20%);
+        color: @tab-white-text;
+        background-color: desaturate(@tab-blue, 50%);
         &:hover {
             background-color: @tab-blue;
         }
         &.is-active {
-            color: black;
+            color: white;
             background-color: @tab-blue;
         }
     }
 
     &.color-magenta {
-        color: @tab-black-text;
+        color: @tab-white-text;
         background-color: desaturate(@tab-magenta, 20%);
         &:hover {
             background-color: @tab-magenta;
         }
         &.is-active {
-            color: black;
+            color: white;
             background-color: @tab-magenta;
         }
     }