diff --git a/package.json b/package.json
index efd2c417..908bf552 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "@floating-ui/react": "^0.23.1",
     "@headlessui/react": "^1.7.14",
+    "@nostr-connect/connect": "^0.4.0",
     "@tanstack/react-query": "^4.29.5",
     "@tanstack/react-virtual": "3.0.0-beta.54",
     "@tauri-apps/api": "^1.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d26a9cb..b2d38609 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,9 @@ dependencies:
   '@headlessui/react':
     specifier: ^1.7.14
     version: 1.7.14(react-dom@18.2.0)(react@18.2.0)
+  '@nostr-connect/connect':
+    specifier: ^0.4.0
+    version: 0.4.0(react@18.2.0)
   '@tanstack/react-query':
     specifier: ^4.29.5
     version: 4.29.5(react-dom@18.2.0)(react@18.2.0)
@@ -494,6 +497,17 @@ packages:
       fastq: 1.15.0
     dev: true
 
+  /@nostr-connect/connect@0.4.0(react@18.2.0):
+    resolution: {integrity: sha512-N8ubuLQb85veXK35XGlt+vI9JljhODKj3NRMfUTFuA3kNDpzW8ZRtGzIAPifrL9uZ8VNjAaU5fa7lMOHpMca0w==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: '>=16'
+    dependencies:
+      events: 3.3.0
+      nostr-tools: 1.10.1
+      react: 18.2.0
+    dev: false
+
   /@polka/url@1.0.0-next.21:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
     dev: true
@@ -1306,6 +1320,11 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
+  /events@3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
+    dev: false
+
   /execa@7.1.1:
     resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==}
     engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}
diff --git a/src/app/auth/layout.tsx b/src/app/auth/layout.tsx
index 5531f49b..2fbe18b5 100644
--- a/src/app/auth/layout.tsx
+++ b/src/app/auth/layout.tsx
@@ -24,7 +24,7 @@ export function LayoutOnboarding({ children }: { children: React.ReactNode }) {
 			<div className="flex h-screen w-full flex-col">
 				<div
 					data-tauri-drag-region
-					className="relative h-11 shrink-0 border border-zinc-100 bg-white dark:border-zinc-900 dark:bg-black"
+					className="relative h-9 shrink-0 border border-zinc-100 bg-white dark:border-zinc-900 dark:bg-black"
 				>
 					<div
 						data-tauri-drag-region
diff --git a/src/app/auth/pages/create/index.page.tsx b/src/app/auth/pages/create/index.page.tsx
index ce561c37..90efd406 100644
--- a/src/app/auth/pages/create/index.page.tsx
+++ b/src/app/auth/pages/create/index.page.tsx
@@ -28,7 +28,7 @@ export function Page() {
 
 	const submit = () => {
 		setOnboarding((prev) => ({ ...prev, pubkey: pubkey, privkey: privkey }));
-		navigate("/auth/create/step-2");
+		navigate("/app/auth/create/step-2");
 	};
 
 	return (
diff --git a/src/app/auth/pages/create/step-2/index.page.tsx b/src/app/auth/pages/create/step-2/index.page.tsx
index cc0f7f25..e7bbf973 100644
--- a/src/app/auth/pages/create/step-2/index.page.tsx
+++ b/src/app/auth/pages/create/step-2/index.page.tsx
@@ -32,7 +32,7 @@ export function Page() {
 	const onSubmit = (data: any) => {
 		setLoading(true);
 		setOnboarding((prev) => ({ ...prev, metadata: data }));
-		navigate("/auth/create/step-3");
+		navigate("/app/auth/create/step-3");
 	};
 
 	useEffect(() => {
diff --git a/src/app/auth/pages/import/index.page.tsx b/src/app/auth/pages/import/index.page.tsx
index da4be6fb..fa81de2b 100644
--- a/src/app/auth/pages/import/index.page.tsx
+++ b/src/app/auth/pages/import/index.page.tsx
@@ -43,7 +43,7 @@ export function Page() {
 
 			if (typeof getPublicKey(privkey) === "string") {
 				setOnboardingPrivkey((prev) => ({ ...prev, privkey: privkey }));
-				navigate("/auth/import/step-2");
+				navigate("/app/auth/import/step-2");
 			}
 		} catch (error) {
 			setError("key", {
@@ -63,10 +63,9 @@ export function Page() {
 				</div>
 				<div className="flex flex-col gap-4">
 					<div>
-						{/* #TODO: add function */}
 						<button
 							type="button"
-							className="inline-flex w-full transform items-center justify-center gap-1.5 rounded-lg bg-zinc-900 px-3.5 py-2.5 font-medium text-zinc-400 active:translate-y-1"
+							className="inline-flex w-full transform items-center justify-center gap-1.5 rounded-lg bg-zinc-900 ring-1 ring-zinc-800 px-3.5 py-2.5 font-medium text-zinc-400 active:translate-y-1"
 						>
 							<div className="inline-flex items-center rounded-md bg-zinc-400/10 px-2 py-0.5 text-xs font-medium ring-1 ring-inset ring-zinc-400/20">
 								<span className="bg-gradient-to-r from-fuchsia-300 via-orange-100 to-amber-300 bg-clip-text text-transparent">
diff --git a/src/app/auth/pages/import/step-2/index.page.tsx b/src/app/auth/pages/import/step-2/index.page.tsx
index f0d1112c..40a3e2b6 100644
--- a/src/app/auth/pages/import/step-2/index.page.tsx
+++ b/src/app/auth/pages/import/step-2/index.page.tsx
@@ -67,7 +67,7 @@ export function Page() {
 			.then((res) => {
 				if (res) {
 					for (const tag of onboarding.follows) {
-						fetch(`https://us.rbr.bio/${tag[1]}/metadata.json`)
+						fetch(`https://rbr.bio/${tag[1]}/metadata.json`)
 							.then((data) => data.json())
 							.then((data) => createPleb(tag[1], data ?? ""));
 					}
diff --git a/src/app/auth/pages/index/index.page.tsx b/src/app/auth/pages/index/index.page.tsx
index 4e056e5c..d96f5948 100644
--- a/src/app/auth/pages/index/index.page.tsx
+++ b/src/app/auth/pages/index/index.page.tsx
@@ -112,14 +112,14 @@ export function Page() {
 				</h1>
 				<div className="mt-4 flex flex-col items-center gap-1.5">
 					<a
-						href="/auth/create"
+						href="/app/auth/create"
 						className="relative inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full bg-zinc-900 px-6 text-lg font-medium ring-1 ring-zinc-800 hover:bg-zinc-800"
 					>
 						Create new key
 						<ArrowRightIcon width={20} height={20} />
 					</a>
 					<a
-						href="/auth/import"
+						href="/app/auth/import"
 						className="inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full px-6 text-base font-medium text-zinc-300 hover:bg-zinc-800"
 					>
 						Login with private key
diff --git a/src/app/index/pages/index.page.tsx b/src/app/index/pages/index.page.tsx
index 70b84482..0a277f72 100644
--- a/src/app/index/pages/index.page.tsx
+++ b/src/app/index/pages/index.page.tsx
@@ -13,7 +13,7 @@ export function Page() {
 	});
 
 	if (!isLoading && !data) {
-		navigate("/auth", { overwriteLastHistoryEntry: true });
+		navigate("/app/auth", { overwriteLastHistoryEntry: true });
 	}
 
 	if (!isLoading && data) {
@@ -21,6 +21,6 @@ export function Page() {
 	}
 
 	return (
-		<div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-black dark:text-white" />
+		<div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-black dark:text-zinc-100" />
 	);
 }