diff --git a/files/assets/js/general35.js b/files/assets/js/general36.js
similarity index 91%
rename from files/assets/js/general35.js
rename to files/assets/js/general36.js
index af424bae0..cd03f5e23 100644
--- a/files/assets/js/general35.js
+++ b/files/assets/js/general36.js
@@ -160,55 +160,49 @@ function getGif(searchTerm) {
 
 		cancelBtn.innerHTML = '<button class="btn btn-link pl-3 pr-0" id="gifs-cancel-btn" onclick="getGif();"><i class="fas fa-times text-muted"></i></button>';
 
-		$.ajax({
-		url: "/giphy?searchTerm=" + searchTerm + "&limit=48",
-		type: "GET",
-		success: function(response) {
-		var max = response.data.length - 1 //length of response, minus 1 (cuz array starts at index 0)
-		var randomNumber = Math.round(Math.random() * 6) //random number between 0 and max -1
-		// GIF array
-		var gifURL = [];
 
-		// loop for fetching mutliple GIFs and creating the card divs
-		if (max < 48 && max > 0) {
-			for (var i = 0; i <= max; i++) {
-			gifURL[i] = "https://media.giphy.com/media/" + response.data[i].id + "/200w_d.webp";
-			if (response.data[i].username==''){
-				container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+		fetch("/giphy?searchTerm=" + searchTerm + "&limit=48")
+		  .then(response => {
+			var max = response.data.length - 1 //length of response, minus 1 (cuz array starts at index 0)
+			var randomNumber = Math.round(Math.random() * 6) //random number between 0 and max -1
+			// GIF array
+			var gifURL = [];
+	
+			// loop for fetching mutliple GIFs and creating the card divs
+			if (max < 48 && max > 0) {
+				for (var i = 0; i <= max; i++) {
+				gifURL[i] = "https://media.giphy.com/media/" + response.data[i].id + "/200w_d.webp";
+				if (response.data[i].username==''){
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				else {
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" title="by '+response.data[i].username+' on GIPHY" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				noGIFs.innerHTML = null;
+				loadGIFs.innerHTML = '<div class="text-center py-3"><div class="mb-3"><i class="fad fa-grin-beam-sweat text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Thou&#39;ve reached the end of the list!</p></div>';
+				}
+			}
+			else if (max <= 0) {
+				noGIFs.innerHTML = '<div class="text-center py-3 mt-3"><div class="mb-3"><i class="fad fa-frown text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Aw shucks. No GIFs found...</p></div>';
+				container.innerHTML = null;
+				loadGIFs.innerHTML = null;
 			}
 			else {
-				container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" title="by '+response.data[i].username+' on GIPHY" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				for (var i = 0; i <= 48; i++) {
+				gifURL[i] = "https://media.giphy.com/media/" + response.data[i].id + "/200w_d.webp";
+				if (response.data[i].username==''){
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				else {
+					container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" title="by '+response.data[i].username+' on GIPHY" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
+				}
+				noGIFs.innerHTML = null;
+				loadGIFs.innerHTML = '<div class="text-center py-3"><div class="mb-3"><i class="fad fa-grin-beam-sweat text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Thou&#39;ve reached the end of the list!</p></div>';
+				}
 			}
-			noGIFs.innerHTML = null;
-			loadGIFs.innerHTML = '<div class="text-center py-3"><div class="mb-3"><i class="fad fa-grin-beam-sweat text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Thou&#39;ve reached the end of the list!</p></div>';
-			}
-		}
-		else if (max <= 0) {
-			noGIFs.innerHTML = '<div class="text-center py-3 mt-3"><div class="mb-3"><i class="fad fa-frown text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Aw shucks. No GIFs found...</p></div>';
-			container.innerHTML = null;
-			loadGIFs.innerHTML = null;
-		}
-		else {
-			for (var i = 0; i <= 48; i++) {
-			gifURL[i] = "https://media.giphy.com/media/" + response.data[i].id + "/200w_d.webp";
-			if (response.data[i].username==''){
-				container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
-			}
-			else {
-				container.innerHTML += ('<div class="card bg-white" style="overflow: hidden" data-dismiss="modal" aria-label="Close" title="by '+response.data[i].username+' on GIPHY" onclick="insertGIF(\'' + 'https://media.giphy.com/media/' + response.data[i].id + '/100w.webp' + '\',\'' + commentFormID + '\')"><div class="gif-cat-overlay"></div><img loading="lazy" class="img-fluid" src="' + gifURL[i] + '"></div>');
-			}
-			noGIFs.innerHTML = null;
-			loadGIFs.innerHTML = '<div class="text-center py-3"><div class="mb-3"><i class="fad fa-grin-beam-sweat text-gray-500" style="font-size: 3.5rem;"></i></div><p class="font-weight-bold text-gray-500 mb-0">Thou&#39;ve reached the end of the list!</p></div>';
-			}
-		}
-		},
-		error: function(e) {
-		alert(e);
-		}
-	});
-	};
+		})
 	}
-
+}
 
 function insertGIF(url,form) {
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 2cdeba49d..ce8838f3d 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1369,7 +1369,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 
 {% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %}
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 7f87bbb2a..c03303859 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -192,6 +192,6 @@ Allowed styles:
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 058b2b8b9..608134526 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -130,7 +130,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 <pre>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 731a309e5..63aa7f5f2 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -258,7 +258,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 {% block onload %}{% endblock %}
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index e27fa8bfa..9f4a2bf09 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -205,7 +205,7 @@
 <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 	{% block scripts %}
 	{% endblock %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 792b3ade7..f6045cadc 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -235,7 +235,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 <pre>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 3f3a20fb7..d397b244e 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -124,7 +124,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/general35.js"></script>
+<script src="/assets/js/general36.js"></script>
 
 <pre>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 648a311e1..d7ec1a0b1 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -5,7 +5,7 @@
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
 		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-		<script src="/assets/js/general35.js"></script>
+		<script src="/assets/js/general36.js"></script>
 
 		<script>