From 5d0a1b87df2d10f6978c3e884e6502317340d780 Mon Sep 17 00:00:00 2001
From: sky <sky@skys.day>
Date: Sun, 22 Jun 2025 11:53:54 -0400
Subject: [PATCH] some fuckery to get dev branch working

---
 .gitignore                             |   0
 404.html                               |  11 -
 README.md                              |   0
 about.html                             |   0
 ad.html                                |   0
 ads.txt                                |   0
 apps.html                              |   0
 backgrounds.html                       |   0
 blank.html                             |   0
 bookmarklets.html                      |   0
 contact.html                           |   0
 css/style.css                          | 673 -------------------------
 css/themes.css                         | 300 +----------
 dmca/2025-03-04 Microsoft.txt          |  17 -
 favicon.ico                            | Bin
 favicon.png                            | Bin
 img/addlink.svg                        |   0
 img/backgrounds/compress images PLEASE |   0
 img/backgrounds/dogcat.svg             |   0
 img/backgrounds/mountains_theme.jpg    | Bin
 img/backgrounds/nighttime_theme.png    | Bin
 img/backgrounds/seraph_theme.png       | Bin
 img/backgrounds/sunset_theme.jpg       | Bin
 img/backgrounds/vaporwave_theme.jpg    | Bin
 img/badges/banana.svg                  |   0
 img/badges/dev.svg                     |   0
 img/badges/donate.svg                  |   0
 img/badges/mod.svg                     |   0
 img/badges/owner.svg                   |   0
 img/badges/partner.svg                 |   0
 img/badges/trans.svg                   |   0
 img/copy.svg                           |   0
 img/discord.svg                        |   0
 img/edit.svg                           |   0
 img/friend.svg                         |   0
 img/games.svg                          |   6 -
 img/pfps/3kh0.webp                     | Bin
 img/pfps/astra.webp                    | Bin
 img/pfps/awesome.webp                  | Bin
 img/pfps/ayo.webp                      | Bin
 img/pfps/buttsfart.webp                | Bin
 img/pfps/caidn.webp                    | Bin
 img/pfps/compass.png                   | Bin
 img/pfps/dire.webp                     | Bin
 img/pfps/legalise.webp                 | Bin
 img/pfps/lunar.webp                    | Bin
 img/pfps/math.webp                     | Bin
 img/pfps/night.webp                    | Bin
 img/pfps/ocular.webp                   | Bin
 img/pfps/shadow.webp                   | Bin
 img/pfps/sky.webp                      | Bin
 img/pfps/snor.webp                     | Bin
 img/pfps/ultra.webp                    | Bin
 img/pfps/wrnd.gif                      | Bin
 img/selenite192.png                    | Bin
 img/selenite512.png                    | Bin
 img/star-fill.svg                      |   0
 img/star.svg                           |   0
 img/user.svg                           |   0
 img/user_index.svg                     |   0
 index.html                             |  70 ---
 index.js                               |  55 --
 js/all.js                              |   0
 js/all.min.js                          |   0
 js/analytics.js                        |   0
 js/apps.js                             |   0
 js/asteroids.js                        |   0
 js/bootstrap.css                       |   0
 js/bootstrap.min.css                   |   0
 js/cloaks.js                           |   0
 js/cookie.js                           |   0
 js/cookieConsent.css                   |   0
 js/cookieConsent.js                    |   0
 js/debug.js                            |   0
 js/dogeminersave.txt                   |   0
 js/games.js                            | 204 +-------
 js/katamari.js                         |   0
 js/main.js                             | 169 +------
 js/oldstuff.js                         |   0
 js/savedownload.js                     |   0
 js/search.js                           |   0
 js/themes.js                           |   0
 js/ultimatetabcloak.js                 |   0
 js/uploaddownload.js                   |   0
 js/widget.js                           |   0
 loader.html                            |  56 --
 manifest.json                          |   0
 new selenite.svg                       |   0
 package.json                           |  10 -
 projects.html                          |  84 ---
 robots.txt                             |   0
 settings.html                          |   0
 style.css                              |   3 -
 suggest.html                           |   0
 support.html                           |   0
 95 files changed, 3 insertions(+), 1655 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 404.html
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 about.html
 mode change 100644 => 100755 ad.html
 mode change 100644 => 100755 ads.txt
 mode change 100644 => 100755 apps.html
 mode change 100644 => 100755 backgrounds.html
 mode change 100644 => 100755 blank.html
 mode change 100644 => 100755 bookmarklets.html
 mode change 100644 => 100755 contact.html
 delete mode 100644 css/style.css
 mode change 100644 => 100755 css/themes.css
 delete mode 100644 dmca/2025-03-04 Microsoft.txt
 mode change 100644 => 100755 favicon.ico
 mode change 100644 => 100755 favicon.png
 mode change 100644 => 100755 img/addlink.svg
 mode change 100644 => 100755 img/backgrounds/compress images PLEASE
 mode change 100644 => 100755 img/backgrounds/dogcat.svg
 mode change 100644 => 100755 img/backgrounds/mountains_theme.jpg
 mode change 100644 => 100755 img/backgrounds/nighttime_theme.png
 mode change 100644 => 100755 img/backgrounds/seraph_theme.png
 mode change 100644 => 100755 img/backgrounds/sunset_theme.jpg
 mode change 100644 => 100755 img/backgrounds/vaporwave_theme.jpg
 mode change 100644 => 100755 img/badges/banana.svg
 mode change 100644 => 100755 img/badges/dev.svg
 mode change 100644 => 100755 img/badges/donate.svg
 mode change 100644 => 100755 img/badges/mod.svg
 mode change 100644 => 100755 img/badges/owner.svg
 mode change 100644 => 100755 img/badges/partner.svg
 mode change 100644 => 100755 img/badges/trans.svg
 mode change 100644 => 100755 img/copy.svg
 mode change 100644 => 100755 img/discord.svg
 mode change 100644 => 100755 img/edit.svg
 mode change 100644 => 100755 img/friend.svg
 mode change 100644 => 100755 img/pfps/3kh0.webp
 mode change 100644 => 100755 img/pfps/astra.webp
 mode change 100644 => 100755 img/pfps/awesome.webp
 mode change 100644 => 100755 img/pfps/ayo.webp
 mode change 100644 => 100755 img/pfps/buttsfart.webp
 mode change 100644 => 100755 img/pfps/caidn.webp
 mode change 100644 => 100755 img/pfps/compass.png
 mode change 100644 => 100755 img/pfps/dire.webp
 mode change 100644 => 100755 img/pfps/legalise.webp
 mode change 100644 => 100755 img/pfps/lunar.webp
 mode change 100644 => 100755 img/pfps/math.webp
 mode change 100644 => 100755 img/pfps/night.webp
 mode change 100644 => 100755 img/pfps/ocular.webp
 mode change 100644 => 100755 img/pfps/shadow.webp
 mode change 100644 => 100755 img/pfps/sky.webp
 mode change 100644 => 100755 img/pfps/snor.webp
 mode change 100644 => 100755 img/pfps/ultra.webp
 mode change 100644 => 100755 img/pfps/wrnd.gif
 mode change 100644 => 100755 img/selenite192.png
 mode change 100644 => 100755 img/selenite512.png
 mode change 100644 => 100755 img/star-fill.svg
 mode change 100644 => 100755 img/star.svg
 mode change 100644 => 100755 img/user.svg
 mode change 100644 => 100755 img/user_index.svg
 mode change 100644 => 100755 index.html
 delete mode 100644 index.js
 mode change 100644 => 100755 js/all.js
 mode change 100644 => 100755 js/all.min.js
 mode change 100644 => 100755 js/analytics.js
 mode change 100644 => 100755 js/apps.js
 mode change 100644 => 100755 js/asteroids.js
 mode change 100644 => 100755 js/bootstrap.css
 mode change 100644 => 100755 js/bootstrap.min.css
 mode change 100644 => 100755 js/cloaks.js
 mode change 100644 => 100755 js/cookie.js
 mode change 100644 => 100755 js/cookieConsent.css
 mode change 100644 => 100755 js/cookieConsent.js
 mode change 100644 => 100755 js/debug.js
 mode change 100644 => 100755 js/dogeminersave.txt
 mode change 100644 => 100755 js/games.js
 mode change 100644 => 100755 js/katamari.js
 mode change 100644 => 100755 js/main.js
 mode change 100644 => 100755 js/oldstuff.js
 mode change 100644 => 100755 js/savedownload.js
 mode change 100644 => 100755 js/search.js
 mode change 100644 => 100755 js/themes.js
 mode change 100644 => 100755 js/ultimatetabcloak.js
 mode change 100644 => 100755 js/uploaddownload.js
 mode change 100644 => 100755 js/widget.js
 mode change 100644 => 100755 loader.html
 mode change 100644 => 100755 manifest.json
 mode change 100644 => 100755 new selenite.svg
 delete mode 100644 package.json
 mode change 100644 => 100755 projects.html
 mode change 100644 => 100755 robots.txt
 mode change 100644 => 100755 settings.html
 delete mode 100644 style.css
 mode change 100644 => 100755 suggest.html
 mode change 100644 => 100755 support.html

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/404.html b/404.html
old mode 100644
new mode 100755
index ef64c88..6f2463b
--- a/404.html
+++ b/404.html
@@ -32,11 +32,6 @@
 
     <!-- toastify -->
     <script>
-<<<<<<< HEAD
-      if(document.href.contains("eg1.8") || document.href.contains("eaglercraft")) {
-        document.href = "/semag/eg/"
-      }
-=======
       document.addEventListener("DOMContentLoaded", () => {
         
       })
@@ -47,7 +42,6 @@
           }
         }
       })
->>>>>>> c2041b6 (first dev commit)
     </script>
   </head>
   <alerts>
@@ -70,10 +64,6 @@
       <p>Trying to access a page such as login, register, or a user page? Those are only available on official links.</p>
       <p><a href="https://discord.gg/7jyufnwJNf">Join the Discord to find official links.</a></p>
       <a href="/index.html"><button>Go home</button></a>
