diff --git a/data/en/sections/skills.toml b/data/en/sections/skills.toml
index 84f674e..b160f0e 100644
--- a/data/en/sections/skills.toml
+++ b/data/en/sections/skills.toml
@@ -6,37 +6,64 @@ weight = 2
 showOnNavbar = true
 template = "sections/skills.html"
 
+[[buttons]]
+name = "All"
+filter = "all"
+
+[[buttons]]
+name = "Language"
+filter = "language"
+
+[[buttons]]
+name = "Tool"
+filter = "tool"
+
+[[buttons]]
+name = "Container"
+filter = "container"
+
+[[buttons]]
+name = "Database"
+filter = "database"
+
 [[skills]]
 name = "Java"
 logo = "images/skills/java.svg"
 summary = "My main \"back-end\" programming language. Proficient in frameworks and libraries such as Hibernate, JPA and Spring."
+categories = ["language"]
 
 [[skills]]
 name = "React.js"
 logo = "images/skills/react.svg"
 summary = "Lots of experience creating modern web applications using React. Also familiar with the Material-UI library."
+categories = ["language"]
 
 [[skills]]
 name = "TypeScript"
 logo = "images/skills/typescript.svg"
 summary = "Most of my frontend development these days is done using TypeScript. I have extensive experience on the typing system and know how to make the most effective use of it."
+categories = ["language"]
 
 [[skills]]
 name = "Docker"
 logo = "images/skills/docker.svg"
 summary = "Experienced in packaging, distributing and managing Dockerized software."
+categories = ["container", "tool"]
 
 [[skills]]
 name = "Linux"
 logo = "images/skills/linux.svg"
 summary = "Using Linux as my main operating system for a number of years both at work and on my free time. Capable of writing bash/shell scripts."
+categories = ["tool"]
 
 [[skills]]
 name = "Git"
 logo = "images/skills/git.svg"
 summary = "Experienced with git-based development. Especially feature driven development workflow."
+categories = ["tool"]
 
 [[skills]]
 name = "PostgreSQL"
 logo = "images/skills/postgresql.svg"
 summary = "I have experience in designing and maintaining PostgreSQL databases."
+categories = ["database"]
diff --git a/data/fi/sections/skills.toml b/data/fi/sections/skills.toml
index b519cd9..9d6798a 100644
--- a/data/fi/sections/skills.toml
+++ b/data/fi/sections/skills.toml
@@ -6,37 +6,64 @@ weight = 2
 showOnNavbar = true
 template = "sections/skills.html"
 
+[[buttons]]
+name = "All"
+filter = "all"
+
+[[buttons]]
+name = "Kieli"
+filter = "language"
+
+[[buttons]]
+name = "Työkalu"
+filter = "tool"
+
+[[buttons]]
+name = "Säiliöinti"
+filter = "container"
+
+[[buttons]]
+name = "Tietokanta"
+filter = "database"
+
 [[skills]]
 name = "Java"
 logo = "images/skills/java.svg"
 summary = "Pääasiallinen \"back-end\" -ohjelmointikieleni. Hallussa on myös frameworkejä ja kirjastoja kuten Hibernate, JPA ja Spring."
+categories = ["language"]
 
 [[skills]]
 name = "React.js"
 logo = "images/skills/react.svg"
 summary = "Paljon kokemusta modernien web-applikaatioiden toteuttamisesta Reactin avulla. Olen myös käyttänyt paljon Material-UI kirjastoa."
+categories = ["language"]
 
 [[skills]]
 name = "TypeScript"
 logo = "images/skills/typescript.svg"
 summary = "Suurin osa nykyisestä frontend-kehityksestäni tapahtuu TypeScriptillä. Minulla on laajasti kokemusta sen tyyppijärjestelmästä ja osaan hyödyntää sitä tehokkaasti."
+categories = ["language"]
 
 [[skills]]
 name = "Docker"
 logo = "images/skills/docker.svg"
 summary = "Kokemusta Dockeroitujen sovelluksien paketoinnista, jakamisesta ja hallinnoinnista."
+categories = ["container", "tool"]
 
 [[skills]]
 name = "Linux"
 logo = "images/skills/linux.svg"
 summary = "Olen käyttänyt Linuxia ainoana käyttöjärjestelmänäni useita vuosia niin töissä kuin vapaa-ajallakin. Osaan myös kirjoittaa bash/shell-skriptejä."
+categories = ["tool"]
 
 [[skills]]
 name = "Git"
 logo = "images/skills/git.svg"
 summary = "Kokenut git-pohjaisessa kehitysympäristössä. Erityisesti ominaisuuslähtöinen workflow on tuttu."
+categories = ["tool"]
 
 [[skills]]
 name = "PostgreSQL"
 logo = "images/skills/postgresql.svg"
 summary = "Minulla on kokemusta PostgreSQL-tietokantojen suunnittelusta ja ylläpidosta."
+categories = ["database"]