diff --git a/src/assets/images/twitch-icon.svg b/src/assets/images/twitch-icon.svg
new file mode 100644
index 00000000..81639cfc
--- /dev/null
+++ b/src/assets/images/twitch-icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="118px" height="138px" viewBox="0 0 118 138" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
+    <title>logo / glitch / purple</title>
+    <desc>Created with Sketch.</desc>
+    <g id="logo-/-glitch-/-purple" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-/-glitch" transform="translate(0.000000, 0.000000)">
+            <polygon id="Fill-1" fill="#FFFFFF" points="107.8058 63.7036 88.2038 83.3046 68.6038 83.3046 51.4518 100.4556 51.4518 83.3046 29.4018 83.3046 29.4018 9.8006 107.8058 9.8006"/>
+            <path d="M117.605,0 L117.605,68.605 L73.503,112.704 L53.904,112.704 L29.401,137.207 L29.401,112.704 L8.52651283e-14,112.704 L8.52651283e-14,24.502 L24.5,0 L117.605,0 Z M107.805,9.801 L29.401,9.801 L29.401,83.304 L51.452,83.304 L51.452,100.454 L68.605,83.304 L88.206,83.304 L107.805,63.703 L107.805,9.801 Z M93.1042,26.9518 L93.1042,56.3518 L83.3042,56.3518 L83.3042,26.9518 L93.1042,26.9518 Z M66.1532,26.9518 L66.1532,56.3518 L56.3532,56.3518 L56.3532,26.9518 L66.1532,26.9518 Z" id="Combined-Shape" fill="#9146FF"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index a181cccf..2e166d6f 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -713,7 +713,8 @@ const defaultInstances = {
 	'pixivFe': ['https://pixivfe.exozy.me'],
 	'indestructables': ['https://indestructables.private.coffee'],
 	'destructables': ['https://ds.vern.cc'],
-	'wtfismyip': ['https://myip.wtf']
+	'wtfismyip': ['https://myip.wtf'],
+	'safetwitch': ['https://safetwitch.drgns.space']
 }
 
 function initDefaults() {
diff --git a/src/config.json b/src/config.json
index 31da4b0b..914b5ab0 100644
--- a/src/config.json
+++ b/src/config.json
@@ -154,6 +154,31 @@
 			"embeddable": true,
 			"url": "https://twitter.com"
 		},
+		"twitch": {
+			"frontends": {
+				"safetwitch": {
+					"name": "SafeTwitch",
+					"embeddable": false,
+					"instanceList": true,
+					"url": "https://codeberg.org/dragongoose/safetwitch",
+					"localhost": false
+				}
+			},
+			"targets": [	
+				"^https?:\\/{2}(www\\.)?twitch\\.(tv|com)\\/"
+			],
+			"name": "Twitch",
+			"options": {
+				"enabled": false,
+				"redirectType": "main_frame",
+				"unsupportedUrls": "bypass",
+				"frontend": "safetwitch",
+				"instance": "public"
+			},
+			"imageType": "svg",
+			"embeddable": false,
+			"url": "https://twitch.tv"
+		},
 		"tiktok": {
 			"frontends": {
 				"proxiTok": {
diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css
index 49e8e54d..836a4007 100644
--- a/src/pages/stylesheets/styles.css
+++ b/src/pages/stylesheets/styles.css
@@ -128,7 +128,7 @@ section.links {
 	flex-wrap: wrap;
 	flex-direction: column;
 	width: 300px;
-	max-height: 850px;
+	max-height: 880px;
 }
 
 section.links div {