diff --git a/package.accept_keywords/apps b/package.accept_keywords/apps
index 1a05f7c..c676b6a 100644
--- a/package.accept_keywords/apps
+++ b/package.accept_keywords/apps
@@ -1,3 +1,3 @@
 app-admin/eclean-kernel
-www-client/surf
 app-text/tidy-html5
+www-client/surf
diff --git a/package.accept_keywords/apps~ b/package.accept_keywords/apps~
new file mode 100644
index 0000000..1a05f7c
--- /dev/null
+++ b/package.accept_keywords/apps~
@@ -0,0 +1,3 @@
+app-admin/eclean-kernel
+www-client/surf
+app-text/tidy-html5
diff --git a/package.accept_keywords/games b/package.accept_keywords/games
deleted file mode 100644
index 07b3e3e..0000000
--- a/package.accept_keywords/games
+++ /dev/null
@@ -1,6 +0,0 @@
-games-emulation/dolphin ~*
-games-emulation/dosbox ~*
-games-emulation/gens ~*
-games-emulation/pcsxr ~*
-games-roguelike/dwarf-fortress ~*
-games-util/steam-launcher ~*
diff --git a/package.accept_keywords/games~ b/package.accept_keywords/games~
new file mode 100644
index 0000000..07b3e3e
--- /dev/null
+++ b/package.accept_keywords/games~
@@ -0,0 +1,6 @@
+games-emulation/dolphin ~*
+games-emulation/dosbox ~*
+games-emulation/gens ~*
+games-emulation/pcsxr ~*
+games-roguelike/dwarf-fortress ~*
+games-util/steam-launcher ~*
diff --git a/package.accept_keywords/irc b/package.accept_keywords/irc
deleted file mode 100644
index 3e06ac3..0000000
--- a/package.accept_keywords/irc
+++ /dev/null
@@ -1,3 +0,0 @@
-net-irc/anope ~*
-net-irc/unrealircd ~*
-net-misc/bopm ~*
diff --git a/package.accept_keywords/irc~ b/package.accept_keywords/irc~
new file mode 100644
index 0000000..3e06ac3
--- /dev/null
+++ b/package.accept_keywords/irc~
@@ -0,0 +1,3 @@
+net-irc/anope ~*
+net-irc/unrealircd ~*
+net-misc/bopm ~*
diff --git a/package.accept_keywords/kernel b/package.accept_keywords/kernel
deleted file mode 100644
index cdac008..0000000
--- a/package.accept_keywords/kernel
+++ /dev/null
@@ -1,3 +0,0 @@
-sys-boot/grub ~*
-sys-kernel/genkernel ~*
-sys-kernel/gentoo-sources ~*
diff --git a/package.accept_keywords/kernel~ b/package.accept_keywords/kernel~
new file mode 100644
index 0000000..cdac008
--- /dev/null
+++ b/package.accept_keywords/kernel~
@@ -0,0 +1,3 @@
+sys-boot/grub ~*
+sys-kernel/genkernel ~*
+sys-kernel/gentoo-sources ~*
diff --git a/package.accept_keywords/portage b/package.accept_keywords/portage
deleted file mode 100644
index d7db983..0000000
--- a/package.accept_keywords/portage
+++ /dev/null
@@ -1,2 +0,0 @@
-app-portage/repoman ~*
-sys-apps/portage ~*
diff --git a/package.accept_keywords/portage~ b/package.accept_keywords/portage~
new file mode 100644
index 0000000..d7db983
--- /dev/null
+++ b/package.accept_keywords/portage~
@@ -0,0 +1,2 @@
+app-portage/repoman ~*
+sys-apps/portage ~*
diff --git a/package.accept_keywords/required b/package.accept_keywords/required
index 7363cd5..7f3fb6c 100644
--- a/package.accept_keywords/required
+++ b/package.accept_keywords/required
@@ -1,10 +1,3 @@
-<=net-misc/netifrc-0.4.0 ~*
-<=sys-fs/udev-init-scripts-31 ~*
-## bugfixes
-
-# upstream
-<=sys-power/hibernate-script-2.0-r6 ~*
-<=virtual/udev-217 ~*
 
 ## dependency
 app-text/poppler
diff --git a/package.accept_keywords/required~ b/package.accept_keywords/required~
new file mode 100644
index 0000000..7363cd5
--- /dev/null
+++ b/package.accept_keywords/required~
@@ -0,0 +1,14 @@
+<=net-misc/netifrc-0.4.0 ~*
+<=sys-fs/udev-init-scripts-31 ~*
+## bugfixes
+
+# upstream
+<=sys-power/hibernate-script-2.0-r6 ~*
+<=virtual/udev-217 ~*
+
+## dependency
+app-text/poppler
+sys-libs/ncurses
+
+# local
+sys-process/procps **
diff --git a/package.accept_keywords/video b/package.accept_keywords/video
index b86a1e7..840484a 100644
--- a/package.accept_keywords/video
+++ b/package.accept_keywords/video
@@ -1,3 +1,2 @@
 media-libs/mesa
-x11-apps/mesa-progs
 x11-libs/libdrm
diff --git a/package.accept_keywords/video~ b/package.accept_keywords/video~
new file mode 100644
index 0000000..b86a1e7
--- /dev/null
+++ b/package.accept_keywords/video~
@@ -0,0 +1,3 @@
+media-libs/mesa
+x11-apps/mesa-progs
+x11-libs/libdrm
diff --git a/package.license b/package.license
deleted file mode 100644
index 0a215bb..0000000
--- a/package.license
+++ /dev/null
@@ -1,2 +0,0 @@
-www-client/google-chrome-unstable *
-dev-java/oracle-jre-bin *
diff --git a/package.license~ b/package.license~
new file mode 100644
index 0000000..0a215bb
--- /dev/null
+++ b/package.license~
@@ -0,0 +1,2 @@
+www-client/google-chrome-unstable *
+dev-java/oracle-jre-bin *