-<<<<<<< HEAD
-    </div>
-
-=======
       <button onclick="statsForNerds()">Stats for nerds</button>
           <div id="sfn" style="display: none;" class="message">
       Please report this to our <a href="https://discord.gg/7jyufnwJNf">Discord</a> or <a href="mailto:support@selenite.cc">email.</a> <br> 
@@ -96,7 +86,6 @@
 "innerText"in document.body||Object.defineProperty(HTMLElement.prototype,"innerText",{get:function(){return this.textContent},set:function(a){this.textContent=a}}),window.fetch||(window.fetch=function(a){return new Promise(function(b,c){var d=new XMLHttpRequest;d.open("GET",a),d.onload=function(){200===d.status?b(JSON.parse(d.responseText)):c(Error(d.statusText))},d.onerror=function(){c(Error("Network Error"))},d.send()})}),window.XMLHttpRequest||(window.XMLHttpRequest=function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(a){}throw new Error("This browser does not support XMLHttpRequest.")});function statsForNerds(){var a=document.getElementById("sfn");"none"===a.style.display?(a.style.display="block",console.log("[\u2139\uFE0F] Showing the stats for nerds!")):(a.style.display="none",console.log("[\u2139\uFE0F] Hiding the stats for nerds!"))}document.getElementById("full").innerText=window.location.href,document.getElementById("ref").innerHTML=document.referrer,document.getElementById("title").innerText=document.title,document.getElementById("height").innerHTML=screen.height+"px",document.getElementById("width").innerHTML=screen.width+"px",document.getElementById("winheight").innerHTML=window.innerHeight+"px",document.getElementById("winwidth").innerHTML=window.innerWidth+"px",document.getElementById("cookie").innerText=navigator.cookieEnabled,document.getElementById("ua").innerHTML=navigator.userAgent,document.getElementById("plat").innerHTML=navigator.platform,document.getElementById("online").innerHTML=navigator.onLine;var echolog={};fetch("//wtfismyip.com/json").then(function(a){return a.json()}).then(function(a){var b={ipAddress:a.YourFuckingIPAddress,hostname:a.YourFuckingHostname},c=document.getElementById("ip");c.innerText=b.ipAddress})["catch"](function(a){return console.error(a)});
     </script>
 
