diff --git a/app/Constants/TextExtras.php b/app/Constants/TextExtras.php
new file mode 100644
index 0000000..b4debf4
--- /dev/null
+++ b/app/Constants/TextExtras.php
@@ -0,0 +1,7 @@
+<?php
+namespace App\Constants;
+
+abstract class TextExtras {
+    const USER = 0;
+    const HASHTAG = 1;
+}
diff --git a/app/Helpers/Wrappers.php b/app/Helpers/Wrappers.php
index 90a505c..ae8ba50 100644
--- a/app/Helpers/Wrappers.php
+++ b/app/Helpers/Wrappers.php
@@ -5,10 +5,9 @@ use App\Cache\ApcuCache;
 use App\Cache\JSONCache;
 use App\Cache\RedisCache;
 use App\Constants\CacheMethods;
+use App\Constants\TextExtras;
 use App\Models\BaseTemplate;
 
-use TikScraper\Constants\UserAgents as TikScraperUserAgents;
-
 class Wrappers {
     /**
      * Setup of Latte template engine
@@ -92,6 +91,30 @@ class Wrappers {
             return UrlBuilder::download($url, $username, $id, $watermark);
         });
 
+        // Add URLs to video descriptions
+        // TODO: Make it work with unicode characters such as emojis
+        $latte->addFunction('render_desc', function (string $desc, array $textExtras = []): string {
+            $sanitizedDesc = htmlspecialchars($desc);
+            $out = $sanitizedDesc;
+            foreach ($textExtras as $extra) {
+                $url = '';
+                $text = mb_substr($desc, $extra->start, $extra->end - $extra->start, 'UTF-8');
+                switch ($extra->type) {
+                    // User URL
+                    case TextExtras::USER:
+                        $url = UrlBuilder::user(htmlspecialchars($extra->userUniqueId));
+                        break;
+                    // Hashtag URL
+                    case TextExtras::HASHTAG:
+                        $url = UrlBuilder::tag(htmlspecialchars($extra->hashtagName));
+                        break;
+                }
+
+                $out = str_replace($text, "<a href=\"$url\">$text</a>", $out);
+            }
+            return $out;
+        });
+
         $latte->render(Misc::getView($template), $base);
     }
 
diff --git a/templates/components/themes/default.latte b/templates/components/themes/default.latte
index 41af404..da3556a 100644
--- a/templates/components/themes/default.latte
+++ b/templates/components/themes/default.latte
@@ -17,7 +17,7 @@
 			{if !empty($item->challenges)}
 			<p>{include './common/tags.latte', challenges: $item->challenges}</p>
 			{/if}
-			<p n:ifcontent>{$item->desc}</p>
+			<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
 			<p>Song: {$item->music->title}</p>
 			<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 			{include './common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
diff --git a/templates/views/user.latte b/templates/views/user.latte
index 2e07961..f8708a6 100644
--- a/templates/views/user.latte
+++ b/templates/views/user.latte
@@ -15,8 +15,10 @@
 	{if $info->detail->privateAccount}
 	<p><strong>Private account</strong></p>
 	{/if}
-	<p></p>
 	<p>{$info->detail->signature}</p>
+	{if isset($info->detail->bioLink)}
+	<p>Link: <a href="{$info->detail->bioLink->link}">{$info->detail->bioLink->link}</a></p>
+	{/if}
 	<p>Following: {number($info->stats->followingCount)} / Followers: {number($info->stats->followerCount)}</p>
 	<p>Hearts: {number($info->stats->heartCount)} / Videos: {$info->stats->videoCount}</p>
 {/block}
diff --git a/templates/views/video.latte b/templates/views/video.latte
index 6283506..c142d22 100644
--- a/templates/views/video.latte
+++ b/templates/views/video.latte
@@ -33,7 +33,7 @@
 						<p>{include '../components/themes/common/tags.latte', challenges: $item->challenges}</p>
 						{/if}
 						<div class="content">
-							<p n:ifcontent>{$item->desc}</p>
+							<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
 							<p>Song: {$item->music->title}</p>
 							<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 							{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}