diff --git a/files/assets/images/Drama/houses/Femboy.webp b/files/assets/images/Drama/houses/Femboy.webp
index 9443abc0a..b6b2a8328 100644
Binary files a/files/assets/images/Drama/houses/Femboy.webp and b/files/assets/images/Drama/houses/Femboy.webp differ
diff --git a/files/assets/images/Drama/houses/Furry.webp b/files/assets/images/Drama/houses/Furry.webp
index 1fe09016e..e8a3a2277 100644
Binary files a/files/assets/images/Drama/houses/Furry.webp and b/files/assets/images/Drama/houses/Furry.webp differ
diff --git a/files/assets/images/Drama/houses/Racist.webp b/files/assets/images/Drama/houses/Racist.webp
index caaf15d17..14cf22f37 100644
Binary files a/files/assets/images/Drama/houses/Racist.webp and b/files/assets/images/Drama/houses/Racist.webp differ
diff --git a/files/assets/images/Drama/houses/Vampire.webp b/files/assets/images/Drama/houses/Vampire.webp
index 1fd4f7d1e..693554061 100644
Binary files a/files/assets/images/Drama/houses/Vampire.webp and b/files/assets/images/Drama/houses/Vampire.webp differ
diff --git a/files/assets/images/Drama/houses/femboy.webp b/files/assets/images/Drama/houses/femboy.webp
index 9443abc0a..b6b2a8328 100644
Binary files a/files/assets/images/Drama/houses/femboy.webp and b/files/assets/images/Drama/houses/femboy.webp differ
diff --git a/files/assets/images/Drama/houses/furry.webp b/files/assets/images/Drama/houses/furry.webp
index 1fe09016e..e8a3a2277 100644
Binary files a/files/assets/images/Drama/houses/furry.webp and b/files/assets/images/Drama/houses/furry.webp differ
diff --git a/files/assets/images/Drama/houses/racist.webp b/files/assets/images/Drama/houses/racist.webp
index caaf15d17..14cf22f37 100644
Binary files a/files/assets/images/Drama/houses/racist.webp and b/files/assets/images/Drama/houses/racist.webp differ
diff --git a/files/assets/images/Drama/houses/vampire.webp b/files/assets/images/Drama/houses/vampire.webp
index 1fd4f7d1e..693554061 100644
Binary files a/files/assets/images/Drama/houses/vampire.webp and b/files/assets/images/Drama/houses/vampire.webp differ
diff --git a/files/assets/images/emojis/yotsubafish.webp b/files/assets/images/emojis/yotsubafish.webp
new file mode 100644
index 000000000..ade2b75d0
Binary files /dev/null and b/files/assets/images/emojis/yotsubafish.webp differ
diff --git a/files/assets/images/emojis/yotsubalol.webp b/files/assets/images/emojis/yotsubalol.webp
new file mode 100644
index 000000000..aa0c8fd44
Binary files /dev/null and b/files/assets/images/emojis/yotsubalol.webp differ
diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 94e9dc804..7e58b522e 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -29,7 +29,7 @@ function loadEmojis(form) {
 					
 				'wolf': ['wolfcumjar','wolflgbt','wolfmarseyhead','wolfnoir','wolfsherifssmoking','wolftrans','wolfvaporwave','wolfangry','wolfbrains','wolfcry','wolfdead','wolfdevilish','wolffacepalm','wolfhappy','wolfidea','wolfkoala','wolflaugh','wolflove','wolfmeditate','wolfphone','wolfrainbow','wolfroses','wolfsad','wolfsfear','wolfsleep','wolftear','wolfthink','wolfthumbsup','wolfupsidedown','wolfvictory','wolfwave','wolfwink'],
 		
-				'misc': ['sigmatalking','zoroarkconfused','zoroarkhappy','zoroarkpout','zoroarksleepy','casanovanova','deuxwaifu','flairlessmong','hardislife','redditgigachad','rfybear','etika','sneed','retardedchildren','bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3']
+				'misc': ['yotsubafish','yotsubalol','sigmatalking','zoroarkconfused','zoroarkhappy','zoroarkpout','zoroarksleepy','casanovanova','deuxwaifu','flairlessmong','hardislife','redditgigachad','rfybear','etika','sneed','retardedchildren','bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3']
 			}
 			loadEmojis(form);
 		}
