diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java
index dee19dfa..ebbd4d09 100644
--- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java
+++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java
@@ -27,10 +27,18 @@ public class ChaturbateTabProvider extends AbstractTabProvider {
         tabs.add(createTab("Featured", apiUrl + "/roomlist/room-list/?enable_recommendations=false"));
         tabs.add(createTab("Female", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=f"));
         tabs.add(createTab("New Female", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=f&new_cams=true"));
+        tabs.add(createTab("Milf", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=milf"));
+        tabs.add(createTab("Teen", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=teen"));
+        tabs.add(createTab("Creampie", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=creampie"));
+        tabs.add(createTab("BBW", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=bbw"));
+        tabs.add(createTab("Chubby", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=chubby"));
+        tabs.add(createTab("Pregnant", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hashtags=pregnant"));
         tabs.add(createTab("Male", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=m"));
         tabs.add(createTab("New Male", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=m&new_cams=true"));
         tabs.add(createTab("Couples", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=c"));
         tabs.add(createTab("Trans", apiUrl + "/roomlist/room-list/?enable_recommendations=false&genders=t"));
+        tabs.add(createTab("N.American Cams", apiUrl + "/roomlist/room-list/?enable_recommendations=false&regions=NA"));
+        tabs.add(createTab("6TPM private", apiUrl + "/roomlist/room-list/?enable_recommendations=false&private_prices=6"));
         tabs.add(createTab("Private", apiUrl + "/roomlist/room-list/?enable_recommendations=false&private=true"));
         tabs.add(createTab("Hidden", apiUrl + "/roomlist/room-list/?enable_recommendations=false&hidden=true"));
         tabs.add(createTab("Gaming", apiUrl + "/roomlist/room-list/?enable_recommendations=false&gaming=true"));
diff --git a/docs/index.html b/docs/index.html
index 58ec31e8..362ac3ea 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -42,7 +42,7 @@
     <!-- Navigation -->
     <nav class="navbar navbar-expand-lg bg-secondary fixed-top text-uppercase" id="mainNav">
       <div class="container">
-        <a class="navbar-brand js-scroll-trigger" href="#page-top"><img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/client/src/main/resources/icon64.png" alt="Logo"/>CTB Recorder</a>
+        <a class="navbar-brand js-scroll-trigger" href="#page-top"><img src="https://git.ctbrec.com/j62/ctbrec/raw/branch/main/client/src/main/resources/icon64.png" alt="Logo"/>CTB Recorder</a>
         <button class="navbar-toggler navbar-toggler-right text-uppercase bg-primary text-white rounded" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
           Menu
           <i class="fa fa-bars"></i>
@@ -79,7 +79,7 @@
         -->
         <h1 class="text-uppercase mb-0">CTB Recorder</h1>
         <hr class="star-light">
-        <h2 class="font-weight-light mb-0">A free recording software for different camsites.<br/>Currently supported: BongaCams, Cam4, CamSoda, Chaturbate, FC2Live, LiveJasmin, MyFreeCams, Streamate</h2>
+        <h2 class="font-weight-light mb-0">A free recording software for different camsites.<br/>Currently supported: Amateur.tv, BongaCams, Cam4, CamSoda, Chaturbate, CherryTV, Dreamcam, FC2Live, Flirt4free, LiveJasmin, MV Live, MyFreeCams, SecretFriends, Showup.tv, Streamate, Stripchat, Streamray, WinkTV, XLoveCam</h2>
       </div>
     </header>
 
@@ -118,19 +118,19 @@
     	</script>
         <div class="row text-center">
             <div class="col">
-                <a id="download_windows" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-win64-jre.zip');">
+                <a id="download_windows" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://git.ctbrec.com/j62/ctbrec/releases/download/5.3.3/ctbrec-5.3.3-win64-jre.zip');">
                     <i class="fa fa-windows mr-2"></i>
                     Download for Windows!
                 </a>
             </div>
             <div class="col">
-                <a id="download_macos" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-macos-jre.zip');">
+                <a id="download_macos" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://git.ctbrec.com/j62/ctbrec/releases/download/5.3.3/ctbrec-5.3.3-macos-jre.zip');">
                     <i class="fa fa-apple mr-2"></i>
                     Download for macOS!
                 </a>
             </div>
             <div class="col">
-                <a id="download_linux" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.18.0/ctbrec-1.18.0-linux-jre.zip');">
+                <a id="download_linux" class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://git.ctbrec.com/j62/ctbrec/releases/download/5.3.3/ctbrec-5.3.3-linux-jre.zip');">
                     <i class="fa fa-linux mr-2"></i>
                     Download for Linux!
                 </a>
@@ -147,7 +147,7 @@
 	        	<div class="col-lg-10 mx-auto text-center">
 	        		<p id="download-counter" class="lead text-center" style="display:none"></p>
 	        		<p class="lead">
-            		CTB Recorder is free and open source. I'm a student and wrote this software in my spare time.
+            		CTB Recorder is free and open source. (Originally created by 0xboobface). I'm a student and am helping with current development, hosting this site, git(source code repo) and more on servers I am providing for free in my spare time.
             		If you like the software or want to suggest a new feature, please consider buying me a coffee or two. Thanks!
             		</p>
           		</div>
@@ -155,29 +155,21 @@
             <div class="row text-center">
 	            <div class="col">
 	            	<p class="lead">
-	            	<a href="https://www.buymeacoffee.com/0xboobface" target="_blank">
+	            	<a href="https://buymeacoffee.com/j62ctbrec" target="_blank">
 	            		<img src="img/buymeacoffee-round.png" alt="Buy a coffee" style="height: 160px; margin: 20px"/>
 	           		</a><br/>
 	 				<input type="button" value="Buy a coffee"
-	           			onclick="window.open('https://www.buymeacoffee.com/0xboobface','_blank')">
+	           			onclick="window.open('https://buymeacoffee.com/j62ctbrec','_blank')">
 	 				</p>
 	            </div>
+
 	            <div class="col">
 	            	<p class="lead">
-	            	<a href="https://www.paypal.me/0xb00bface" target="_blank">
-	            		<img src="img/paypal-round.png" alt="PayPal" style="height: 160px; margin: 20px"/>
-	           		</a><br/>
-	 				<input type="button" value="PayPal"
-	           			onclick="window.open('https://www.paypal.me/0xb00bface','_blank')">
-	 				</p>
-	            </div>
-	            <div class="col">
-	            	<p class="lead">
-	            	<a href="https://www.patreon.com/0xb00bface" target="_blank">
+	            	<a href="https://www.patreon.com/j62ctbrec" target="_blank">
 	            		<img src="img/patreon-round.png" alt="Patreon" style="height: 160px; margin: 20px"/>
 	           		</a><br/>
 	 				<input type="button" value="Patreon"
-	           			onclick="window.open('https://www.patreon.com/0xb00bface','_blank')">
+	           			onclick="window.open('https://www.patreon.com/j62ctbrec','_blank')">
 	 				</p>
 	            </div>
             </div>
@@ -397,7 +389,7 @@
         <div class="row">
           <div class="col-lg-8 mx-auto text-center">
           	<p class="lead">
-            CTB Recorder is free and open source. The source code is available on <a href="https://github.com/0xboobface/ctbrec">Github</a>.
+            CTB Recorder is free and open source. The source code is available on <a href="https://git.ctbrec.com/j62/ctbrec">CTBRec Gitea</a>.
             </p>
           </div>
         </div>