->>>>>>> c2041b6 (first dev commit)
     </main>
     
     <footer class="noscroll">
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/about.html b/about.html
old mode 100644
new mode 100755
diff --git a/ad.html b/ad.html
old mode 100644
new mode 100755
diff --git a/ads.txt b/ads.txt
old mode 100644
new mode 100755
diff --git a/apps.html b/apps.html
old mode 100644
new mode 100755
diff --git a/backgrounds.html b/backgrounds.html
old mode 100644
new mode 100755
diff --git a/blank.html b/blank.html
old mode 100644
new mode 100755
diff --git a/bookmarklets.html b/bookmarklets.html
old mode 100644
new mode 100755
diff --git a/contact.html b/contact.html
old mode 100644
new mode 100755
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index 6a0502b..0000000
--- a/css/style.css
+++ /dev/null
@@ -1,673 +0,0 @@
-@import url("https://fonts.googleapis.com/css2?family=Prompt:wght@300&display=swap");
-
-@keyframes loadInAnimation {
-	0% {
-		opacity: 0;
-	}
-	100% {
-		opacity: 100;
-	}
-}
-
-:root {
-	--inputbg: #3c096c;
-	--inputborder: #5a189a;
-	--uibg: #240046;
-	--textcolor: #fff;
-	--bg: #10002b;
-	--margin: 4rem;
-}
-.hiddenUpload {
-	display: none;
-	visibility: hidden;
-}
-* {
-	transition-duration: 0.5s;
-	outline: none;
-	border: none;
-	box-sizing: border-box;
-	align-content: center;
-	text-align: center;
-	font-family: "Prompt", sans-serif;
-	color: var(--textcolor);
-}
-body {
-	margin: 0;
-	padding: 0;
-	background: var(--bg);
-	color: var(--textcolor);
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: cover;
-	background-attachment: fixed;
-}
-
-header,
-footer {
-    background-color: var(--uibg);
-    display: flex;
-	border-bottom: none;
-	font-weight:700;
-    padding: 0.7rem;
-    width: 100%;
-    z-index: 1;
-    justify-content: center;
-    text-align: center; 
-    text-decoration: none;
-}
-
-#time {
-font-weight:100;
-}
-header {
-    top: 0;
-    border-radius: 0 0 20px 20px;
-    position: fixed;
-    box-shadow: 0 5px 10px var(--uibg);
-}
-
-footer.noscroll {
-    position: fixed;
-    overflow: hidden;
-}
-
-footer {
-    bottom: 0;
-    border-radius: 20px 20px 0 0;
-    box-shadow: 0 -5px 10px var(--uibg);
-}
-
-footer a,
-footer a:visited,
-header a,
-header a:visited {
-    margin-right: 1.5rem;
-    margin-left: 1.5rem;
-	text-decoration: none;
-}
-
-footer a:hover,
-header a:hover {
-    text-shadow: 2px 2px 6px var(--textcolor);
-}
-
-
-@media only screen and (max-width: 768px) {
-    header,
-    footer {
-        flex-direction: column;
-        align-items: center;
-    }
-
-    header {
-        border-radius: 0;
-    }
-
-    footer {
-        border-radius: 0;
-    }
-	* {
-		--margin: 12rem;
-	}
-}
-
-main {
-	animation: 1.25s ease-in-out 0s 1 loadInAnimation;
-	align-items: center;
-	flex-direction: column;
-	display: flex;
-	min-height: calc(100vh - (2 * 0.7rem));
-	gap: 0;
-	flex-wrap: wrap;
-	margin: auto;
-	margin-top: var(--margin);
-	width: 90%;
-	height:auto;
-}
-main#main.noscroll {
-	justify-content: center;
-}
-h1,
-h2,
-h3,
-p,
-a,
-label {
-	margin: 0;
-	padding: 0;
-	text-shadow: var(--shadow);
-}
-.samerow {
-	display: flex;
-	justify-content: center;
-	gap: 0;
-	flex-wrap: wrap;
-	align-items: center;
-	justify-content: center
-}
-h1 {
-	font-size: 60px;
-}
-
-h2 {
-	font-size: 40px;
-}
-h3 {
-	font-size: 20px;
-}
-p,
-a {
-	font-size: 16px;
-}
-
-button,
-input#websubmit.submit,
-input[type="submit"] {
-	cursor: pointer;
-	background-color: var(--inputbg);
-	border-color: var(--inputborder);
-	border-width: 2px;
-	border-radius: 10px;
-	border-style: solid;
-	padding: 7px;
-	margin-left: 20px;
-	margin-right: 20px;
-	margin: 10px;
-}
-
-button:hover,
-input#websubmit.submit:hover,
-input[type="submit"]:hover {
-	filter: brightness(80%);
-	transform: scale(1.07);
-}
-
-img {
-	width: 100%;
-	aspect-ratio: auto;
-	user-select: none;
-	filter: drop-shadow(var(--shadow));
-	image-rendering: pixelated;
-}
-
-.img-container a {
-	width: 100%;
-}
-
-.img-container {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: row;
-	gap: 0;
-	flex-wrap: wrap;
-	width: 6%;
-	aspect-ratio: 1 / 1;
-	margin: 2%;
-}
-
-.game,
-.suggest {
-	width: 15%;
-	border-radius: 20px;
-	display: inline-block;
-	background-color: var(--uibg);
-	margin: 15px;
-	cursor: pointer;
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-}
-
-.game:hover,
-.suggest:hover {
-	transform: scale(1.1);
-	filter: brightness(85%);
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-}
-
-.game h1,
-.suggest h1 {
-	font-size: 12px;
-	float: right;
-	margin-right: 10px;
-	margin-top: 3px;
-	margin-bottom: 3px;
-}
-
-.game img,
-.suggest img {
-	width: 100%;
-	border-radius: 20px;
-	aspect-ratio: 1 / 1;
-}
-
-img.star {
-	float: left;
-	width: 10%;
-	margin-top: 3px;
-	margin-bottom: 3px;
-	margin-left: 10px;
-}
-
-#noscroll {
-	overflow-y: hidden;
-	justify-content: center;
-}
-
-#games,
-#pinned {
-	width: 100%;
-	justify-content: center;
-}
-
-input[type="text"],
-input[type="password"] {
-	width: 50%;
-	background-color: var(--inputbg);
-	box-sizing: border-box;
-	font-size: 20px;
-	padding: 0.8% 0.8%;
-	text-align: center;
-	border-radius: 5px;
-	outline: none;
-	margin: 10px;
-	border: 2px solid var(--inputborder);
-	border-radius: 5px;
-	transition: opacity 0.25s ease-in-out;
-	opacity: 100%;
-}
-input[type="text"]:hover,
-input[type="password"]:hover {
-	opacity: 80%;
-}
-::placeholder {
-	color: var(--textcolor);
-	opacity: 0.4; /* Firefox */
-}
-
-.bookmarkletdiv {
-	width: 30%;
-	background-color: var(--uibg);
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-	padding: 5px;
-	margin: 15px;
-	border-radius: 10px;
-	display: inline-block;
-}
-
-.bookmarkletdiv a {
-	font-size: 30px;
-}
-
-form {
-	width: 100%;
-}
-.samerow.themebtns {
-	width: 70%;
-}
-
-select {
-	border-radius: 5px;
-	background-color: var(--inputbg);
-	border-color: var(--inputborder);
-	border-width: 5px;
-	border-radius: 10px;
-	border-style: solid;
-	padding: 0.5% 0.5%;
-	margin: 0.25%;
-}
-
-thumb.png .img-credits {
-	height: 40vh;
-	width: auto;
-	box-shadow: 0px 0px 20px rgba(255, 255, 255, 0.555);
-}
-
-label {
-	font-size: 20px;
-	padding-left: 5px;
-}
-.avatar {
-	margin: 5px;
-}
-#bgimg {
-	width: 30vw;
-	font-size: 16px;
-}
-.usericon {
-	width: 24px;
-	height: 24px;
-	align-self: right;
-	/* display: none; */
-}
-#toast {
-	position: fixed;
-	top: 0;
-	right: 0;
-	margin: 10px;
-	padding: 10px;
-	background-color: var(--inputbg);
-	border-radius: 10px;
-	border-width: 10px;
-	border-color: var(--inputborder);
-	border-style: solid;
-	z-index: 10000;
-	text-align: center;
-	opacity: 0;
-	transition-duration: 1s;
-	max-width: 30%;
-}
-#toast h1 {
-	font-size: 20px;
-	text-align: center;
-}
-#toast p {
-	font-size: 16px;
-	text-align: center;
-}
-#discord {
-	position: fixed;
-	bottom: 10px;
-	right: 10px;
-	width: 56px;
-	height: 56px;
-	z-index: 199975;
-	border-radius: 100%;
-	background-image: url("/img/discord.svg");
-	background-size: 60%;
-	background-position: center;
-	background-repeat: no-repeat;
-	border-width: 0;
-}
-
-div.profile.top {
-	width: 90%;
-	height: 20vh;
-	background-color: var(--uibg);
-	border-radius: 10px;
-	display: flex;
-	justify-content: left;
-	align-items: center;
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-}
-div.profile.top.text {
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	width: auto;
-	justify-self: center;
-	height: auto;
-	margin: 30px;
-	max-width: 40%;
-}
-
-div.profile.top.text.right {
-	margin-left: auto;
-	margin-right: 80px;
-}
-
-div.profile.top.text h1 {
-	font-size: 2vw;
-}
-div.profile.top.text h2 {
-	font-size: 1.25vw;
-}
-div.profile.top.text a {
-	font-size: 1.25vw;
-}
-
-img.pfp {
-    height: 80%;
-	object-fit: contain;
-	width: auto;
-	margin: 30px;
-	border-radius: 20px;
-	aspect-ratio: 1 / 1;
-}
-div.profile.top.text .about {
-	height: auto;
-	max-width: 100%;
-}
-
-#edit {
-	cursor: pointer;
-	position: relative;
-	height: 2vw;
-	margin-left: 5px;
-	width: auto;
-}
-#counter {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-}
-#popup {
-	width: 50%;
-	height: 40%;
-	z-index: 99999999;
-	position: absolute;
-	position: absolute;
-	top: 50%;
-	left: 50vw;
-	transform: translate(-50%, -50%);
-	display: flex;
-	flex-direction: column;
-	background-color: var(--inputbg);
-	border-color: var(--inputborder);
-	border-width: 5px;
-	border-radius: 10px;
-	border-style: solid;
-	justify-content: center;
-	align-items: center;
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-}
-#popup input {
-	width: 90%;
-	height: 30%;
-}
-#popup input[type=file] {
-	height: auto;
-	text-align-last: center;
-	display: block;
-	margin: 30px;
-}
-#popup h1 {
-	font-size: 32px;
-}
-
-#popup #close {
-	position: absolute;
-	right: 10px;
-	top: 10px;
-	
-}
-img.badges {
-	position: relative;
-	height: 2vw;
-	margin-left: 5px;
-	width: auto;
-}
-
-p#counter {
-	bottom: 38%;
-	right: 7%;
-}
-
-
-.users {
-	text-decoration: none;
-	width: 30%;
-	height: 10vh;
-	background-color: var(--uibg);
-	border-radius: 10px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-	margin: 1.5%;
-}
-.users h1, .users p {
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	width: 100%;
-	justify-self: center;
-	height: auto;
-	max-width: 100%;
-	margin: auto;
-}
-.user_info {
-	width: 100%;
-}
-
-.users h1 {
-	font-size: 1vw;
-}
-.users p {
-	font-size: 0.75vw;
-}
-.users a {
-	font-size: 0.75vw;
-	text-decoration: underline;
-}
-
-.users p {
-	height: auto;
-	max-width: 100%;
-}
-#users {
-	width: 95%;
-	display: flex;
-	align-items: center;
-	flex-wrap: wrap;
-	flex-direction: row;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.pages-btn {
-	margin: 10px;
-}
-#ai {
-	position: absolute;
-	right: 10px;
-	bottom: 10px;
-}
-
-div.profile.played {
-	margin: 40px;
-	width: 90%;
-	height: auto;
-	padding: 30px;
-	background-color: var(--uibg);
-	border-radius: 10px;
-	display: flex;
-	justify-content: left;
-	align-items: center;
-	box-shadow: 0px 0px 5px 5px var(--uibg);
-	justify-content: center;
-    flex-wrap: wrap;
-	
-}
-#played-games {
-	width: 100%;
-	display: flex;
-    flex-wrap: wrap;
-	justify-content: center;
-}
-div.played-game {
-	width: 13%;
-	height: auto;
-	margin: 2%;
-	padding: 0;
-}
-div.played-game img {
-	aspect-ratio: 1 / 1;
-	border-radius: 20px;
-}
-.friend-icon {
-	width: 5%;
-	position: absolute;
-	left: 2%;
-}
-#chat {
-	width: 90%;
-	background-color: var(--uibg);
-	height: calc(100vh - (var(--margin) * 2) - 60px - 24px - 12px - 30px - 80px);
-}
-#messages {
-	align-items: end;
-	flex-direction: column;
-	overflow-y: scroll;
-	overflow-x: hidden;
-	height: 88%;
-	display: flex;
-}
-message {
-	width: calc(100% - 20px);
-	padding: 20px;
-	margin: 10px;
-	background-color: var(--inputbg);
-	border-radius: 10px;
-}
-message h1 {
-	font-size: 40px;
-}
-message h2 {
-	font-size: 32px;
-}
-message.user {
-	background-color: var(--inputborder);
-}
-message.bot {
-	justify-self: right;
-}
-#chatbox {
-	width: calc(100% - 20px);
-}
-.messagebox {
-	width: 100%;
-	height: 12%;
-}
-.evensmaller {
-	font-size: 12px;
-}
-#gamecontainer {
-	width: 80vw;
-	height: calc(100vh - (var(--margin) * 2));
-	padding: 10px;
-	border-radius: 10px;
-	background-color: var(--uibg);
-}
-#gameFrame {
-	width: 100%;
-	height: 90%;
-	border-radius: 10px;
-	margin: 0;
-	padding: 0;
-}
-#infobox {
-	width: 100%;
-	height: 10%;
-	display: flex;
-}
-#infobox img {
-	height: 90%;
-	width: auto;
-	margin-right: 20px;
-	border-radius: 10px;
-}
-@keyframes toastFade {
-	0% {
-		opacity: 0;
-	}
-	15% {
-		opacity: 1;
-	}
-	85% {
-		opacity: 1;
-	}
-	100% {
-		opacity: 0;
-	}
-}
\ No newline at end of file
diff --git a/css/themes.css b/css/themes.css
old mode 100644
new mode 100755
index 1ce53e8..22f0a1c
--- a/css/themes.css
+++ b/css/themes.css
@@ -1,300 +1,3 @@
-<<<<<<< HEAD
-:root {
-     --inputbg: #3c096c;
-    --inputborder: #5a189a;
-    --uibg: #240046;
-    --textcolor: #fff;
-    --bg: #10002b;
-}
-body {
- --inputbg: #3c096c;
-    --inputborder: #5a189a;
-    --uibg: #240046;
-    --textcolor: #fff;
-    --bg: #10002b;
-}
-body[theme=threekho] {
- --inputbg: #28A018;
-    --inputborder: #0A8F00;
-    --uibg: #111111;
-    --textcolor: #fff;
-    --bg: #000000;
-}
-body[theme=art] {
-    --inputbg: #0284d4;
-    --inputborder: #0284d4;
-    --uibg: #0e1213;
-    --textcolor: #fffff;
-    --bg: #1a2023;
-}
-body[theme=dogcat] {
-    --inputbg: #537294;
-    --inputborder: #30719c;
-    --uibg: #2a7491;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/dogcat.svg"), rgb(26, 127, 158);
-  /* https://wallpaperaccess.com/full/115544.jpg */
-}
-body[theme=custom] {
-    --inputbg: #3c096c;
-    --inputborder: #5a189a;
-    --uibg: #240046;
-    --textcolor: #fff;
-    --bg: #10002b;
-}
-body[theme=mainnew] {
-    --inputbg: #3c096c;
-    --inputborder: #5a189a;
-    --uibg: #240046bb;
-    --textcolor: #fff;
-    --bg: linear-gradient(0deg, rgba(36,0,70,1) 0%, rgba(60,9,108,1) 50%, rgba(36,0,70,1) 100%);
-}
-body[theme=main] {
-    --inputbg: #3c096c;
-    --inputborder: #5a189a;
-    --uibg: #240046bb;
-    --textcolor: #fff;
-    --bg: #10002b;
-}
-body[theme=light] {
-    --inputbg: #bbbbbb;
-    --inputborder: #e6e6e6;
-    --uibg: #b3b3b3;
-    --textcolor: #1a1a1a;
-    --bg: #c5c5c5;
-}
-body[theme=dark] {
-    --inputbg: #333333;
-    --inputborder: #444444;
-    --uibg: #242424;
-    --textcolor: #fff;
-    --bg: #0c0c0c;
-}
-body[theme=egamepass] {
-    --inputbg: #4f6ed1;
-    --inputborder: #5586e0;
-    --uibg: #185494;
-    --textcolor: #a7d3ff;
-    --bg: #16416f;
-}
-body[theme=cools1te] {
-    --inputbg: #a134dc;
-    --inputborder: #b153e3;
-    --uibg: #ab28cf;
-    --textcolor: #d3a4fa;
-    --bg: #8e14af;
-}
-
-
-body[theme=lattefalse] {
-    --inputbg: #9ca0b0;
-    /* overlay 0 */
-    --inputborder: #8c8fa1;
-    /* overlay 1 */
-    --uibg: #ccd0da;
-    /* surface  0 */
-    --textcolor: #4c4f69;
-    /* text */
-    --bg: #eff1f5;
-    /* base */
-    --shadow: 0px 0px 4px #ccd0da;
-    /* surface 0 */
-}
-body[theme=frappefalse] {    
-    --inputbg: #737994;
-    /* overlay 0 */
-    --inputborder: #838ba7;
-    /* overlay 1 */
-    --uibg: #414559;
-    /* surface  0 */
-    --textcolor: #cad3f5;
-    /* text */
-    --bg: #303446;
-    /* base */
-    --shadow: 0px 0px 4px #414559;
-    /* surface 0 */
-}
-body[theme=macchiatofalse] {
-    --inputbg: #6e738d;
-    /* overlay 0 */
-    --inputborder: #8087a2;
-    /* overlay 1 */
-    --uibg: #363a4f;
-    /* surface  0 */
-    --textcolor: #cad3f5;
-    /* text */
-    --bg: #24273a;
-    /* base */
-    --shadow: 0px 0px 4px #363a4f;
-    /* surface 0 */
-}
-body[theme=mochafalse] {
-    --inputbg: #6c7086;
-    /* overlay 0 */
-    --inputborder: #7f849c;
-    /* overlay 1 */
-    --uibg: #313244;
-    /* surface  0 */
-    --textcolor: #cdd6f4;
-    /* text */
-    --bg: #1e1e2e;
-    /* base */
-    --shadow: 0px 0px 4px #313244;
-    /* surface 0 */
-}
-
-body[theme=sunsetfalse] {
-    --inputbg: #537294;
-    --inputborder: #30719c;
-    --uibg: #2a7491;
-    --textcolor: #fff;
-    --bg: rgb(59, 67, 78);
-    /* https://wallhaven.cc/w/jxl3qp */
-    --shadow: 0px 0px 2px #a5dcf5;
-}
-body[theme=mountainsfalse] {
-    --inputbg: #d37f7f;
-    --inputborder: #e28a8a;
-    --uibg: #d38493;
-    --textcolor: #fff;
-    --bg: #bf7483;
-    /* https://wallhaven.cc/w/l82kpr */
-    --shadow: 0px 0px 4px #bba29b;
-}
-body[theme=vaporwavefalse] {
-    --inputbg: #4b2d64;
-    --inputborder: #74568d;
-    --uibg: #51166d;
-    --textcolor: #fff;
-    --bg: #61437a;
-    /* https://wallhaven.cc/w/l82kpr */
-    --shadow: 0px 0px 4px #000000;
-}
-body[theme=seraphfalse] {
-    --inputbg: #000;
-    --inputborder: #fff;
-    --uibg: #000;
-    --textcolor: #fff;
-    --bg: #222222;
-    /* seraph */
-    --shadow: 0px 0px 4px #fff;
-}
-body[theme=nighttimefalse] {
-    --inputbg: #29374d;
-    --inputborder: #fff;
-    --uibg: #29374d;
-    --textcolor: #fff;
-    --bg: #323853;
-    /* https://wallhaven.cc/w/l882py */
-    --shadow: 0px 0px 4px #fff;
-}
-
-
-
-body[theme=latte] {
-    --inputbg: #9ca0b0;
-    /* overlay 0 */
-    --inputborder: #8c8fa1;
-    /* overlay 1 */
-    --uibg: #ccd0da;
-    /* surface  0 */
-    --textcolor: #4c4f69;
-    /* text */
-    --bg: #eff1f5;
-    /* base */
-    --shadow: 0px 0px 4px #ccd0da;
-    /* surface 0 */
-}
-body[theme=frappe] {
-    --inputbg: #737994;
-    /* overlay 0 */
-    --inputborder: #838ba7;
-    /* overlay 1 */
-    --uibg: #414559;
-    /* surface  0 */
-    --textcolor: #cad3f5;
-    /* text */
-    --bg: #303446;
-    /* base */
-    --shadow: 0px 0px 4px #414559;
-    /* surface 0 */
-}
-body[theme=macchiato] {
-    --inputbg: #6e738d;
-    /* overlay 0 */
-    --inputborder: #8087a2;
-    /* overlay 1 */
-    --uibg: #363a4f;
-    /* surface  0 */
-    --textcolor: #cad3f5;
-    /* text */
-    --bg: #24273a;
-    /* base */
-    --shadow: 0px 0px 4px #363a4f;
-    /* surface 0 */
-}
-body[theme=mocha] {
-    --inputbg: #6c7086;
-    /* overlay 0 */
-    --inputborder: #7f849c;
-    /* overlay 1 */
-    --uibg: #313244;
-    /* surface  0 */
-    --textcolor: #cdd6f4;
-    /* text */
-    --bg: #1e1e2e;
-    /* base */
-    --shadow: 0px 0px 4px #313244;
-    /* surface 0 */
-}
-
-body[theme=sunset] {
-    --inputbg: #537294;
-    --inputborder: #30719c;
-    --uibg: #2a7491;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/sunset_theme.jpg"), rgb(59, 67, 78);
-    /* https://wallhaven.cc/w/jxl3qp */
-    --shadow: 0px 0px 2px #a5dcf5;
-}
-body[theme=mountains] {
-    --inputbg: #d37f7f;
-    --inputborder: #e28a8a;
-    --uibg: #d38493;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/mountains_theme.jpg"), #bf7483;
-    /* https://wallhaven.cc/w/l82kpr */
-    --shadow: 0px 0px 4px #bba29b;
-}
-body[theme=vaporwave] {
-    --inputbg: #4b2d64;
-    --inputborder: #74568d;
-    --uibg: #51166d;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/vaporwave_theme.jpg"), #61437a;
-    /* https://wallhaven.cc/w/l82kpr */
-    --shadow: 0px 0px 4px #000000;
-}
-body[theme=seraph] {
-    --inputbg: #000;
-    --inputborder: #fff;
-    --uibg: #000;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/seraph_theme.png"), #1c1a1e;
-    /* seraph */
-    --shadow: 0px 0px 4px #fff;
-}
-body[theme=nighttime] {
-    --inputbg: #29374d;
-    --inputborder: #fff;
-    --uibg: #29374d;
-    --textcolor: #fff;
-    --bg: url("/img/backgrounds/nighttime_theme.png"), #28272a;
-    /* https://wallhaven.cc/w/l882py */
-    --shadow: 0px 0px 4px #fff;
-}
-
-=======
 body {
     --text-color: #fff;
     --bg-1: #5a189a;
@@ -303,5 +6,4 @@ body {
     --color-2: #7B2CBF;
     --color-3: #3C096C;
     --color-4: #240046;
-}
->>>>>>> c2041b6 (first dev commit)
+}
\ No newline at end of file
diff --git a/dmca/2025-03-04 Microsoft.txt b/dmca/2025-03-04 Microsoft.txt
deleted file mode 100644
index b1a948d..0000000
--- a/dmca/2025-03-04 Microsoft.txt	
+++ /dev/null
@@ -1,17 +0,0 @@
-To Whom It may concern:
-
-We hereby notify you on behalf of Microsoft Corporation, (“Microsoft Corporation”) that the following URL https://selenite.cc/semag/eaglercraft/index.html, https://selenite.cc/semag/1defense/index.html (the “URL”) which you are hosting contains content (the “Infringing Content”) which infringes the copyright, intellectual property rights, goodwill and reputation of Microsoft Corporation, including the following copyright (the “MINECRAFT Copyright”) owned by Microsoft Corporation, found on Microsoft Corporation’s website at https://www.minecraft.net/:
-
-Copyright: MINECRAFT
-
-The URL’s Infringing Content constitutes an infringement of Microsoft Corporation’s intellectual property rights in the MINECRAFT Copyright.  This damages the goodwill and reputation of Microsoft Corporation and causes consumer confusion as to whether the Infringing Content is authorized, endorsed, or sponsored by Microsoft Corporation when, in fact, it is not.  Microsoft Corporation has an obligation to the public to police against any copyright infringing content which may cause marketplace confusion.  Such actions by the URL dilute Microsoft Corporation’s MINECRAFT Copyright, harm its associated goodwill, and constitute, inter alia, a misappropriation and violation of the rights of Microsoft Corporation.  This damage to its business entitles Microsoft Corporation to various forms of relief, including monetary compensation.
-
-We represent under penalty of perjury that the information in this notice is true and correct, and that we are authorized to act on behalf of Microsoft Corporation as owner of the MINECRAFT Copyright. We have a good faith belief that this use of the Infringing Content in the URL is not authorized by Microsoft Corporation as the owner of the MINECRAFT Copyright or its agents, nor is such use permissible by law.  Use of such Infringing Content in the URL is not defensible.  We have notified the registrant and registrar of the URL’s domain in writing of this matter.
-
-Since you are hosting the URL containing the Infringing Content, we request that you immediately disable or suspend such URL without delay.  We would appreciate your resolving this matter as soon as possible and confirming that you have done so within the next seven (7) days.  Microsoft Corporation reserves the right to take whatever action it considers appropriate to protect its rights and nothing contained in this Notice is intended to constitute a waiver of any of Microsoft Corporation’s legal rights or remedies, all of which are hereby expressly reserved.
-
-Please let us know if you need any additional information.
-
-Sincerely,
-
-[ REDACTED ]
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
old mode 100644
new mode 100755
diff --git a/favicon.png b/favicon.png
old mode 100644
new mode 100755
diff --git a/img/addlink.svg b/img/addlink.svg
old mode 100644
new mode 100755
diff --git a/img/backgrounds/compress images PLEASE b/img/backgrounds/compress images PLEASE
old mode 100644
new mode 100755
diff --git a/img/backgrounds/dogcat.svg b/img/backgrounds/dogcat.svg
old mode 100644
new mode 100755
diff --git a/img/backgrounds/mountains_theme.jpg b/img/backgrounds/mountains_theme.jpg
old mode 100644
new mode 100755
diff --git a/img/backgrounds/nighttime_theme.png b/img/backgrounds/nighttime_theme.png
old mode 100644
new mode 100755
diff --git a/img/backgrounds/seraph_theme.png b/img/backgrounds/seraph_theme.png
old mode 100644
new mode 100755
diff --git a/img/backgrounds/sunset_theme.jpg b/img/backgrounds/sunset_theme.jpg
old mode 100644
new mode 100755
diff --git a/img/backgrounds/vaporwave_theme.jpg b/img/backgrounds/vaporwave_theme.jpg
old mode 100644
new mode 100755
diff --git a/img/badges/banana.svg b/img/badges/banana.svg
old mode 100644
new mode 100755
diff --git a/img/badges/dev.svg b/img/badges/dev.svg
old mode 100644
new mode 100755
diff --git a/img/badges/donate.svg b/img/badges/donate.svg
old mode 100644
new mode 100755
diff --git a/img/badges/mod.svg b/img/badges/mod.svg
old mode 100644
new mode 100755
diff --git a/img/badges/owner.svg b/img/badges/owner.svg
old mode 100644
new mode 100755
diff --git a/img/badges/partner.svg b/img/badges/partner.svg
old mode 100644
new mode 100755
diff --git a/img/badges/trans.svg b/img/badges/trans.svg
old mode 100644
new mode 100755
diff --git a/img/copy.svg b/img/copy.svg
old mode 100644
new mode 100755
diff --git a/img/discord.svg b/img/discord.svg
old mode 100644
new mode 100755
diff --git a/img/edit.svg b/img/edit.svg
old mode 100644
new mode 100755
diff --git a/img/friend.svg b/img/friend.svg
old mode 100644
new mode 100755
diff --git a/img/games.svg b/img/games.svg
index 64fa48d..0ad6041 100644
--- a/img/games.svg
+++ b/img/games.svg
@@ -1,7 +1 @@
-<<<<<<< HEAD
-<svg width="1080" height="1080" xmlns="http://www.w3.org/2000/svg">
-  <image href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAQAAABIkb+zAAACpUlEQVR42u2aO08UURiGT6MNuMslJoSOhp5rIpJg4i8gIYGFAhujFaWCcvkRxgaK5VISqPQXyIKthoJCQ8ImJLBbkKBRLsljh6Lu7veduZ3ie+o577zPZmfmzDnjnGEYhmEYhmEYhmEYIsgxxgolDrkgLi44pMQKY+SSLd9NkUuS5JIi3cmUb2KZa9LgmmWa4q7fwwFpckBPnPWHOCdtzhmKq/4AZ2TBGQNx1M9zRFYckY8uUCRLilHrD5M1w9EEtjMX2I5SvyulO3/9p0KXv8BM5vUBZvwFNhun3xwrp0yBDjooUBYdv+kvcJyAQJn2mzHtIoVj3/ptkj5qgcKtcxREY9r8BAYTEei8dY5O0ZhBP4HJYAQm/QSWgvkLLfkJbCQioL+IYcNPYC8RAf1tFPb8BKr1CjccHSdVn/qt9X/xVAWgVS8wEJSA/tWm1v0hI4GCXmBRlhxDYclFvagXWE9JQHZbXdcL7KYkIHuw7eoFKikJyKYWFW39Fun5UxKAFp1Af2oC0rlRv05gIjUB6dxoQiewkJqAdG60oBNYIzTWdAKl4ARKOoHT4ARONfXzwdUHFAu99AUp0CcXGA9SYFwuMB+kwLxcYDVIgVW5wE6QAjtygZMgBU6k9XNB1geE+/j0BivQKxMY9YhWL/7JFi7/YlQWPaUO1r9y+ylMyYKnlbELzhO1wrQs9qEq9LWLgFJB9vEBzVyJI1+5iCgUrmiWhkp3h+dcDIgVtuSRI6LAWRcTQoURTWTj2dBLFyMCBd1XE+T4XDfuhYuZBgqfuKcNbONjjbCfPHEJwPOa3+PteewPOMdd5vj+T9gH5RKT5owP/rOt9Y1Z7vhH3ucZ7/nKBRX2ecMjlzA85i37VPnBF97x9Peyl2EYhmEYhmEYhmEYf/ILpJ54reMDuewAAAAASUVORK5CYII=" height="1080" width="1080" />
-</svg>
-=======
 <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#FFFFFF"><path d="M189-160q-60 0-102.5-43T42-307q0-9 1-18t3-18l84-336q14-54 57-87.5t98-33.5h390q55 0 98 33.5t57 87.5l84 336q2 9 3.5 18.5T919-306q0 61-43.5 103.5T771-160q-42 0-78-22t-54-60l-28-58q-5-10-15-15t-21-5H385q-11 0-21 5t-15 15l-28 58q-18 38-54 60t-78 22Zm3-80q19 0 34.5-10t23.5-27l28-57q15-31 44-48.5t63-17.5h190q34 0 63 18t45 48l28 57q8 17 23.5 27t34.5 10q28 0 48-18.5t21-46.5q0 1-2-19l-84-335q-7-27-28-44t-49-17H285q-28 0-49.5 17T208-659l-84 335q-2 6-2 18 0 28 20.5 47t49.5 19Zm348-280q17 0 28.5-11.5T580-560q0-17-11.5-28.5T540-600q-17 0-28.5 11.5T500-560q0 17 11.5 28.5T540-520Zm80-80q17 0 28.5-11.5T660-640q0-17-11.5-28.5T620-680q-17 0-28.5 11.5T580-640q0 17 11.5 28.5T620-600Zm0 160q17 0 28.5-11.5T660-480q0-17-11.5-28.5T620-520q-17 0-28.5 11.5T580-480q0 17 11.5 28.5T620-440Zm80-80q17 0 28.5-11.5T740-560q0-17-11.5-28.5T700-600q-17 0-28.5 11.5T660-560q0 17 11.5 28.5T700-520Zm-360 60q13 0 21.5-8.5T370-490v-40h40q13 0 21.5-8.5T440-560q0-13-8.5-21.5T410-590h-40v-40q0-13-8.5-21.5T340-660q-13 0-21.5 8.5T310-630v40h-40q-13 0-21.5 8.5T240-560q0 13 8.5 21.5T270-530h40v40q0 13 8.5 21.5T340-460Zm140-20Z"/></svg>
