diff --git a/_includes/nav.html b/_includes/nav.html
index 08056b16..d2ebcf71 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -7,7 +7,7 @@
 			<span class="navbar-toggler-icon"></span>
 		</button>
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
-			<ul class="navbar-nav">
+			<ul class="navbar-nav me-auto">
 				{% for item in site.data[page.collection].nav %}
 					{% if item.url %}
 						<li class="nav-item">
@@ -31,7 +31,7 @@
 					<a class="nav-link" href="https://github.com/{{ page.repo | default: site.repo }}" accesskey="s">{{ site.data[page.collection].strings.source}}</a>
 				</li>
 			</ul>
-			<div class="btn-group position-absolute-sm end-0 me-1 dropdown">
+			<div class="btn-group dropdown">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="{{ site.data[page.collection].strings.select-language }}">
 					<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-globe" viewBox="0 0 16 16">
 						<path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4H2.255a7.025 7.025 0 0 1 3.072-2.472 6.7 6.7 0 0 0-.597.933c-.247.464-.462.98-.64 1.539zm-.582 3.5h-2.49c.062-.89.291-1.733.656-2.5H3.82a13.652 13.652 0 0 0-.312 2.5zM4.847 5H7.5v2.5H4.51A12.5 12.5 0 0 1 4.846 5zM8.5 5v2.5h2.99a12.495 12.495 0 0 0-.337-2.5H8.5zM4.51 8.5H7.5V11H4.847a12.5 12.5 0 0 1-.338-2.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12H7.5v2.923c-.67-.204-1.335-.82-1.887-1.855A7.97 7.97 0 0 1 5.145 12zm.182 2.472a6.696 6.696 0 0 1-.597-.933A9.268 9.268 0 0 1 4.09 12H2.255a7.024 7.024 0 0 0 3.072 2.472zM3.82 11H1.674a6.958 6.958 0 0 1-.656-2.5h2.49c.03.877.138 1.718.312 2.5zm6.853 3.472A7.024 7.024 0 0 0 13.745 12H11.91a9.27 9.27 0 0 1-.64 1.539 6.688 6.688 0 0 1-.597.933zM8.5 12h2.355a7.967 7.967 0 0 1-.468 1.068c-.552 1.035-1.218 1.65-1.887 1.855V12zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 0 1-.312 2.5zm2.802-3.5h-2.49A13.65 13.65 0 0 0 12.18 5h2.146c.365.767.594 1.61.656 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 0 0-3.072-2.472c.218.284.418.598.597.933zM10.855 4H8.5V1.077c.67.204 1.335.82 1.887 1.855.173.324.33.682.468 1.068z"/>
@@ -62,4 +62,4 @@
 			r.classList.remove("hover-content");
 		});
 	</script>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/assets/js/theme.js b/assets/js/theme.js
index cfc6e2ec..8c86f2dc 100644
--- a/assets/js/theme.js
+++ b/assets/js/theme.js
@@ -1,9 +1,11 @@
 function loadTheme() {
+	let themeCSS = document.getElementById("themeCSS");
 	if(!localStorage.theme || localStorage.theme == "default") {
-		document.getElementById("themeCSS")?.remove();
+		if(themeCSS)
+			themeCSS.remove();
 	} else {
-		if(document.getElementById("themeCSS")) {
-			document.getElementById("themeCSS").href = `/assets/css/${localStorage.theme}.css`;
+		if(themeCSS) {
+			themeCSS.href = `/assets/css/${localStorage.theme}.css`;
 		} else {
 			let l = document.createElement("link");
 			l.rel = "stylesheet";
@@ -15,7 +17,6 @@ function loadTheme() {
 			document.head.appendChild(l);
 		}
 	}
-
 }
 
 function setTheme(theme) {