diff --git a/app/(home-pages)/p/[didOrHandle]/PubListing.tsx b/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
index fb19c17b..a8820350 100644
--- a/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
+++ b/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
@@ -66,14 +66,14 @@ export const PubListing = (props: PublicationSubscription) => {
             </p>
           </div>
           <div className="mt-3 mx-auto">
-            {/*<SubscribeButton autoFocus {...dummy} />*/}
-            <SubscribeWithBluesky
+            <SubscribeButton autoFocus {...dummy} />
+            {/*<SubscribeWithBluesky
               compact
               pub_uri={props.uri}
               pubName={props.record.name}
               subscribers={props.publication_subscriptions || []}
               base_url={getPublicationURL({ ...props })}
-            />
+            />*/}
           </div>
         </div>
       </div>
diff --git a/app/lish/[did]/[publication]/PublicationContent.tsx b/app/lish/[did]/[publication]/PublicationContent.tsx
index 982870ec..74a12754 100644
--- a/app/lish/[did]/[publication]/PublicationContent.tsx
+++ b/app/lish/[did]/[publication]/PublicationContent.tsx
@@ -16,6 +16,8 @@ import {
 import { getFirstParagraph } from "src/utils/getFirstParagraph";
 import { FontLoader } from "components/FontLoader";
 import { SpeedyLink } from "components/SpeedyLink";
+import { SubscribeInput } from "components/Subscribe/SubscribeButton";
+import { dummy } from "./[rkey]/PostPubInfo";
 
 type FakePost = {
   title: string;
@@ -81,12 +83,13 @@ export const PublicationContent = ({
             ) : undefined
           }
           subscribeButton={
-            <SubscribeWithBluesky
-              base_url={getPublicationURL(publication)}
-              pubName={publication.name}
-              pub_uri={publication.uri}
-              subscribers={publication.publication_subscriptions}
-            />
+            <SubscribeInput {...dummy}/>
+            // <SubscribeWithBluesky
+            //   base_url={getPublicationURL(publication)}
+            //   pubName={publication.name}
+            //   pub_uri={publication.uri}
+            //   subscribers={publication.publication_subscriptions}
+            // />
           }
         />
         <div className="publicationPostList w-full flex flex-col gap-4">
diff --git a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
index 550094e7..8af769a9 100644
--- a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
@@ -93,7 +93,7 @@ export function LinearDocumentPage({
           footnoteIndexMap={footnoteIndexMap}
         />
         <PublishedFootnoteSection footnotes={footnotes} />
-        <PostSubscribe />
+        {/*<PostSubscribe />*/}
         <PostPrevNextButtons
           showPrevNext={preferences.showPrevNext !== false && !isSubpage}
         />
@@ -109,7 +109,8 @@ export function LinearDocumentPage({
           recommendsCount={document.recommendsCount}
         />
         <div className={`spacer h-4 w-full`} />
-        {/*<PostPubInfo {...dummy} />*/}
+        <PostPubInfo {...dummy} />
+        
 
         {!hasPageBackground && <div className={`spacer h-8 w-full`} />}
       </PageWrapper>
diff --git a/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx b/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
index 7d2f72bf..10b7e533 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
@@ -1,11 +1,11 @@
 import { SubscribeInput } from "components/Subscribe/SubscribeButton";
 
 export const dummy = {
-  newsletterMode: true,
+  newsletterMode: false,
   user: {
-    loggedIn: true,
+    loggedIn: false,
     email: "example@example.com",
-    handle: "example.handle",
+    handle: undefined,
     subscribed: false,
   },
 };
diff --git a/components/Subscribe/HandleSubscribe.tsx b/components/Subscribe/HandleSubscribe.tsx
index dea8b723..a0638c63 100644
--- a/components/Subscribe/HandleSubscribe.tsx
+++ b/components/Subscribe/HandleSubscribe.tsx
@@ -1,6 +1,5 @@
 "use client";
 import { ButtonPrimary } from "components/Buttons";
-import { BlueskyTiny } from "components/Icons/BlueskyTiny";
 import { Popover } from "components/Popover";
 import Link from "next/link";
 import { HandleInput } from "./HandleInput";
@@ -51,11 +50,14 @@ export const SubscribeWithHandle = (props: {
   } else
     return (
       <div className="max-w-sm mx-auto w-full ">
-        <HandleInput autoFocus={props.autoFocus} />
-        <div className="flex gap-2 justify-center items-center mx-auto pt-0.5 ">
+        <HandleInput
+          autoFocus={props.autoFocus}
+          action=<div className="bg-accent-1 rounded-md px-1 text-accent-2 font-bold text-sm">
+            Subscribe
+          </div>
+        />
+        <div className=" pt-1 ">
           <AtmosphericHandleInfo />
-          <Separator classname="h-3! border-accent-contrast!" />
-          <div className="text-sm text-accent-contrast font-bold">Create</div>
         </div>
       </div>
     );
@@ -77,34 +79,15 @@ export const LinkHandle = (props: { compact?: boolean }) => {
         </div>
         <AtmosphericHandleInfo />
       </div>
-      <HandleInputandOAuth link compact />
-    </div>
-  );
-};
-
-export const HandleInputandOAuth = (props: {
-  link?: boolean;
-  compact?: boolean;
-}) => {
-  return (
-    <div className="handleInputAndOAuth flex flex-col">
-      <HandleInput action="link" />
-      <div
-        className={`${props.compact ? "mt-1 mb-2 text-xs" : "text-sm mt-2 mb-3"} w-full flex gap-2 items-center`}
-      >
-        <hr className="grow border-border-light" />
-        <div className="shrink-0 text-tertiary">
-          or {props.link ? "link with" : "sign in via"}
-        </div>
-        <hr className="grow border-border-light" />
+      <div className="text-base">
+        <HandleInput
+          action={
+            <div className="bg-accent-1 rounded-md px-1 text-accent-2 font-bold text-sm">
+              Link
+            </div>
+          }
+        />
       </div>
-      <ButtonPrimary
-        compact={props.compact}
-        className={`${props.compact && "text-sm"} `}
-        fullWidth
-      >
-        <BlueskyTiny /> Bluesky
-      </ButtonPrimary>
     </div>
   );
 };
@@ -138,7 +121,7 @@ export const AtmosphericHandleInfo = (props: { trigger?: React.ReactNode }) => {
           props.trigger
         ) : (
           <div className="text-accent-contrast text-sm">
-            What's the Atmosphere
+            What's the Atmosphere?
           </div>
         )
       }
@@ -159,14 +142,46 @@ export const AtmosphericHandleInfo = (props: { trigger?: React.ReactNode }) => {
         <div className="logo-scroll-track flex w-max">
           {(
             [
-              "Leaflet", "Bluesky", "Blacksky", "Eurosky", "Tangled",
-              "Semble", "Surf", "Spark", "Pckt", "pdsls", "plyr.fm",
-              "Popfeed", "Roomy", "Sill", "Offprint", "Margin",
-              "Anisota", "Blento", "Cartridge", "Graze",
-              "Leaflet", "Bluesky", "Blacksky", "Eurosky", "Tangled",
-              "Semble", "Surf", "Spark", "Pckt", "pdsls", "plyr.fm",
-              "Popfeed", "Roomy", "Sill", "Offprint", "Margin",
-              "Anisota", "Blento", "Cartridge", "Graze",
+              "Leaflet",
+              "Bluesky",
+              "Blacksky",
+              "Eurosky",
+              "Tangled",
+              "Semble",
+              "Surf",
+              "Spark",
+              "Pckt",
+              "pdsls",
+              "plyr.fm",
+              "Popfeed",
+              "Roomy",
+              "Sill",
+              "Offprint",
+              "Margin",
+              "Anisota",
+              "Blento",
+              "Cartridge",
+              "Graze",
+              "Leaflet",
+              "Bluesky",
+              "Blacksky",
+              "Eurosky",
+              "Tangled",
+              "Semble",
+              "Surf",
+              "Spark",
+              "Pckt",
+              "pdsls",
+              "plyr.fm",
+              "Popfeed",
+              "Roomy",
+              "Sill",
+              "Offprint",
+              "Margin",
+              "Anisota",
+              "Blento",
+              "Cartridge",
+              "Graze",
             ] as (keyof typeof logos)[]
           ).map((name, i) => (
             <AtApp key={i} logo={logos[name]} name={name} />
@@ -174,7 +189,7 @@ export const AtmosphericHandleInfo = (props: { trigger?: React.ReactNode }) => {
         </div>
       </div>
 
-      <ButtonPrimary fullWidth className=" mt-3 mx-auto mb-3 mt-1">
+      <ButtonPrimary fullWidth className=" mt-3 mx-auto mb-3">
         Sign up via Bluesky!
       </ButtonPrimary>
     </Popover>
diff --git a/components/Subscribe/SubscribeButton.tsx b/components/Subscribe/SubscribeButton.tsx
index e816f8cd..8c930423 100644
--- a/components/Subscribe/SubscribeButton.tsx
+++ b/components/Subscribe/SubscribeButton.tsx
@@ -65,8 +65,11 @@ export const SubscribeInput = (props: {
         action={
           <Modal
             trigger={
-              <ButtonPrimary compact className="leading-tight! outline-none! text-sm!">
-                subscribe
+              <ButtonPrimary
+                compact
+                className="leading-tight! outline-none! text-sm!"
+              >
+                Subscribe
               </ButtonPrimary>
             }
           >