->>>>>>> c2041b6 (first dev commit)
diff --git a/img/pfps/3kh0.webp b/img/pfps/3kh0.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/astra.webp b/img/pfps/astra.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/awesome.webp b/img/pfps/awesome.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/ayo.webp b/img/pfps/ayo.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/buttsfart.webp b/img/pfps/buttsfart.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/caidn.webp b/img/pfps/caidn.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/compass.png b/img/pfps/compass.png
old mode 100644
new mode 100755
diff --git a/img/pfps/dire.webp b/img/pfps/dire.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/legalise.webp b/img/pfps/legalise.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/lunar.webp b/img/pfps/lunar.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/math.webp b/img/pfps/math.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/night.webp b/img/pfps/night.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/ocular.webp b/img/pfps/ocular.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/shadow.webp b/img/pfps/shadow.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/sky.webp b/img/pfps/sky.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/snor.webp b/img/pfps/snor.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/ultra.webp b/img/pfps/ultra.webp
old mode 100644
new mode 100755
diff --git a/img/pfps/wrnd.gif b/img/pfps/wrnd.gif
old mode 100644
new mode 100755
diff --git a/img/selenite192.png b/img/selenite192.png
old mode 100644
new mode 100755
diff --git a/img/selenite512.png b/img/selenite512.png
old mode 100644
new mode 100755
diff --git a/img/star-fill.svg b/img/star-fill.svg
old mode 100644
new mode 100755
diff --git a/img/star.svg b/img/star.svg
old mode 100644
new mode 100755
diff --git a/img/user.svg b/img/user.svg
old mode 100644
new mode 100755
diff --git a/img/user_index.svg b/img/user_index.svg
old mode 100644
new mode 100755
diff --git a/index.html b/index.html
old mode 100644
new mode 100755
index de9958d..93510d6
--- a/index.html
+++ b/index.html
@@ -32,87 +32,18 @@
             ]
         }
     </script>
