diff --git a/pkg/util/util.go b/pkg/util/util.go
index a221169..fa4d7e4 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -43,6 +43,19 @@ func GetServiceByHost(host, service string) string {
 		default:
 			return "http://[300:a98d:d6d0:8a08::f]"
 		}
+	} else if strings.HasSuffix(host, "onion") {
+		switch service {
+		case "radio":
+			return "http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion"
+		case "files":
+			return "http://qf5e43nlhvnrutmikuvbdfj3cmtthokpbaxtkm6mjlslttzvtgm4fxid.onion"
+		case "upload":
+			return "http://4usftbmjpfexkr2x5xbp5ukmygpmg4fgrnx2wbifsexqctooz5hmviyd.onion"
+		case "git":
+			return "http://qqitm7qlsbbubwmjos4cqzmvkqidg34rfnbyhuydhalep33fbvh22xyd.onion"
+		default:
+			return "http://moq7aejnf4xk5k2bkaltli3ftkhusy2mbrd3pj23nrca343ku2mgk4yd.onion"
+		}
 	} else {
 		switch service {
 		case "radio":
diff --git a/web/templates/about.pug b/web/templates/about.pug
index f229afe..96571b5 100755
--- a/web/templates/about.pug
+++ b/web/templates/about.pug
@@ -106,7 +106,7 @@ block content
                 p
                     a(href='https://radio.arav.su') radio.arav.su
                     | .
-                    a(href='http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion') #[s onion]
+                    a(href='http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion') onion
                     | .
                     a(href='http://radio.arav.i2p') i2p
                     | .
@@ -118,7 +118,7 @@ block content
                 p
                     a(href='https://files.arav.su') files.arav.su
                     | .
-                    a(href='http://qf5e43nlhvnrutmikuvbdfj3cmtthokpbaxtkm6mjlslttzvtgm4fxid.onion') #[s onion]
+                    a(href='http://qf5e43nlhvnrutmikuvbdfj3cmtthokpbaxtkm6mjlslttzvtgm4fxid.onion') onion
                     | .
                     a(href='http://files.arav.i2p') i2p
                     | .
@@ -129,7 +129,7 @@ block content
                 p
                     a(href='https://upload.arav.su') upload.arav.su
                     | .
-                    a(href='http://.onion') #[s onion]
+                    a(href='http://4usftbmjpfexkr2x5xbp5ukmygpmg4fgrnx2wbifsexqctooz5hmviyd.onion') onion
                     | .
                     a(href='http://upload.arav.i2p') i2p
                     | .
@@ -140,7 +140,7 @@ block content
                 p 
                     a(href='https://git.arav.su') git.arav.su
                     | .
-                    a(href='http://qqitm7qlsbbubwmjos4cqzmvkqidg34rfnbyhuydhalep33fbvh22xyd.onion') #[s onion]
+                    a(href='http://qqitm7qlsbbubwmjos4cqzmvkqidg34rfnbyhuydhalep33fbvh22xyd.onion') onion
                     | .
                     a(href='http://git.arav.i2p') i2p
                     | .
diff --git a/web/templates/index.pug b/web/templates/index.pug
index e4b5ed9..b73695b 100755
--- a/web/templates/index.pug
+++ b/web/templates/index.pug
@@ -19,7 +19,7 @@ block content
         span
             a(href='https://arav.su') arav.su
             | .
-            a(href='http://moq7aejnf4xk5k2bkaltli3ftkhusy2mbrd3pj23nrca343ku2mgk4yd.onion') #[s onion]
+            a(href='http://moq7aejnf4xk5k2bkaltli3ftkhusy2mbrd3pj23nrca343ku2mgk4yd.onion') onion
             |  .
             a(href='http://[300:a98d:d6d0:8a08::f]') ygg
             | .
@@ -30,7 +30,7 @@ block content
         span
             a(href='https://radio.arav.su') radio
             | .
-            a(href='http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion') #[s onion]
+            a(href='http://wsmkgnmhmzqm7kyzv7jnzzafvgm7xlmlfvzhgorpapd5or2arnhuktqd.onion') onion
             |  .
             a(href='http://[300:a98d:d6d0:8a08::e]') ygg
             | .
@@ -39,7 +39,7 @@ block content
         span
             a(href='https://files.arav.su') files
             | .
-            a(href='http://qf5e43nlhvnrutmikuvbdfj3cmtthokpbaxtkm6mjlslttzvtgm4fxid.onion') #[s onion]
+            a(href='http://qf5e43nlhvnrutmikuvbdfj3cmtthokpbaxtkm6mjlslttzvtgm4fxid.onion') onion
             |  .
             a(href='http://[300:a98d:d6d0:8a08::d]') ygg
             | .
@@ -48,7 +48,7 @@ block content
         span
             a(href='https://upload.arav.su') upload
             | .
-            a(href='#') #[s onion]
+            a(href='http://4usftbmjpfexkr2x5xbp5ukmygpmg4fgrnx2wbifsexqctooz5hmviyd.onion') onion
             |  .
             a(href='http://[300:a98d:d6d0:8a08::c]') ygg
             | .
@@ -57,7 +57,7 @@ block content
         span
             a(href='https://git.arav.su') git
             | .
-            a(href='http://qqitm7qlsbbubwmjos4cqzmvkqidg34rfnbyhuydhalep33fbvh22xyd.onion') #[s onion]
+            a(href='http://qqitm7qlsbbubwmjos4cqzmvkqidg34rfnbyhuydhalep33fbvh22xyd.onion') onion
             |  .
             a(href='http://[300:a98d:d6d0:8a08::b]') ygg
             | .