diff --git a/packages/editor/src/app/main/components/startscreen/StartScreen.module.css b/packages/editor/src/app/main/components/startscreen/StartScreen.module.css
index efd17e347..70b30a194 100644
--- a/packages/editor/src/app/main/components/startscreen/StartScreen.module.css
+++ b/packages/editor/src/app/main/components/startscreen/StartScreen.module.css
@@ -20,10 +20,9 @@
 
 .code_block {
   display: block;
-  margin: 5em 0;
 }
 
-.code_block img {
+.code_block video {
   box-shadow: rgb(0 0 0 / 25%) 0px 10px 30px -20px;
   border-radius: 20px;
   border: 1px solid rgba(0, 0, 0, 0.08);
@@ -71,6 +70,17 @@
   margin-bottom: 100px;
 }
 
+.story > div {
+  flex: 1 1 0px;
+}
+
+.story video {
+  max-width: 100%;
+  box-shadow: rgb(0 0 0 / 25%) 0px 10px 30px -20px;
+  border-radius: 20px;
+  border: 1px solid rgba(0, 0, 0, 0.08);
+}
+
 .story img {
   max-width: 100%;
 }
@@ -105,9 +115,9 @@
   place-self: start;
   text-align: left;
   padding: 30px;
-  box-shadow: rgb(0 0 0 / 25%) 0px 1px 3px -2px;
 
   border-radius: 20px;
+  box-shadow: rgb(0 0 0 / 25%) 0px 1px 3px -2px;
   border: 1px solid rgba(0, 0, 0, 0.08);
   width: 100%;
   height: 100%;
@@ -257,6 +267,14 @@ form {
   .perks {
     grid-template-columns: repeat(1, minmax(200px, 1fr));
   }
+
+  .story {
+    flex-direction: column;
+  }
+
+  .uneven .story {
+    flex-direction: column-reverse;
+  }
 }
 @media (max-width: 500px) {
   .header,
diff --git a/packages/editor/src/app/main/components/startscreen/StartScreen.tsx b/packages/editor/src/app/main/components/startscreen/StartScreen.tsx
index a3575d273..b0564e904 100644
--- a/packages/editor/src/app/main/components/startscreen/StartScreen.tsx
+++ b/packages/editor/src/app/main/components/startscreen/StartScreen.tsx
@@ -3,9 +3,16 @@ import { useEffect } from "react";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { SessionStore } from "../../../../store/local/SessionStore";
 // import { NotebookOverviewItem } from "../../../matrix-auth/routes/overview/NotebookOverviewItem";
-import { toDocs, toRegisterScreen, toTutorial } from "../../../routes/routes";
+import {
+  toDocs,
+  toLoginScreen,
+  toRegisterScreen,
+  toTutorial,
+} from "../../../routes/routes";
 import styles from "./StartScreen.module.css";
-import intro from "./assets/intro.gif";
+import confettiVideo from "./assets/video/confetti.mp4";
+import savingsVideo from "./assets/video/savings.mp4";
+import welcomeVideo from "./assets/video/welcome.mp4";
 
 export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
   const { sessionStore } = props;
@@ -49,7 +56,10 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
         </div>
         <div className={styles.headerMedia}>
           <div className={styles.code_block}>
-            <img src={intro} alt="TypeCell Demo" />
+            <video autoPlay={true} loop={true} muted={true}>
+              <source src={welcomeVideo} type="video/mp4" />
+              Your browser does not support the video tag.
+            </video>
           </div>
         </div>
       </header>
@@ -57,7 +67,14 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
         <section className={styles.storySection + " " + styles.uneven}>
           <div className={styles.content + " " + styles.story}>
             <div className={""}>
-              <img src={intro} alt="TypeCell Demo" />
+              <video
+                autoPlay={true}
+                loop={true}
+                muted={true}
+                style={{ maxWidth: "85%" }}>
+                <source src={savingsVideo} type="video/mp4" />
+                Your browser does not support the video tag.
+              </video>
             </div>
             <div className={""}>
               <h4>Break-free from your tools with hackable software</h4>
@@ -128,7 +145,7 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
         </section>
 
         <div className={styles.section_separator} role="separator"></div>
-        <section className={styles.storySection + " " + styles.sdf}>
+        <section className={styles.storySection}>
           <div className={styles.content + " " + styles.story}>
             <div className={""}>
               <h4>Simplify the programming experience</h4>
@@ -142,7 +159,10 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
               </p>
             </div>
             <div className={""}>
-              <img src={intro} alt="TypeCell Demo" />
+              <video autoPlay={true} loop={true} muted={true}>
+                <source src={confettiVideo} type="video/mp4" />
+                Your browser does not support the video tag.
+              </video>
             </div>
           </div>
 
@@ -174,29 +194,33 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
         </section>
 
         <div className={styles.section_separator} role="separator"></div>
-        <section className={styles.storySection + " " + styles.sdf}>
+        <section className={styles.storySection + " " + styles.uneven}>
           <div className={styles.content + " " + styles.story}>
-            <div className={""}>
-              <a
-                href="https://discord.gg/TcJ9TRC3SV"
-                target="_blank"
-                rel="noreferrer">
-                <img
-                  style={{ borderRadius: "5px" }}
-                  alt="Discord"
-                  src="https://img.shields.io/badge/Join us on discord%20-%237289DA.svg?style=for-the-badge&logo=discord&logoColor=white"
-                />
-              </a>
-              <a
-                href="https://github.com/typecellOS/typecell"
-                target="_blank"
-                rel="noreferrer">
-                <img
-                  style={{ borderRadius: "5px" }}
-                  alt="GitHub"
-                  src="https://img.shields.io/badge/Star on GitHub%20-%23eeeeee.svg?style=for-the-badge&logo=github&logoColor=black"
-                />
-              </a>
+            <div className={""} style={{ textAlign: "center" }}>
+              <p>
+                <a
+                  href="https://discord.gg/TcJ9TRC3SV"
+                  target="_blank"
+                  rel="noreferrer">
+                  <img
+                    style={{ borderRadius: "5px" }}
+                    alt="Discord"
+                    src="https://img.shields.io/badge/Join us on discord%20-%237289DA.svg?style=for-the-badge&logo=discord&logoColor=white"
+                  />
+                </a>
+              </p>
+              <p>
+                <a
+                  href="https://github.com/typecellOS/typecell"
+                  target="_blank"
+                  rel="noreferrer">
+                  <img
+                    style={{ borderRadius: "5px" }}
+                    alt="GitHub"
+                    src="https://img.shields.io/badge/Star on GitHub%20-%23eeeeee.svg?style=for-the-badge&logo=github&logoColor=black"
+                  />
+                </a>
+              </p>
             </div>
             <div className={""}>
               <h4>Join the TypeCell community</h4>
@@ -320,7 +344,7 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
                   <span>Tutorial</span>
                 </Link>
               </li>
-              <li>
+              {/* <li>
                 <Link to={toTutorial()}>
                   <span>Manual</span>
                 </Link>
@@ -329,19 +353,19 @@ export const StartScreen = observer((props: { sessionStore: SessionStore }) => {
                 <Link to={toTutorial()}>
                   <span>Demos</span>
                 </Link>
-              </li>
+              </li> */}
             </ul>
           </div>
           <div className={styles.links}>
             <h4>Get started</h4>
             <ul>
               <li>
-                <Link to={toTutorial()}>
+                <Link to={toRegisterScreen()}>
                   <span>Create account</span>
                 </Link>
               </li>
               <li>
-                <Link to={toDocs()}>
+                <Link to={toLoginScreen()}>
                   <span>Login</span>
                 </Link>
               </li>
diff --git a/packages/editor/src/app/main/components/startscreen/assets/video/confetti.mp4 b/packages/editor/src/app/main/components/startscreen/assets/video/confetti.mp4
new file mode 100644
index 000000000..a2a69291d
Binary files /dev/null and b/packages/editor/src/app/main/components/startscreen/assets/video/confetti.mp4 differ
diff --git a/packages/editor/src/app/main/components/startscreen/assets/video/savings.mp4 b/packages/editor/src/app/main/components/startscreen/assets/video/savings.mp4
new file mode 100644
index 000000000..4ffd42744
Binary files /dev/null and b/packages/editor/src/app/main/components/startscreen/assets/video/savings.mp4 differ
diff --git a/packages/editor/src/app/main/components/startscreen/assets/video/welcome.mp4 b/packages/editor/src/app/main/components/startscreen/assets/video/welcome.mp4
new file mode 100644
index 000000000..5a2d8b80d
Binary files /dev/null and b/packages/editor/src/app/main/components/startscreen/assets/video/welcome.mp4 differ