-<<<<<<< HEAD
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
-		<script src=" https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.min.js "></script>
-
-		<!-- initialize my stuff -->
-		<script src="/js/all.min.js"></script>
-		<script src="/js/main.js"></script>
-		<script src="/js/widget.js"></script>
-		<script>
-			document.addEventListener("DOMContentLoaded", () => {
-				fetch("/data/quotes.json")
-					.then((response) => response.json())
-					.then((data) => {
-						const randomQuote = data[Math.floor(Math.random() * data.length)];
-
-						if (randomQuote.includes("OGNUM1") && randomQuote.includes("SQRTNUM1")) {
-							const ognum = Math.floor(Math.random() * 3000);
-							randomQuote = `the square root of ${ognum} is ${Math.sqrt(ognum)}`;
-						} else if (randomQuote.includes("CURRENTURL")) {
-							randomQuote = window.location.hostname;
-						}
-
-						document.getElementById("randomquote").innerHTML = randomQuote;
-					})
-					.catch((error) => console.error("Error loading quotes:", error));
-			});
-		</script>
-
-		<link rel="stylesheet" href="/style.css" />
-=======
 
 		<!-- initialize my stuff -->
 		<script src="/js/all.js"></script>
 
 		<link rel="stylesheet" href="/css/main.css" />
 		<link rel="stylesheet" href="/css/sidebar.css" />
->>>>>>> c2041b6 (first dev commit)
 		<link rel="manifest" href="/manifest.json" />
 
 		<!-- seo + other things -->
 		<title>Selenite</title>
 		<link rel="icon" href="/favicon.ico" />
 		<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-3415518411898563" crossorigin="anonymous"></script>
