diff --git a/src/linecomps.tsx b/src/linecomps.tsx
index f2fe82d4..8df7e9de 100644
--- a/src/linecomps.tsx
+++ b/src/linecomps.tsx
@@ -527,13 +527,8 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
                     <div key="pin" title="Pin" className={cn("line-icon", {"active": line.pinned})} onClick={this.clickPin} style={{display: "none"}}>
                         <i className="fa-sharp fa-solid fa-thumbtack"/>
                     </div>
-                    <div key="bookmark" title="Bookmark" className={cn("line-icon", "line-bookmark", {"active": line.bookmarked})} onClick={this.clickBookmark}>
-                        <If condition={!line.bookmarked}>
-                            <i className="fa-sharp fa-regular fa-bookmark"/>
-                        </If>
-                        <If condition={line.bookmarked}>
-                            <i className="fa-sharp fa-solid fa-bookmark"/>
-                        </If>
+                    <div key="bookmark" title="Bookmark" className={cn("line-icon", "line-bookmark")} onClick={this.clickBookmark}>
+                        <i className="fa-sharp fa-regular fa-bookmark"/>
                     </div>
                 </div>
                 <If condition={rendererPlugin == null && !isNoneRenderer}>
diff --git a/src/model.ts b/src/model.ts
index 5ab1f12c..9d3f67f5 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -2102,16 +2102,18 @@ class BookmarksModel {
     tempDesc : OV<string> = mobx.observable.box("", {name: "bookmarkEdit-tempDesc"});
     tempCmd : OV<string> = mobx.observable.box("", {name: "bookmarkEdit-tempCmd"});
 
-    showBookmarksView(bmArr : BookmarkType[]) : void {
+    showBookmarksView(bmArr : BookmarkType[], selectedBookmarkId : string) : void {
         bmArr = bmArr ?? [];
         mobx.action(() => {
             this.reset();
             GlobalModel.activeMainView.set("bookmarks");
             this.bookmarks.replace(bmArr);
-            if (bmArr.length > 0) {
+            if (selectedBookmarkId != null) {
+                this.selectBookmark(selectedBookmarkId);
+            }
+            if (this.activeBookmark.get() == null && bmArr.length > 0) {
                 this.activeBookmark.set(bmArr[0].bookmarkid);
             }
-            
         })();
     }
 
@@ -2788,7 +2790,7 @@ class Model {
         }
         if ("mainview" in update) {
             if (update.mainview == "bookmarks") {
-                this.bookmarksModel.showBookmarksView(update.bookmarks);
+                this.bookmarksModel.showBookmarksView(update.bookmarks, update.selectedbookmark);
             }
             else if (update.mainview == "session") {
                 this.activeMainView.set("session");
diff --git a/src/settings.tsx b/src/settings.tsx
index 4fa45d5d..4a375340 100644
--- a/src/settings.tsx
+++ b/src/settings.tsx
@@ -107,6 +107,14 @@ class ScreenSettingsModal extends React.Component<{sessionId : string, screenId
                         </div>
                     </header>
                     <div className="inner-content">
+                        <div className="settings-field">
+                            <div className="settings-label">
+                                Screen Id
+                            </div>
+                            <div className="settings-input">
+                                {screen.screenId}
+                            </div>
+                        </div>
                         <div className="settings-field">
                             <div className="settings-label">
                                 Name
diff --git a/src/sh2.less b/src/sh2.less
index c79aae9f..6b7963c8 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -1244,9 +1244,9 @@ body::-webkit-scrollbar {
             padding: 3px;
             font-size: 1.5rem;
         }
-        
-        .line-icon.line-bookmark.active {
-            cursor: auto;
+
+        .line-bookmark:hover {
+            color: white;
         }
         
         .line-icon + .line-icon {
diff --git a/src/types.ts b/src/types.ts
index 68b2b22b..25944565 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as mobx from "mobx";
 
-type ShareModeType = "local" | "private" | "view" | "shared";
+type ShareModeType = "local" | "web";
 type FocusTypeStrs = "input"|"cmd"|"cmd-fg";
 type HistoryTypeStrs = "global" | "session" | "screen";
 
@@ -37,7 +37,6 @@ type LineType = {
     contentheight? : number,
     star? : number,
     archived? : boolean,
-    bookmarked? : boolean,
     pinned? : boolean,
     ephemeral? : boolean,
     remove? : boolean,
@@ -48,11 +47,18 @@ type ScreenOptsType = {
     pterm? : string,
 }
 
+type WebShareOpts = {
+    sharename : string,
+    viewkey : string,
+};
+
 type ScreenDataType = {
     sessionid : string,
     screenid : string,
     screenidx : number,
     name : string,
+    sharemode : ShareModeType,
+    webshareopts? : WebShareOpts,
     archived? : boolean,
     screenopts : ScreenOptsType,
     curremote : RemotePtrType,
@@ -262,6 +268,7 @@ type ModelUpdateType = {
     connect? : boolean,
     mainview? : string,
     bookmarks? : BookmarkType[],
+    selectedbookmark? : string,
     clientdata? : ClientDataType,
     historyviewdata? : HistoryViewDataType,
 };