diff --git a/public/dynamic/server-info.ejs b/public/dynamic/server-info.ejs
index df68728..f56efa6 100644
--- a/public/dynamic/server-info.ejs
+++ b/public/dynamic/server-info.ejs
@@ -11,17 +11,9 @@
   <body class=center>
     <h3 class=rainbow>Server Info:</h3>
     <p class=rainbow>Author: <%= author %></p>
-<<<<<<< HEAD
-    <p class=rainbow>Uptime: <%= uptime %> seconds</p>
-    <p class=rainbow>Total Pages: <%= images %></p>
-    <script src="/footer.js"></script>
-  </body>
-</html>
-=======
     <p class=rainbow>System Uptime: <%= system %></p>
     <p class=rainbow>Node Uptime: <%= uptime %></p>
     <p class=rainbow>Total Pages: <%= images %></p>
     <script src="/footer.js"></script>
   </body>
 </html>
->>>>>>> 24c184c (Init)
diff --git a/public/styles/ejsstyle.css b/public/styles/ejsstyle.css
index 84fe018..7a45d8d 100644
--- a/public/styles/ejsstyle.css
+++ b/public/styles/ejsstyle.css
@@ -1,3 +1,8 @@
+@font-face {
+  font-family: 'Source Code Pro';
+  src: url('/fonts/SourceCodePro.ttf');
+}
+
 html, body {
   height: 100%;
   width: 100%;
@@ -39,6 +44,10 @@ footer {
   width: 100%;
 }
 
+a, button, .rainbow, .force-color, span, label {
+    font-family: 'Source Code Pro', monospace !important;
+}
+
 a:has(button) {
 box-shadow: none !important;
 transform: none !important;
@@ -94,4 +103,4 @@ transform: none !important;
   -webkit-text-fill-color: transparent;
   background-clip: text;
   text-fill-color: transparent;
-}
\ No newline at end of file
+}
