diff --git a/README.md b/README.md
index 0277758..5a92db0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Math2Code
+# MathCoder
 
 ## About
 
@@ -65,7 +65,7 @@ To use this, just enter your equation in the input field and get formatted outpu
 
 - [X] Improve page layout
 - [ ] Add Support for Java, Java BigDecimal, C
-- [ ] Optimize page payload
+- [X] Optimize page payload
 - [ ] Generate working code samples
 - [x] Support subscripted variables
 - [ ] Generate Transparent PNGs and SVGs of typeset equations
@@ -96,8 +96,8 @@ To use this, just enter your equation in the input field and get formatted outpu
 This relies on the following technologies:
 
 - [React](https://react.dev/)
-- [Mathquill](http://mathquill.com/) and [react-mathquill](https://github.com/viktorstrate/react-mathquill)
-- [tex-math-parser](https://github.com/davidtranhq/tex-math-parser)
+- [Mathlive](https://cortexjs.io/mathlive/) and [react-math-view](https://github.com/patmagauran/react-math-view)
+- [tex-math-parser](https://github.com/patmagauran/tex-math-parser)
 - [Math.JS](https://mathjs.org/)
 - [Next.JS](https://nextjs.org/)
 - [React-syntax-highlighting](https://github.com/react-syntax-highlighter/react-syntax-highlighter)
diff --git a/math2code/public/android-chrome-192x192.png b/math2code/public/android-chrome-192x192.png
new file mode 100644
index 0000000..db57ae5
Binary files /dev/null and b/math2code/public/android-chrome-192x192.png differ
diff --git a/math2code/public/android-chrome-512x512.png b/math2code/public/android-chrome-512x512.png
new file mode 100644
index 0000000..a075a2b
Binary files /dev/null and b/math2code/public/android-chrome-512x512.png differ
diff --git a/math2code/public/apple-touch-icon.png b/math2code/public/apple-touch-icon.png
new file mode 100644
index 0000000..e15ac3d
Binary files /dev/null and b/math2code/public/apple-touch-icon.png differ
diff --git a/math2code/public/favicon-16x16.png b/math2code/public/favicon-16x16.png
new file mode 100644
index 0000000..8a8d7c7
Binary files /dev/null and b/math2code/public/favicon-16x16.png differ
diff --git a/math2code/public/favicon-32x32.png b/math2code/public/favicon-32x32.png
new file mode 100644
index 0000000..acdf834
Binary files /dev/null and b/math2code/public/favicon-32x32.png differ
diff --git a/math2code/public/favicon.ico b/math2code/public/favicon.ico
index 718d6fe..76621a3 100644
Binary files a/math2code/public/favicon.ico and b/math2code/public/favicon.ico differ
diff --git a/math2code/public/next.svg b/math2code/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/math2code/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/math2code/public/site.webmanifest b/math2code/public/site.webmanifest
new file mode 100644
index 0000000..4c2ed48
--- /dev/null
+++ b/math2code/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "MathCoder",
+    "short_name": "MathCoder",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
\ No newline at end of file
diff --git a/math2code/public/thirteen.svg b/math2code/public/thirteen.svg
deleted file mode 100644
index 8977c1b..0000000
--- a/math2code/public/thirteen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="31" fill="none"><g opacity=".9"><path fill="url(#a)" d="M13 .4v29.3H7V6.3h-.2L0 10.5V5L7.2.4H13Z"/><path fill="url(#b)" d="M28.8 30.1c-2.2 0-4-.3-5.7-1-1.7-.8-3-1.8-4-3.1a7.7 7.7 0 0 1-1.4-4.6h6.2c0 .8.3 1.4.7 2 .4.5 1 .9 1.7 1.2.7.3 1.6.4 2.5.4 1 0 1.7-.2 2.5-.5.7-.3 1.3-.8 1.7-1.4.4-.6.6-1.2.6-2s-.2-1.5-.7-2.1c-.4-.6-1-1-1.8-1.4-.8-.4-1.8-.5-2.9-.5h-2.7v-4.6h2.7a6 6 0 0 0 2.5-.5 4 4 0 0 0 1.7-1.3c.4-.6.6-1.3.6-2a3.5 3.5 0 0 0-2-3.3 5.6 5.6 0 0 0-4.5 0 4 4 0 0 0-1.7 1.2c-.4.6-.6 1.2-.6 2h-6c0-1.7.6-3.2 1.5-4.5 1-1.3 2.2-2.3 3.8-3C25 .4 26.8 0 28.8 0s3.8.4 5.3 1.1c1.5.7 2.7 1.7 3.6 3a7.2 7.2 0 0 1 1.2 4.2c0 1.6-.5 3-1.5 4a7 7 0 0 1-4 2.2v.2c2.2.3 3.8 1 5 2.2a6.4 6.4 0 0 1 1.6 4.6c0 1.7-.5 3.1-1.4 4.4a9.7 9.7 0 0 1-4 3.1c-1.7.8-3.7 1.1-5.8 1.1Z"/></g><defs><linearGradient id="a" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient><linearGradient id="b" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/math2code/public/vercel.svg b/math2code/public/vercel.svg
deleted file mode 100644
index d2f8422..0000000
--- a/math2code/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/math2code/src/pages/_document.tsx b/math2code/src/pages/_document.tsx
index 30f9a14..cc519a3 100644
--- a/math2code/src/pages/_document.tsx
+++ b/math2code/src/pages/_document.tsx
@@ -23,7 +23,10 @@ export default function MyDocument({ emotionStyleTags }: MyDocumentProps) {
       <Head>
         {/* PWA primary color */}
         <meta name="theme-color" content={theme.palette.primary.main} />
-        <link rel="shortcut icon" href="/favicon.ico" />
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"/>
+        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/>
+        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/>
+        <link rel="manifest" href="/site.webmanifest"/>
         <meta name="emotion-insertion-point" content="" />
         {emotionStyleTags}
       </Head>
diff --git a/math2code/src/pages/index.tsx b/math2code/src/pages/index.tsx
index b0f7ab7..44aa764 100644
--- a/math2code/src/pages/index.tsx
+++ b/math2code/src/pages/index.tsx
@@ -63,13 +63,11 @@ export default function Home() {
   return (
     <>
       <Head>
-        <title>Math2Code</title>
+        <title>MathCoder</title>
         <meta
           name="description"
           content="Interactive Equation editor which converts typeset equations into code and excel-compatibile formulas."
         />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link rel="icon" href="/favicon.ico" />
       </Head>
       <Box>
         <DrawerLayout
@@ -92,7 +90,7 @@ export default function Home() {
                 alignItems: "center",
               }}
             >
-              <Typography variant="h1">Math2Code</Typography>
+              <Typography variant="h1">MathCoder</Typography>
               <Box>
                 <Typography variant="h6">Note:</Typography>
                 <Typography>
@@ -101,11 +99,11 @@ export default function Home() {
                 <Typography>
                   I Recommend reading over the readme to fully understand the
                   current state of the app and its limitations:{" "}
-                  <Link href="https://github.com/patmagauran/Math2Code/blob/main/README.md">
+                  <Link href="https://github.com/patmagauran/MathCoder/blob/main/README.md">
                     README
                   </Link>
                 </Typography>
-                <Link href="https://github.com/patmagauran/Math2Code">
+                <Link href="https://github.com/patmagauran/MathCoder">
                   Access the Github repo Here!
                 </Link>
               </Box>