diff --git a/artists.html b/artists.html
index cfccbed..b605493 100644
--- a/artists.html
+++ b/artists.html
@@ -2,7 +2,18 @@
 title: Basspistol Artists
 subtitle: Roster
 description: 'The Basspistol roster, united powerful syndicated Artists. Ordinary people with extraordinary visions'
-keywords: basspistol, artists, rosters, Franky, Fresco, Jokko, Sakrecoer, Max Park, Fraglebay, Sweatsky, Tikov
+tags: 
+  - basspistol
+  - artists
+  - rosters
+  - franky
+  - fresco
+  - jokko
+  - sakrecoer
+  - max Park
+  - fraglebay
+  - sweatsky
+  - tikov
 video_path: /assets/vid/artists.mp4
 image: /assets/vid/artists.jpg
 ---
diff --git a/discography.html b/discography.html
index f617fc4..4b1b39e 100644
--- a/discography.html
+++ b/discography.html
@@ -2,7 +2,13 @@
 title: Discography
 subtitle: Discog
 description: 'Our collection of Creative Commons licensed releases. Open culture''s finest'
-keywords: Discography, Releases, Music, Full-length, Albums, EP
+tags: 
+  - discography
+  - releases
+  - music
+  - full-length
+  - albums
+  - EP
 video_path: /assets/vid/discogs.mp4
 image: /assets/vid/discogs.jpg
 ---
diff --git a/highlights.html b/highlights.html
index 9001818..02773df 100644
--- a/highlights.html
+++ b/highlights.html
@@ -2,7 +2,13 @@
 title: Highlights
 subtitle: Hi-Lights
 description: 'Links to secret music, infamous articles, forbiden videos, off the record interviews and much more...'
-keywords: Music, News, blog, Interviews, links, promotion,
+tags: 
+  - music
+  - news
+  - blog
+  - interviews
+  - links
+  - promotion
 video_path: /assets/vid/highlights.mp4
 image: /assets/vid/highlights.jpg
 permalink: /highlights/
diff --git a/index.html b/index.html
index d5b8129..e955549 100644
--- a/index.html
+++ b/index.html
@@ -4,9 +4,15 @@ subtitle: Basspistol
 description: >-
   Homepage of Basspistol, The Outernational Music Syndicate established in 2010.
   The underground is dead, Long Live the Underground!
-keywords: >-
-  Basspistol, Outernational, Music, Syndicate, Homepage, Collective, Free,
-  Culture,
+tags: 
+  - basspistol
+  - uuternational
+  - music
+  - syndicate
+  - homepage
+  - collective
+  - free
+  - culture
 video_path: /assets/vid/intro_loop_.mp4
 image: /assets/vid/intro_loop_.jpg
 logo_image: /siteicon.png
diff --git a/links.html b/links.html
index 2e15dd5..df40d8a 100644
--- a/links.html
+++ b/links.html
@@ -2,7 +2,13 @@
 title: Links
 subtitle: Links
 description: 'Venture outside of your daily web-routine, read about some real projects. These links are way more than just Friends and Resources'
-keywords: Links, music, record, labels, resources, friends
+tags: 
+  - links
+  - music
+  - record
+  - labels
+  - resources
+  - friends
 video_path: /assets/vid/links.mp4
 image: /assets/vid/links.jpg
 ---
diff --git a/radio.html b/radio.html
index 324e09b..4905e3c 100644
--- a/radio.html
+++ b/radio.html
@@ -4,7 +4,13 @@ subtitle: Radio
 description: >-
   Basspistol Radio Station! 777% without commercials! RobotDJ-sets and live
   interventions! This is the sound of freedom.
-keywords: 'Radio, basspistol, Live, Music, Broadcast, Stream,'
+tags: 
+  - radio
+  - basspistol
+  - live
+  - music
+  - broadcast
+  - stream
 video_path: /assets/vid/radio.mp4
 image: /assets/vid/radio.jpg
 layout: default