diff --git a/files/classes/comment.py b/files/classes/comment.py
index 96d93be19..3bae7836c 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -342,7 +342,7 @@ class Comment(Base):
 			if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
 			elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
 
-			if v.nitter: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
+			if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
 
 		if v and v.controversial:
 			for i in re.finditer('(/comments/.*?)"', body):
@@ -393,7 +393,7 @@ class Comment(Base):
 
 		if v and not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
 
-		if v and v.nitter: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
+		if v and v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
 
 		if v and v.controversial:
 			for i in re.finditer('(/comments/.*?)"', body):
diff --git a/files/classes/submission.py b/files/classes/submission.py
index 727f0149b..6c1eb9567 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -346,7 +346,7 @@ class Submission(Base):
 				if v.controversial: url += "&sort=controversial"
 			return url
 		elif self.url:
-			if v and v.nitter: return self.url.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
+			if v and v.nitter and not '/i/spaces/' in self.url: return self.url.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
 			if self.url.startswith('/'): return SITE_FULL + self.url
 			return self.url
 		else: return ""
@@ -362,7 +362,7 @@ class Submission(Base):
 			if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
 			elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
 
-			if v.nitter: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
+			if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
 
 		if v and v.shadowbanned and v.id == self.author_id and 86400 > time.time() - self.created_utc > 20:
 			ti = max(int((time.time() - self.created_utc)/60), 1)
@@ -418,7 +418,7 @@ class Submission(Base):
 			if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
 			elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
 
-			if v.nitter: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
+			if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
 
 		return body
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index c0b9e27dc..d09f4e68e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -225,7 +225,7 @@
 					👻
 				{% else %}
 					{% if c.author.house %}
-						<img src="/assets/images/{{SITE_NAME}}/houses/{{c.author.house}}.webp?a=1" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{c.author.house}}">
+						<img src="/assets/images/{{SITE_NAME}}/houses/{{c.author.house}}.webp?a=2" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{c.author.house}}">
 					{% endif %}
 
 					{% if c.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if c.author.verifiedcolor %}#{{c.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{c.author.verified}}"></i>
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index d87e5efe5..02df375f8 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -86,7 +86,7 @@
 	</div>
 </div>
 
-<script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=241"></script>
+<script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=242"></script>
 
 <style>
 	a.emojitab {
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0843a8821..be68f8b54 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -445,7 +445,7 @@
 							👻
 						{% else %}
 							{% if p.author.house %}
-								<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=1" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
+								<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=2" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
 							{% endif %}
 
 							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index ba087a34b..983804a25 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -181,7 +181,7 @@
 					👻
 				{% else %}
 					{% if p.author.house %}
-						<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=1" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
+						<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=2" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
 					{% endif %}
 
 					{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 84b40fff5..d4116649d 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -58,7 +58,7 @@
 								</span>
 								{% endif %}
 								{% if u.house %}
-									<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=1" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
+									<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=2" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
 								{% endif %}
 
 								{% if u.verified %}<span><i class="fas fa-badge-check align-middle ml-1" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{u.verified}}"></i></span>{% endif %}
@@ -353,7 +353,7 @@
 					{% if u.unban_utc %}<h5 class="text-primary">>{{u.unban_string}}</h5>{% endif %}
 				{% endif %}
 				{% if u.house %}
-					<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=1" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
+					<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=2" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
 				{% endif %}
 
 				{% if u.verified %}<span><i class="fas fa-badge-check align-middle ml-1" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{u.verified}}"></i></span>&nbsp;{% endif %}