diff --git a/profiles/targets/desktop/package.accept_keywords/automake b/profiles/targets/desktop/package.accept_keywords/automake
deleted file mode 100644
index 1166d46..0000000
--- a/profiles/targets/desktop/package.accept_keywords/automake
+++ /dev/null
@@ -1 +0,0 @@
-=sys-devel/automake-1.16.2 ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/gnucash b/profiles/targets/desktop/package.accept_keywords/gnucash
deleted file mode 100644
index 304613b..0000000
--- a/profiles/targets/desktop/package.accept_keywords/gnucash
+++ /dev/null
@@ -1 +0,0 @@
-=app-office/gnucash-3.8b-r1 ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/jsoncpp b/profiles/targets/desktop/package.accept_keywords/jsoncpp
deleted file mode 100644
index 7ce73b5..0000000
--- a/profiles/targets/desktop/package.accept_keywords/jsoncpp
+++ /dev/null
@@ -1 +0,0 @@
-=dev-libs/jsoncpp-1.9.3_pre20200412 ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/kodi b/profiles/targets/desktop/package.accept_keywords/kodi
deleted file mode 100644
index 2698cf6..0000000
--- a/profiles/targets/desktop/package.accept_keywords/kodi
+++ /dev/null
@@ -1,3 +0,0 @@
-media-libs/kodi-platform ~amd64
-media-plugins/kodi-vfs-sftp ~amd64
-media-tv/kodi ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/matplotlib b/profiles/targets/desktop/package.accept_keywords/matplotlib
deleted file mode 100644
index 44db2e2..0000000
--- a/profiles/targets/desktop/package.accept_keywords/matplotlib
+++ /dev/null
@@ -1 +0,0 @@
-=dev-python/matplotlib-2.2.4 ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/cpp-hocon b/profiles/targets/server/package.accept_keywords/cpp-hocon
similarity index 100%
rename from profiles/targets/desktop/package.accept_keywords/cpp-hocon
rename to profiles/targets/server/package.accept_keywords/cpp-hocon
diff --git a/profiles/targets/server/package.accept_keywords/kodi b/profiles/targets/server/package.accept_keywords/kodi
deleted file mode 100644
index fc59154..0000000
--- a/profiles/targets/server/package.accept_keywords/kodi
+++ /dev/null
@@ -1,2 +0,0 @@
-media-plugins/kodi-vfs-sftp ~amd64
-media-tv/kodi ~amd64
diff --git a/profiles/targets/desktop/package.accept_keywords/leatherman b/profiles/targets/server/package.accept_keywords/leatherman
similarity index 100%
rename from profiles/targets/desktop/package.accept_keywords/leatherman
rename to profiles/targets/server/package.accept_keywords/leatherman
diff --git a/profiles/targets/server/package.accept_keywords/printer b/profiles/targets/server/package.accept_keywords/printer
deleted file mode 100644
index 7aa4c59..0000000
--- a/profiles/targets/server/package.accept_keywords/printer
+++ /dev/null
@@ -1 +0,0 @@
-net-print/samsung-unified-driver ~amd64
diff --git a/profiles/targets/server/package.accept_keywords/sau b/profiles/targets/server/package.accept_keywords/sau
deleted file mode 100644
index 79a923c..0000000
--- a/profiles/targets/server/package.accept_keywords/sau
+++ /dev/null
@@ -1,3 +0,0 @@
-sec-policy/selinux-sau ~amd64
-sys-apps/sau ~amd64
-
diff --git a/profiles/targets/server/package.accept_keywords/spotify b/profiles/targets/server/package.accept_keywords/spotify
deleted file mode 100644
index 58b94b1..0000000
--- a/profiles/targets/server/package.accept_keywords/spotify
+++ /dev/null
@@ -1 +0,0 @@
-media-sound/spotify ~amd64
diff --git a/profiles/targets/server/package.unmask/pythonmagick b/profiles/targets/server/package.unmask/pythonmagick
deleted file mode 100644
index af16cd8..0000000
--- a/profiles/targets/server/package.unmask/pythonmagick
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pythonmagick