-<<<<<<< HEAD
-	</head>
-	<alerts> </alerts>
-	<body id="noscroll">
-		<header>
-			<a href="/index.html">Home</a>
-			<a href="/bookmarklets.html">Bookmarklets</a>
-			<a href="/projects.html" title="Games (Unblocked)">Games</a>
-			<a href="/apps.html">Apps</a>
-			<a href="/settings.html">Settings</a>
-			<a id="blank" href="#">Open Blank</a>
-			<a href="/u/" class="usericon"><img src="/img/user.svg" /></a>
-		</header>
-		<main id="main" class="noscroll">
-			<b style="font-weight: 1000px"><h1 class="chan">selenite.</h1></b>
-			<noscript>enable javascript if you want the games to actually load</noscript>
-			<p id="randomquote">better thank me for this unblocked website</p>
-			<div class="samerow">
-				<div class="img-container">
-					<a href="/users"><img src="img/user_index.svg" /></a>
-				</div>
-				<div class="img-container">
-					<a href="projects.html"><img src="img/games.svg" /></a>
-				</div>
-				<div class="img-container">
-					<a href="https://discord.gg/7jyufnwJNf"><img src="img/discord.svg" /></a>
-				</div>
-			</div>
-		</main>
-		<footer class="noscroll">
-			<a href="gitlab.com/skysthelimit.dev/selenite">Source</a>
-			<a href="https://discord.gg/7jyufnwJNf">Discord</a>
-			<a href="/suggest.html">Suggestions & Bugs</a>
-			<a href="/contact.html">Contact</a>
-			<a href="/support.html">Donate</a>
-			<a href="/about.html">About</a>
-		</footer>
-=======
 		<script>
 			document.addEventListener("DOMContentLoaded", ()=>{
 				document.getElementById("iframe").addEventListener("load", () => {
@@ -158,6 +89,5 @@
 			<div class="sidebar-item"><a href="#" target="/u/"><img src="/img/user.svg" /></a><div class="sidebar-item-descriptor">user profile</div></div> <!-- user -->
 			<div class="sidebar-item"><a href="#" target="/settings"><img src="/img/settings.svg" /></a><div class="sidebar-item-descriptor">settings</div></div> <!-- settings -->
         </sidebar>
->>>>>>> c2041b6 (first dev commit)
 	</body>
 </html>
diff --git a/index.js b/index.js
deleted file mode 100644
index ceba854..0000000
--- a/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const express = require('express');
-const path = require('path');
-
-const app = express();
-const port = process.env.PORT || 3000;
-
-
-app.use(express.static(__dirname));
-
-app.get('/projects', (req, res) => {
-  res.sendFile(path.join(__dirname, 'projects.html'));
-});
-
-app.get('/bookmarklets', (req, res) => {
-  res.sendFile(path.join(__dirname, 'bookmarklets.html'));
-});
-
-app.get('/settings', (req, res) => {
-  res.sendFile(path.join(__dirname, 'settings.html'));
-});
-
-app.get('/support', (req, res) => {
-  res.sendFile(path.join(__dirname, 'support.html'));
-});
-
-app.get('/about', (req, res) => {
-  res.sendFile(path.join(__dirname, 'about.html'));
-});
-
-app.get('/transfer', (req, res) => {
-  res.sendFile(path.join(__dirname, 'transfer.html'));
-});
-
-app.get('/suggest', (req, res) => {
-  res.sendFile(path.join(__dirname, 'suggest.html'));
-});
-
-app.get('/contact', (req, res) => {
-  res.sendFile(path.join(__dirname, 'contact.html'));
-});
-
-app.get('/ad', (req, res) => {
-  res.sendFile(path.join(__dirname, 'ad.html'));
-});
-
-app.get('/blank', (req, res) => {
-  res.sendFile(path.join(__dirname, 'blank.html'));
-});
-app.get('/backgrounds', (req, res) => {
-  res.sendFile(path.join(__dirname, 'backgrounds.html'));
-});
-
-app.listen(port, () => {
-  console.log(`Selenite is running on port ${port}`);
-});
diff --git a/js/all.js b/js/all.js
old mode 100644
new mode 100755
diff --git a/js/all.min.js b/js/all.min.js
old mode 100644
new mode 100755
diff --git a/js/analytics.js b/js/analytics.js
old mode 100644
new mode 100755
diff --git a/js/apps.js b/js/apps.js
old mode 100644
new mode 100755
diff --git a/js/asteroids.js b/js/asteroids.js
old mode 100644
new mode 100755
diff --git a/js/bootstrap.css b/js/bootstrap.css
old mode 100644
new mode 100755
diff --git a/js/bootstrap.min.css b/js/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/js/cloaks.js b/js/cloaks.js
old mode 100644
new mode 100755
diff --git a/js/cookie.js b/js/cookie.js
old mode 100644
new mode 100755
diff --git a/js/cookieConsent.css b/js/cookieConsent.css
old mode 100644
new mode 100755
diff --git a/js/cookieConsent.js b/js/cookieConsent.js
old mode 100644
new mode 100755
diff --git a/js/debug.js b/js/debug.js
old mode 100644
new mode 100755
diff --git a/js/dogeminersave.txt b/js/dogeminersave.txt
old mode 100644
new mode 100755
diff --git a/js/games.js b/js/games.js
old mode 100644
new mode 100755
index 0c0ede6..d81f444
--- a/js/games.js
+++ b/js/games.js
@@ -1,204 +1,3 @@
-<<<<<<< HEAD
-$.getJSON("/data/games.json", function (data) {
-	if (document.readyState === "complete") {
-		loadGames(data);
-	} else {
-		let areGamesReady = setInterval(() => {
-			if (document.readyState === "complete") {
-				loadGames(data);
-				clearInterval(areGamesReady);
-			}
-		}, 50);
-	}
-});
-
-function loadGames(data) {
-	starredgames = getCookie("starred");
-	if (!starredgames) {
-		starredgames = [];
-	} else {
-		starredgames = JSON.parse(decodeURIComponent(getCookie("starred")));
-	}
-	$("#gamesearch").prop({
-		placeholder: "Click here to search through our " + data.length + " games!",
-	});
-	data.sort(dynamicSort("name"));
-	gamelist = data;
-	for (let i = 0; i < data.length; i++) {
-		let $element = $("<a>")
-			.attr({
-				class: "game",
-				id: data[i].directory,
-				recommended: data[i].recommended,
-				// href: "loader.html#" + btoa(encodeURIComponent(JSON.stringify([data[i].directory, data[i].image, data[i].name]))),
-				href: "semag/" + data[i].directory + "/index.html",
-			})
-			.data("recommended", data[i].recommended)
-			.append(
-				$("<img>").prop({
-					src: "semag/" + data[i].directory + "/" + data[i].image,
-					alt: data[i].name + " logo",
-					loading: "lazy"
-				})
-			)
-			.append($("<h1>").text(data[i].name))
-			.append(
-				$("<img>").prop({
-					src: "img/star.svg",
-					alt: "star",
-					class: "star",
-				})
-			);
-
-		if (starredgames.includes(data[i].directory)) {
-			$element.find("img.star").attr("id", "starred");
-			$element.find("img.star").attr("src", "img/star-fill.svg");
-			let $pinnedelement = $element.clone();
-			$("#pinned").append($pinnedelement);
-			if ($("#pinnedmessage")) {
-				$("#pinnedmessage").hide();
-			}
-		}
-
-		$("#games").append($element);
-	}
-	$("#games #message").remove();
-
-	if ((search = 1)) {
-		var txt = $("#gamesearch").val();
-		if (txt == "") {
-			$("#games .suggest").show();
-		} else {
-			$("#games .suggest").hide();
-		}
-		$("#games .game").hide();
-		$("#games .game").each(function () {
-			if ($(this).text().toUpperCase().indexOf(txt.toUpperCase()) != -1 || $(this).attr("id").toUpperCase().indexOf(txt.toUpperCase()) != -1) {
-				$(this).show();
-			}
-		});
-	}
-
-	// starred games
-	let starred;
-	$(document).on("click", "img.star", function (event) {
-
-	});
-	$(document).on("click", ".game", function (event) {
-		if ($(event.target).is("img.star")) {
-			event.preventDefault();
-			event.stopPropagation();
-			if (!$(event.target).attr("id")) {
-				$(event.target).prop({ id: "starred" });
-				$(event.target).prop({ src: "img/star-fill.svg" });
-				starred = Cookies.get("starred");
-				if (starred) {
-					starred = JSON.parse(starred);
-				} else {
-					starred = [];
-				}
-				starred.push($(this).attr("id"));
-				Cookies.set("starred", JSON.stringify(starred));
-				$element = $(this).clone();
-				$("#pinned").append($element);
-				$("#pinnedmessage").hide();
-				temp = $("#pinned")[0].childNodes;
-				pinnedarray = [...temp];
-				pinnedarray.sort(dynamicSort("id"));
-				$("#pinned").empty();
-				for (let i = 0; i < pinnedarray.length; i++) {
-					pinnedarraynodes = pinnedarray[i].childNodes;
-					pinnedarraynodes = [...pinnedarraynodes];
-					let $element = $("<div>")
-						.prop({
-							class: "game",
-							id: pinnedarray[i].id,
-						})
-						.append(
-							$("<img>").prop({
-								src: pinnedarraynodes[0].src,
-								alt: pinnedarraynodes[0].alt,
-								class: "gameicon",
-							})
-						)
-						.append($("<h1>").text(pinnedarraynodes[1].innerHTML))
-						.append(
-							$("<img>").prop({
-								src: "img/star-fill.svg",
-								alt: "star",
-								class: "star",
-								id: "starred",
-							})
-						);
-					$("#pinned").append($element);
-				}
-			} else {
-				$(event.target).removeAttr("id");
-				$(event.target).attr("src", "img/star.svg");
-				$thisdiv = "#" + $(this).attr("id");
-				$thisdiv = $thisdiv.replace(".", "\\.");
-				starred = Cookies.get("starred");
-				starred = JSON.parse(starred);
-				ourindex = starred.indexOf($(this).attr("id"));
-				starred.splice(ourindex, 1);
-				Cookies.set("starred", JSON.stringify(starred));
-				$("#pinned " + $thisdiv).remove();
-				if ($("#pinned").is(":empty")) {
-					$("#pinnedmessage").show();
-				}
-				$($thisdiv + " #starred").attr("src", "img/star.svg");
-				$($thisdiv + " #starred").removeAttr("id");
-			}
-		}
-	});
-	$(document).on("click", "#game img .star", function (event) {
-		event.stopPropagation();
-		$(this).prop({ class: "material-symbols-outlined fill" });
-	});
-}
-
-function redirectGame(dir) {
-	window.location.href = window.location.origin + "/semag/" + dir + "/index.html";
-}
-function dynamicSort(property) {
-	var sortOrder = 1;
-
-	if (property[0] === "-") {
-		sortOrder = -1;
-		property = property.substr(1);
-	}
-	return function (a, b) {
-		if (sortOrder == -1) {
-			return b[property].localeCompare(a[property]);
-		} else {
-			return a[property].localeCompare(b[property]);
-		}
-	};
-}
-
-function selectRandomGame() {
-	redirectGame(gamelist[Math.floor(Math.random() * gamelist.length - 1)].directory);
-}
-
-let viewrecommended = 0;
-function recommendedGames() {
-	if (viewrecommended == 0) {
-		$("#games .game").hide();
-		$("#games .game").each(function () {
-			if ($(this).attr("recommended")) {
-				$(this).show();
-			}
-		});
-		$("#recommend").text("Click to view all games again!");
-		viewrecommended = 1;
-	} else {
-		$("#games .game").hide();
-		$("#games .game").show();
-		viewrecommended = 0;
-		$("#recommend").text("Click to view recommended games!");
-	}
-}
-=======
 document.addEventListener("DOMContentLoaded", loadGames);
 let elements = [];
 async function loadGames() {
@@ -251,5 +50,4 @@ document.addEventListener("DOMContentLoaded", ()=>{
     }
     document.getElementById("noResults").style.display = total >= elements.length ?  "flex" : "none"
   })
-})
->>>>>>> c2041b6 (first dev commit)
+})
\ No newline at end of file
diff --git a/js/katamari.js b/js/katamari.js
old mode 100644
new mode 100755
diff --git a/js/main.js b/js/main.js
old mode 100644
new mode 100755
index fd50c0f..cb85599
--- a/js/main.js
+++ b/js/main.js
@@ -1,169 +1,3 @@
-<<<<<<< HEAD
-var interval;
-document.addEventListener("DOMContentLoaded", function () {
-	if (localStorage.getItem("theme")) {
-		localStorage.setItem("selenite.theme", localStorage.getItem("theme"));
-		localStorage.removeItem("theme");
-	}
-	if (localStorage.getItem("selenite.theme")) {
-		document.body.setAttribute("theme", localStorage.getItem("selenite.theme"));
-	} else {
-		document.body.setAttribute("theme", "main");
-	}
-	if (document.querySelectorAll("[id=adcontainer]")) {
-		for (let i = 0; i < document.querySelectorAll("[id=adcontainer]").length; i++) {
-			if (Math.random() < 0.5 || localStorage.getItem("selenite.adblock") == "true") document.querySelectorAll("[id=adcontainer]")[i].innerHTML = "";
-		}
-	}
-	const iconSetting = document.querySelector("input#discordIcon");
-	const blockClose = document.querySelector("input#blockClose");
-	const openBlank = document.getElementById("blank");
-	const bgTheme = document.querySelector("input#bgTheme");
-	// if (document.querySelector("widgetbot-crate")) {
-	// 	if (localStorage.getItem("selenite.discordIcon") == "true") {
-	// 		const widget = document.querySelector("widgetbot-crate");
-	// 		widget.setAttribute("style", "display:none");
-	// 	}
-	// }
-	if (document.querySelector("input#discordIcon")) {
-		if (localStorage.getItem("selenite.discordIcon") == "true") {
-			iconSetting.checked = true;
-		}
-		iconSetting.addEventListener("click", () => {
-			localStorage.setItem("selenite.discordIcon", iconSetting.checked);
-		});
-	}
-	if (document.querySelector("input#blockClose")) {
-		if (localStorage.getItem("selenite.blockClose") == "true") {
-			blockClose.checked = true;
-		}
-		blockClose.addEventListener("click", () => {
-			localStorage.setItem("selenite.blockClose", blockClose.checked);
-		});
-	}
-	if (document.querySelector("input#tabDisguise")) {
-		if (localStorage.getItem("selenite.tabDisguise") == "true") {
-			tabDisguise.checked = true;
-		}
-		tabDisguise.addEventListener("click", () => {
-			localStorage.setItem("selenite.tabDisguise", tabDisguise.checked);
-		});
-	}
-	if (document.querySelector("input#bgTheme")) {
-		bgTheme.checked = true;
-	}
-	document.getElementById("blank").addEventListener("click", () => {
-		win = window.open();
-		win.document.body.style.margin = "0";
-		win.document.body.style.height = "100vh";
-		html = `
-        <style>*{margin:0;padding:0;border:none}body,iframe{height:100vh;width:100vw}iframe{height:96vh}header{display:flex;height:4vh;justify-content:center;}button{margin-right:100px;height:100%;aspect-ratio: 1 / 1}#reload{background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='24' viewBox='0 -960 960 960' width='24'%3E%3Cpath d='M480-160q-134 0-227-93t-93-227q0-134 93-227t227-93q69 0 132 28.5T720-690v-110h80v280H520v-80h168q-32-56-87.5-88T480-720q-100 0-170 70t-70 170q0 100 70 170t170 70q77 0 139-44t87-116h84q-28 106-114 173t-196 67Z'/%3E%3C/svg%3E");background-size:cover;}#goBack{background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='24' viewBox='0 -960 960 960' width='24'%3E%3Cpath d='M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z'/%3E%3C/svg%3E");background-size:cover;}</style><script>
-        </script><header><button id=goBack></button><button id=reload></button></header><iframe id=selenite></iframe>`;
-		win.document.querySelector("html").innerHTML = html;
-		win.eval(`let selenite = document.getElementById("selenite");console.log(selenite);selenite.setAttribute("src", "${location.origin}");console.log(selenite);document.getElementById("goBack").addEventListener("click", function () {selenite.contentDocument.location.href = selenite.contentDocument.location.origin;});document.getElementById("reload").addEventListener("click", function () {selenite.contentDocument.location.href = selenite.contentDocument.location.href;})`);
-		location.href = "https://google.com";
-		close();
-	});
-	if ($("#panicmode").length > 0) {
-		$("#panicmode").prop({ href: panicurl });
-	}
-	if ($(".seleniteminified").length > 0) {
-		$.get("https://raw.githubusercontent.com/skysthelimitt/selenite-optimized/main/build/bookmark.txt", function (data) {
-			$(".seleniteminified").prop({ href: data });
-		});
-		$.get("https://raw.githubusercontent.com/car-axle-client/car-axle-client/v10/dist/build.js", function (data) {
-			$(".caraxle").prop({ href: `javascript:${encodeURI(data)}` });
-		});
-	}
-});
-function setPanicMode() {
-	if (!$("#panic").val().startsWith("https")) {
-		document.cookie = "panicurl=https://" + $("#panic").val();
-		return;
-	}
-
-	document.cookie = "panicurl=" + $("#panic").val();
-}
-function copyToClipboard(text) {
-	navigator.clipboard.writeText(text);
-	alert("Copied text!");
-}
-function setTheme(theme) {
-	localStorage.setItem("selenite.theme", theme);
-	document.body.setAttribute("theme", theme);
-	if (theme != "custom") {
-		document.getElementById("customMenu").style.display = "none";
-		document.body.style = "";
-	}
-}
-function setPanicMode() {
-	if (!$("#panic").val().startsWith("https")) {
-		document.cookie = "panicurl=https://" + $("#panic").val();
-		return;
-	}
-	document.cookie = "panicurl=" + $("#panic").val();
-}
-function setPassword() {
-	localStorage.setItem("selenite.password", enc.encode(document.getElementById("pass").value));
-}
-function delPassword() {
-	location.hash = "";
-	localStorage.removeItem("selenite.passwordAtt");
-	localStorage.removeItem("selenite.password");
-}
-
-$(document).ready(function () {
-	if (!window.location.href.startsWith("about:")) {
-		$("#webicon").attr("placeholder", window.location.href.replace(/\/[^\/]*$/, "/"));
-	}
-});
-function loadScript(a, b) {
-	var c = document.createElement("script");
-	(c.type = "text/javascript"), (c.src = a), (c.onload = b), document.head.appendChild(c);
-}
-function toast(message, onclick) {
-	const toast = document.createElement("div");
-	toast.setAttribute("id", "toast");
-	console.log(message.time);
-	toast.innerHTML = `<div class=samerow><h1>${message.title}${message.time ? ` - ${timeAgo(new Date(message.time * 1000))}` : ""}</h1></div><p>${message.message}</p>`;
-	toast.style.animation = "toastFade 6s";
-	document.body.appendChild(toast);
-	if (onclick) {
-		toast.addEventListener("click", onclick);
-		toast.style.cursor = "pointer";
-	}
-	setTimeout(() => {
-		toast.remove();
-	}, 6000);
-}
-function timeAgo(input) {
-	const date = input instanceof Date ? input : new Date(input);
-	const formatter = new Intl.RelativeTimeFormat("en");
-	const ranges = {
-		years: 3600 * 24 * 365,
-		months: 3600 * 24 * 30,
-		weeks: 3600 * 24 * 7,
-		days: 3600 * 24,
-		hours: 3600,
-		minutes: 60,
-		seconds: 1,
-	};
-	const secondsElapsed = (date.getTime() - Date.now()) / 1000;
-	for (let key in ranges) {
-		if (ranges[key] < Math.abs(secondsElapsed)) {
-			const delta = secondsElapsed / ranges[key];
-			return formatter.format(Math.round(delta), key);
-		}
-	}
-}
-let cookieConsentScript = document.createElement("script");
-cookieConsentScript.src = "/js/cookieConsent.js";
-document.head.appendChild(cookieConsentScript);
-let cookieConsentStyle = document.createElement("link");
-cookieConsentStyle.href = "/js/cookieConsent.css";
-cookieConsentStyle.rel = "stylesheet";
-document.head.appendChild(cookieConsentStyle);
-=======
 function setBackground() {
 	let randomNumbers = [100-Math.abs(Math.floor(Math.random() * 200) - 99), 100-Math.abs(Math.floor(Math.random() * 200) - 99)];
 	document.body.style.setProperty("--gradient-x", randomNumbers[0] + "%");
@@ -375,5 +209,4 @@ document.addEventListener("scroll", ()=>{
 // let cookieConsentStyle = document.createElement("link");
 // cookieConsentStyle.href = "/js/cookieConsent.css";
 // cookieConsentStyle.rel = "stylesheet";
-// document.head.appendChild(cookieConsentStyle);
->>>>>>> c2041b6 (first dev commit)
+// document.head.appendChild(cookieConsentStyle);
\ No newline at end of file
diff --git a/js/oldstuff.js b/js/oldstuff.js
old mode 100644
new mode 100755
diff --git a/js/savedownload.js b/js/savedownload.js
old mode 100644
new mode 100755
diff --git a/js/search.js b/js/search.js
old mode 100644
new mode 100755
diff --git a/js/themes.js b/js/themes.js
old mode 100644
new mode 100755
diff --git a/js/ultimatetabcloak.js b/js/ultimatetabcloak.js
old mode 100644
new mode 100755
diff --git a/js/uploaddownload.js b/js/uploaddownload.js
old mode 100644
new mode 100755
diff --git a/js/widget.js b/js/widget.js
old mode 100644
new mode 100755
diff --git a/loader.html b/loader.html
old mode 100644
new mode 100755
index b8ad011..e91d2a9
--- a/loader.html
+++ b/loader.html
@@ -16,15 +16,6 @@
 		<script src="/js/main.js"></script>
 		<script>
 			document.addEventListener("DOMContentLoaded", () => {
-<<<<<<< HEAD
-				if (document.location.hash) {
-					let game = JSON.parse(decodeURIComponent(atob(document.location.hash.substring(1))));
-					document.getElementById("gameFrame").setAttribute("src", `/semag/${game[0]}/index.html`);
-					document.getElementById("gameImage").setAttribute("src", `/semag/${game[0]}/${decodeURIComponent(game[1])}`);
-					document.getElementById("gameName").innerText = game[2];
-					localStorage.setItem("selenite.lastGame", document.location.hash.substring(1))
-					document.location.hash = '';
-=======
 				if (location.search != "") {
 					let items = {};
 					location.search.substr(1).split("&").forEach((e)=>{
@@ -34,24 +25,12 @@
 					document.getElementById("gameImage").setAttribute("src", `/semag/${items.dir}/${items.img}`);
 					document.getElementById("gameName").innerText = decodeURIComponent(items.title);
 					console.log(items);
->>>>>>> c2041b6 (first dev commit)
 				} else if(localStorage.getItem("selenite.lastGame")) {
 					let game = JSON.parse(decodeURIComponent(atob(localStorage.getItem("selenite.lastGame"))));
 					document.getElementById("gameFrame").setAttribute("src", `/semag/${game[0]}/index.html`);
 					document.getElementById("gameImage").setAttribute("src", `/semag/${game[0]}/${decodeURIComponent(game[1])}`);
 					document.getElementById("gameName").innerText = game[2];
 				}
-<<<<<<< HEAD
-				document.getElementById("fullscreen").addEventListener("click", () => {
-					
-				})
-			});
-		</script>
-
-		<link rel="stylesheet" href="/style.css" />
-		<link rel="manifest" href="/manifest.json" />
-
-=======
 				// document.getElementById("fullscreen").addEventListener("click", () => {
 					
 				// })
@@ -61,44 +40,10 @@
 		<link rel="stylesheet" href="/css/main.css" />
 		<link rel="stylesheet" href="/css/pages.css" />
 		<link rel="stylesheet" href="/css/loader.css" />
->>>>>>> c2041b6 (first dev commit)
 		<!-- seo + other things -->
 		<title>Selenite</title>
 		<link rel="icon" href="/favicon.ico" />
 	</head>
-<<<<<<< HEAD
-	<alerts> </alerts>
-	<body>
-		<header>
-			<a href="/index.html">Home</a>
-			<a href="/bookmarklets.html">Bookmarklets</a>
-			<a href="/projects.html">Games</a>
-			<a href="/apps.html">Apps</a>
-			<a href="/settings.html">Settings</a>
-			<a id="blank" href="#">Open Blank</a>
-			<a href="/u/" class="usericon"><img src="/img/user.svg" /></a>
-		</header>
-		<main>
-			<div id="gamecontainer">
-				<iframe id="gameFrame" allow="fullscreen" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-scripts allow-same-origin"></iframe>
-				<div id="infobox">
-					<img id="gameImage" src="favicon.png" />
-					<h2 id="gameName">Selenite</h2>
-					<div class="opposite">
-						<img class="button" id="fullscreen" src="/img/fullscreen.svg">
-					</div>
-				</div>
-			</div>
-		</main>
-		<footer class="noscroll">
-			<a href="gitlab.com/skysthelimit.dev/selenite">Source</a>
-			<a href="https://discord.gg/7jyufnwJNf">Discord</a>
-			<a href="/suggest.html">Suggestions & Bugs</a>
-			<a href="/contact.html">Contact</a>
-			<a href="/support.html">Donate</a>
-			<a href="/about.html">About</a>
-		</footer>
-=======
 	<body>
 		<div id="gamecontainer">
 			<iframe id="gameFrame" allow="fullscreen" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-scripts allow-same-origin"></iframe>
@@ -110,6 +55,5 @@
 				</div>
 			</div>
 		</div>
->>>>>>> c2041b6 (first dev commit)
 	</body>
 </html>
diff --git a/manifest.json b/manifest.json
old mode 100644
new mode 100755
diff --git a/new selenite.svg b/new selenite.svg
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
deleted file mode 100644
index d5bf155..0000000
--- a/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "Bigfoot Games",
-  "version": "1.0.0",
-  "scripts": {
-    "start": "node index.js"
-  },
-  "dependencies": {
-    "express": "^4.17.1"
-  }
-}
diff --git a/projects.html b/projects.html
old mode 100644
new mode 100755
index 65d9df8..425d138
--- a/projects.html
+++ b/projects.html
@@ -17,13 +17,9 @@
 		<script src="/js/cookie.js"></script>
 
 		
-<<<<<<< HEAD
-		<link rel="stylesheet" href="/style.css" />
-=======
 		<link rel="stylesheet" href="/css/main.css" />
 		<link rel="stylesheet" href="/css/pages.css" />
 		<link rel="stylesheet" href="/css/games.css" />
->>>>>>> c2041b6 (first dev commit)
 		
 
 		<!-- seo + other things -->
@@ -37,85 +33,6 @@
 		crossorigin="anonymous"></script>
 		<script></script>
 	</head>
-<<<<<<< HEAD
-	<alerts>
-		<div id="toast"></div>
-		<script>
-			$.getJSON("data/changelog.json", (data) => {
-				if (localStorage.getItem("selenite.version") != data.version) {
-					toast({ title: "New Update!", message: data.desc, time: data.timestamp });
-					localStorage.setItem("selenite.version", data.version);
-				}
-			});
-		</script>
-	</alerts>
-	<body>
-		<header>
-			<a href="/index.html">Home</a>
-			<a href="/bookmarklets.html">Bookmarklets</a>
-			<a href="/projects.html">Games</a>
-			<a href="/apps.html">Apps</a>
-			<a href="/settings.html">Settings</a>
-			<a id="blank" href="#">Open Blank</a>
-      <a href="/u/" class="usericon"><img src="/img/user.svg"></a>
-
-		</header>
-		<main>
-			<h3 id="popunder" style="display: none;">You may be redirected upon clicking on the screen. This is an ad. <a style="font-size: inherit;" href="ad.html">Learn more.</a></h3>
-			<input class="hiddenUpload" type="file" accept=".save" hidden />
-
-			<input type="text" class="searchbar" id="gamesearch" placeholder="Type here to search.." />
-			<div class="samerow">
-				<sl-tooltip content="Remember to download your save, so you don't lose your progress." trigger="manual" class="manual-tooltip">
-					<button onclick="downloadMainSave()">Download Save</button>
-				</sl-tooltip>
-				<button id="upload" onclick="uploadMainSave()">Upload Save</button>
-			</div>
-			<div class="samerow">
-				<button id="random" onclick="selectRandomGame()">Play a random game!</button>
-				<button id="category" onclick="categoryChanger()">Game Categories</button>
-			</div>
-
-			<h2>Starred Games</h2>
-			<p id="pinnedmessage">Star some games for things to show up here!</p>
-			<div id="pinned"></div>
-
-			<h2>All Games</h2>
-			<div id="games">
-				<a href="/suggest.html"
-					><div class="suggest">
-						<img src="img/addlink.svg" alt="Add Game logo" style="filter: invert(1) !important" />
-						<h1>Suggest a game!</h1>
-					</div></a
-				>
-				<p id="message">games loading..</p>
-				<p id="message">games not loading? click ctrl + shift + r</p>
-				<button id="message" onclick='$.getJSON("/data/games.json", function (data) {loadGames(data)})'>Games not loading? Click here.</button>
-			</div>
-			<br />
-		</main>
-
-		<footer>
-			<a href="https://gitlab.com/skysthelimit.dev/selenite">Source</a>
-			<a href="https://discord.gg/7jyufnwJNf">Discord</a>
-			<a href="/suggest.html">Suggestions & Bugs</a>
-			<a href="/contact.html">Contact</a>
-			<a href="/support.html">Donate</a>
-			<a href="/about.html">About</a>
-		</footer>
-		<script>
-			document.addEventListener("DOMContentLoaded", function () {
-				const adContainers = document.querySelectorAll("[id=adcontainer]");
-				if (adContainers.length > 0) {
-					for (let i = 0; i < adContainers.length; i++) {
-						if (Math.random() < 0.5 && localStorage.getItem("selenite.adblock") != "true") {
-							adContainers[i].innerHTML = "";
-						}
-					}
-				}
-			});
-		</script>
-=======
 	<body>
 		<div id="particles-js"></div>
 			<!-- <input class="hiddenUpload" type="file" accept=".save" hidden /> -->
@@ -144,6 +61,5 @@
 				<!-- <p id="message">games loading..</p> -->
 				<p id="noResults">nothing was found! try a new search query.</p>
 			</div>
->>>>>>> c2041b6 (first dev commit)
 	</body>
 </html>
diff --git a/robots.txt b/robots.txt
old mode 100644
new mode 100755
diff --git a/settings.html b/settings.html
old mode 100644
new mode 100755
diff --git a/style.css b/style.css
deleted file mode 100644
index 000c2c6..0000000
--- a/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@import url("/css/style.css");
-@import url("/css/themes.css");
-/* moved to css folder */
\ No newline at end of file
diff --git a/suggest.html b/suggest.html
old mode 100644
new mode 100755
diff --git a/support.html b/support.html
old mode 100644
new mode 100755