diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 068271bbe9..e40e0ca4ff 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -3,203 +3,158 @@
 	{{$notificationUnreadCount = call .NotificationUnreadCount}}
 {{end}}
 
-<nav id="navbar" aria-label="{{ctx.Locale.Tr "aria.navbar"}}">
-	<div class="navbar-left ui secondary menu">
-		<!-- the logo -->
-		<a class="item" id="navbar-logo" href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}">
-			<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
-		</a>
-
-		<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
-		<div class="ui secondary menu item navbar-mobile-right only-mobile">
-			{{if .IsSigned}}
-			<a id="mobile-notifications-icon" class="item tw-w-auto tw-p-2" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
-				<div class="tw-relative">
-					{{svg "octicon-bell"}}
-					<span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
-				</div>
+<nav id="custom-navbar-container" aria-label="{{ctx.Locale.Tr "aria.navbar"}}">
+<div class="custom-navbar">
+	<menu class="mobile-links">
+		<li class="dropdown">
+			<a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
+				<i class="fa-solid fa-bars"></i>
 			</a>
-			{{end}}
-			<button class="item tw-w-auto ui icon mini button tw-p-2 tw-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">{{svg "octicon-three-bars"}}</button>
-		</div>
-
-		<!-- navbar links non-mobile -->
-		{{if and .IsSigned .MustChangePassword}}
-			{{/* No links */}}
-		{{else if .IsSigned}}
-			{{if not .UnitIssuesGlobalDisabled}}
-				<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{ctx.Locale.Tr "issues"}}</a>
-			{{end}}
-			{{if not .UnitPullsGlobalDisabled}}
-				<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{ctx.Locale.Tr "pull_requests"}}</a>
-			{{end}}
-			{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
-				{{if .ShowMilestonesDashboardPage}}
-					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a>
-				{{end}}
-			{{end}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a>
-		{{else if .IsLandingPageOrganizations}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore"}}</a>
-		{{else}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a>
-		{{end}}
-
-		{{template "custom/extra_links" .}}
-
-		{{if not .IsSigned}}
-			<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/">{{ctx.Locale.Tr "help"}}</a>
-		{{end}}
-	</div>
-
-	<!-- the full dropdown menus -->
-	<div class="navbar-right ui secondary menu">
-		{{if and .IsSigned .MustChangePassword}}
-			<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
-				<span class="text tw-flex tw-items-center">
-					{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
-					<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
-					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
-				</span>
-				<div class="menu user-menu">
-					<div class="ui header">
-						{{ctx.Locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
-					</div>
-
-					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
-						{{svg "octicon-sign-out"}}
-						{{ctx.Locale.Tr "sign_out"}}
-					</a>
-				</div><!-- end content avatar menu -->
-			</div><!-- end dropdown avatar menu -->
-		{{else if .IsSigned}}
-			{{if EnableTimetracking}}
-			<a class="active-stopwatch-trigger item tw-mx-0{{if not .ActiveStopwatch}} tw-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}">
-				<div class="tw-relative">
-					{{svg "octicon-stopwatch"}}
-					<span class="header-stopwatch-dot"></span>
-				</div>
-				<span class="only-mobile tw-ml-2">{{ctx.Locale.Tr "active_stopwatch"}}</span>
+			<ul class="dropdown-menu">
+				<li>
+					<a href="https://incremental.social/all">Threads</a>
+				</li>
+				<li>
+					<a href="https://incremental.social/microblog">Microblog</a>
+				</li>
+				<li>
+					<a href="https://incremental.social/people">People</a>
+				</li>
+				<li>
+					<a href="https://chat.incremental.social">Chat</a>
+				</li>
+				<li class="active">
+					<a href="https://code.incremental.social">Code</a>
+				</li>
+			</ul>
+		</li>
+	</menu>
+			
+	<a id="custom-navbar-logo" href="https://incremental.social" aria-label="{{ctx.Locale.Tr "home"}}">
+		<img id="logo" src="https://incremental.social/mbin_logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
+	</a>
+		
+	<menu class="desktop-links">
+		<li>
+			<a href="https://incremental.social/all">Threads</a>
+		</li>
+		<li>
+			<a href="https://incremental.social/microblog">Microblog</a>
+		</li>
+		<li>
+			<a href="https://incremental.social/people">People</a>
+		</li>
+		<li>
+			<a href="https://chat.incremental.social">Chat</a>
+		</li>
+		<li class="active">
+			<a href="https://code.incremental.social">Code</a>
+		</li>
+	</menu>
+				
+	<div class="flex-spacer"></div>
+		
+	<menu>
+		<li class="dropdown">
+			<a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
+				<i class="fa-solid fa-magnifying-glass"></i>
 			</a>
-			<div class="active-stopwatch-popup item tippy-target tw-p-2">
-				<div class="tw-flex tw-items-center">
-					<a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}">
-						{{svg "octicon-issue-opened" 16 "tw-mr-2"}}
-						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
-						<span class="ui primary label stopwatch-time tw-my-0 tw-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
-							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
-						</span>
-					</a>
-					<form class="stopwatch-commit" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle">
-						{{.CsrfTokenHtml}}
-						<button
-							type="submit"
-							class="ui button mini compact basic icon"
-							data-tooltip-content="{{ctx.Locale.Tr "repo.issues.stop_tracking"}}"
-						>{{svg "octicon-square-fill"}}</button>
-					</form>
-					<form class="stopwatch-cancel" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
-						{{.CsrfTokenHtml}}
-						<button
-							type="submit"
-							class="ui button mini compact basic icon"
-							data-tooltip-content="{{ctx.Locale.Tr "repo.issues.cancel_tracking"}}"
-						>{{svg "octicon-trash"}}</button>
-					</form>
-				</div>
-			</div>
-			{{end}}
-
-			<a class="item not-mobile tw-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
-				<div class="tw-relative">
-					{{svg "octicon-bell"}}
-					<span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
-				</div>
+			<ul class="dropdown-menu">
+{{if .IsSigned}}
+				<li>
+					<a href="{{AppSubUrl}}/issues">{{ctx.Locale.Tr "issues"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/pulls">{{ctx.Locale.Tr "pull_requests"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a>
+				</li>
+{{end}}
+				<li>
+					<a href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore.repos"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/explore/users">{{ctx.Locale.Tr "explore.users"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore.organizations"}}</a>
+				</li>
+			</ul>
+		</li>
+{{if .IsSigned}}
+		<li class="dropdown">
+			<a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
+				<i class="fa-solid fa-plus"></i>
 			</a>
-
-			<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
-				<span class="text">
-					{{svg "octicon-plus"}}
-					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
-					<span class="only-mobile">{{ctx.Locale.Tr "create_new"}}</span>
-				</span>
-				<div class="menu">
-					<a class="item" href="{{AppSubUrl}}/repo/create">
-						{{svg "octicon-plus"}} {{ctx.Locale.Tr "new_repo"}}
-					</a>
-					{{if not .DisableMigrations}}
-						<a class="item" href="{{AppSubUrl}}/repo/migrate">
-							{{svg "octicon-repo-push"}} {{ctx.Locale.Tr "new_migrate"}}
-						</a>
-					{{end}}
-					{{if .SignedUser.CanCreateOrganization}}
-					<a class="item" href="{{AppSubUrl}}/org/create">
-						{{svg "octicon-organization"}} {{ctx.Locale.Tr "new_org"}}
-					</a>
-					{{end}}
-				</div><!-- end content create new menu -->
-			</div><!-- end dropdown menu create new -->
-
-			<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
-				<span class="text tw-flex tw-items-center">
-					{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
-					<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
-					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
-				</span>
-				<div class="menu user-menu">
-					<div class="ui header">
-						{{ctx.Locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
-					</div>
-
-					<div class="divider"></div>
-					<a class="item" href="{{.SignedUser.HomeLink}}">
-						{{svg "octicon-person"}}
+			<ul class="dropdown-menu">
+				<li>
+					<a href="{{AppSubUrl}}/repo/create">{{ctx.Locale.Tr "new_repo"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/repo/migrate">{{ctx.Locale.Tr "new_migrate"}}</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/org/create">{{ctx.Locale.Tr "new_org"}}</a>
+				</li>
+			</ul>
+		</li>
+		<li>
+			<a href="{{AppSubUrl}}/notifications" aria-label="{{ctx.Locale.Tr "notifications"}}">
+				<i class="fa-solid fa-bell"></i>
+						<span class="notification-badge{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
+			</a>
+		</li>
+		<li class="dropdown">
+			<a class="user" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
+				{{ctx.AvatarUtils.Avatar .SignedUser 50 "tw-mr-1"}}
+				<span class="user-name">{{.SignedUser.Name}}</span>
+			</a>
+			<ul class="dropdown-menu">
+				<li>
+					<a href="https://incremental.social/u/{{.SignedUser.Name}}">
 						{{ctx.Locale.Tr "your_profile"}}
 					</a>
-					{{if not .DisableStars}}
-						<a class="item" href="{{.SignedUser.HomeLink}}?tab=stars">
-							{{svg "octicon-star"}}
-							{{ctx.Locale.Tr "your_starred"}}
-						</a>
-					{{end}}
-					<a class="item" href="{{AppSubUrl}}/notifications/subscriptions">
-						{{svg "octicon-bell"}}
+				</li>
+				<li>
+					<a href="{{.SignedUser.HomeLink}}">
+						Code Profile
+					</a>
+				</li>
+				<li>
+					<a href="{{.SignedUser.HomeLink}}?tab=stars">
+						{{ctx.Locale.Tr "your_starred"}}
+					</a>
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/notifications/subscriptions">
 						{{ctx.Locale.Tr "notification.subscriptions"}}
 					</a>
-					<a class="{{if .PageIsUserSettings}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
-						{{svg "octicon-tools"}}
+				</li>
+				<li>
+					<a href="{{AppSubUrl}}/user/settings">
 						{{ctx.Locale.Tr "your_settings"}}
 					</a>
-					<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/">
-						{{svg "octicon-question"}}
-						{{ctx.Locale.Tr "help"}}
+				</li>
+{{if .IsAdmin}}
+				<li>
+					<a href="{{AppSubUrl}}/admin">
+						{{ctx.Locale.Tr "admin_panel"}}
 					</a>
-					{{if .IsAdmin}}
-						<div class="divider"></div>
-
-						<a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
-							{{svg "octicon-server"}}
-							{{ctx.Locale.Tr "admin_panel"}}
-						</a>
-					{{end}}
-
-					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
-						{{svg "octicon-sign-out"}}
-						{{ctx.Locale.Tr "sign_out"}}
-					</a>
-				</div><!-- end content avatar menu -->
-			</div><!-- end dropdown avatar menu -->
-		{{else}}
-			{{if .ShowRegistrationButton}}
-				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-					{{svg "octicon-person"}} {{ctx.Locale.Tr "register"}}
-				</a>
-			{{end}}
-			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
-				{{svg "octicon-sign-in"}} {{ctx.Locale.Tr "sign_in"}}
+				</li>
+{{end}}
+				<li>
+					<a href="{{AppSubUrl}}/user/logout">{{ctx.Locale.Tr "sign_out"}}</a>
+				</li>
+			</ul>
+		</li>
+{{else}}
+		<li>
+			<a rel="nofollow" href="{{AppSubUrl}}/user/oauth2/Incremental%20Social?redirect_to={{.CurrentURL}}">
+				{{ctx.Locale.Tr "sign_in"}}
 			</a>
-		{{end}}
-	</div><!-- end full right menu -->
+		</li>
+{{end}}
+	</menu>
+</div>
 </nav>
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 9872096fbc..12cb01e0ef 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -1,5 +1,5 @@
 {{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}}
-{{template "base/alert" .}}
+	{{template "base/alert" .}}
 {{end}}
 <h4 class="ui top attached header center">
 	{{if .LinkAccountMode}}
@@ -9,62 +9,22 @@
 	{{end}}
 </h4>
 <div class="ui attached segment">
-	<form class="ui form tw-max-w-2xl tw-m-auto" action="{{.SignInLink}}" method="post">
-	{{.CsrfTokenHtml}}
-	<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-		<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-	</div>
-	{{if or (not .DisablePassword) .LinkAccountMode}}
-	<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-		<label for="password">{{ctx.Locale.Tr "password"}}</label>
-		<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
-	</div>
-	{{end}}
-	{{if not .LinkAccountMode}}
-	<div class="inline field">
-		<div class="ui checkbox">
-			<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
-			<input name="remember" type="checkbox">
-		</div>
-	</div>
-	{{end}}
-
-	{{template "user/auth/captcha" .}}
-
-	<div class="field">
-		<button class="ui primary button">
-			{{if .LinkAccountMode}}
-				{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
-			{{else}}
-				{{ctx.Locale.Tr "sign_in"}}
-			{{end}}
-		</button>
-		<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
-	</div>
-
-	{{if .ShowRegistrationButton}}
-		<div class="field">
-			<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now"}}</a>
-		</div>
-	{{end}}
-
-	{{if .OAuth2Providers}}
-	<div class="divider divider-text">
-		{{ctx.Locale.Tr "sign_in_or"}}
-	</div>
-	<div id="oauth2-login-navigator" class="tw-py-1">
-		<div class="tw-flex tw-flex-col tw-justify-center">
-			<div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-items-center tw-gap-2">
-				{{range $provider := .OAuth2Providers}}
-					<a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center tw-py-2 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
-						{{$provider.IconHTML 28}}
-						{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
-					</a>
-				{{end}}
+	<form class="ui form" action="{{.SignInLink}}" method="post">
+		{{.CsrfTokenHtml}}
+	
+{{if .OAuth2Providers}}
+		<div id="oauth2-login-navigator" class="tw-py-1">
+			<div class="tw-flex tw-flex-col tw-justify-center">
+				<div id="oauth2-login-navigator-inner" class="tw-flex fw-flex-col tw-flex-wrap tw-items-center tw-gap-2">
+					{{range $provider := .OAuth2Providers}}
+						<a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center tw-py-2 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+							{{$provider.IconHTML 28}}
+							{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+						</a>
+					{{end}}
+				</div>
 			</div>
 		</div>
-	</div>
-	{{end}}
+{{end}}
 	</form>
 </div>