diff --git a/craftmaster/packages.list b/craftmaster/packages.list
index f501290..6bf4bc1 100644
--- a/craftmaster/packages.list
+++ b/craftmaster/packages.list
@@ -1,87 +1,87 @@
 [Core]
 # For multi-thread compilation
-dev-util/jom
+dev-utils/jom
 # For general KDE compilation
-dev-util/cmake
+dev-utils/cmake
 # For everything that uses MIME information
-win32libs/shared-mime-info
+libs/shared-mime-info
 # Everything wants Qt 5
 libs/qt5
 # And some things want QtWebEngine
 libs/qt5/qtwebengine
 
 [Frameworks]
 # KArchive
-win32libs/libarchive
-win32libs/liblzma
+libs/libarchive
+libs/liblzma
 
 # KI18n
-win32libs/gettext
-dev-util/gettext-tools
+libs/gettext
+dev-utils/gettext-tools-pkg
 
 # Solid
-dev-util/winflexbison
+dev-utils/flexbison
 
 # KDocTools
-win32libs/libxslt
-win32libs/libxml2
+libs/libxslt
+libs/libxml2
 data/docbook-dtd
 data/docbook-xsl
 
 # KWallet
-win32libs/gcrypt
+libs/gcrypt
 
 # KJS
-win32libs/pcre
+libs/pcre
 
 # KHTML
-win32libs/libpng
-win32libs/libjpeg-turbo
-win32libs/giflib
+libs/libpng
+libs/libjpeg-turbo
+libs/giflib
 
 # KActivities
-win32libs/boost/boost-headers
+libs/boost/boost-headers
 
 # KCodecs
-gnuwin32/gperf
+dev-utils/gperf
 
 # KDELibs4Support
 data/docbook-dtd42
 
 # Baloo
-win32libs/lmdb
+libs/lmdb
 
 # Purpose
 kdesupport/qca
 
 [Applications]
 # libkexiv2
-win32libs/exiv2
+libs/exiv2
 
 # KStars
-win32libs/eigen3
+libs/eigen3
 
 # Minuet
-win32libs/glib
-win32libs/fluidsynth
+libs/glib
+libs/fluidsynth
 
 # KCalCore
-win32libs/libical
+libs/libical
 
 [Extragear]
 # KDevelop
-win32libs/llvm-meta/llvm
+libs/llvm-meta/llvm
 kdesupport/grantlee
 
 # Labplot
-win32libs/gsl
+libs/gsl
 
 # Skrooge
-dev-util/pkg-config
+dev-utils/pkg-config
 
 # KMyMoney & Alkimia
-win32libs/libgmp
-win32libs/mpir
+libs/libgmp
+libs/mpir
 
 # Amarok
-win32libs/taglib
+libs/taglib