6 files changed, 27 insertions, 74 deletions
diff --git a/lists/exclude b/lists/exclude
index 1780530..0b044a9 100644
--- a/lists/exclude
+++ b/lists/exclude
@@ -154,18 +154,18 @@ qt4-doc
 stellarium
 
 apper
-*kernel*3.12.8*
-*kernel*3.12.9*
-*kernel*3.12.13*
+*kernel*3.18.1-3*
 
-kernel-source
-kernel-source-latest
 anjuta
 kf5-libkscreen
+plasma5-konsole
 samba4-client
 scribus
 manslide
 kactivities-framework
 kde-l10n-handbooks
 samba-doc
-clamav-db
+
+lxqt-notificationd
+lxqt-policykit
+
diff --git a/lists/exclude_nonfree b/lists/exclude_nonfree
index 6866b83..381c95c 100644
--- a/lists/exclude_nonfree
+++ b/lists/exclude_nonfree
@@ -1,6 +1 @@
-cg
-cg-examples
-broadcom-wl-kernel-desktop-latest-6.30.223.141-25
-broadcom-wl-kernel-server-latest-6.30.223.141-25
-broadcom-wl-kernel-desktop-latest-6.30.223.141-24
-broadcom-wl-kernel-server-latest-6.30.223.141-24
+*3.18.1-*-3*
diff --git a/lists/input_cat b/lists/input_cat
index 32aecf9..84c45e7 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -299,3 +299,5 @@ usbutils
 efibootmgr
 phonon
 kactivitymanagerd
+dkms-vboxadditions
+dkms-virtualbox 
diff --git a/lists/input_nonfree b/lists/input_nonfree
index 17c8215..f47d429 100644
--- a/lists/input_nonfree
+++ b/lists/input_nonfree
@@ -2,7 +2,6 @@ atmel-firmware
 bluez-firmware
 dkms-broadcom-wl
 dkms-fglrx
-dkms-nvidia173
 dkms-nvidia304
 dkms-nvidia-current
 fglrx-control-center
@@ -20,74 +19,20 @@ iwlwifi-4965-ucode
 iwlwifi-agn-ucode
 kernel-firmware-nonfree
 microcode
-nvidia173-cuda
-nvidia173-devel
-nvidia173-doc-html
-nvidia173-kernel-*
-nvidia173-kernel-desktop586-latest
-nvidia173-kernel-desktop-latest
-nvidia173-kernel-server-latest
 nvidia304-cuda-opencl
 nvidia304-devel
 nvidia304-doc-html
-nvidia304-kernel-*
-nvidia304-kernel-desktop586-latest
-nvidia304-kernel-desktop-latest
-nvidia304-kernel-server-latest
 nvidia-compute-profiler
 nvidia-cuda-toolkit
 nvidia-cuda-toolkit-devel
 nvidia-current-cuda-opencl
 nvidia-current-devel
 nvidia-current-doc-html
-nvidia-current-kernel-*
-nvidia-current-kernel-desktop586-latest
-nvidia-current-kernel-desktop-latest
-nvidia-current-kernel-server-latest
 radeon-firmware
 ralink-firmware
 rtlwifi-firmware
 speedtouch-firmware
 vaapi-driver-fglrx
 x11-driver-video-fglrx
-x11-driver-video-nvidia173
 x11-driver-video-nvidia304
 x11-driver-video-nvidia-current
-
-broadcom-wl-kernel-desktop-latest-6.30.223.141-27
-broadcom-wl-kernel-desktop586-latest-6.30.223.141-27
-broadcom-wl-kernel-server-latest-6.30.223.141-27
-broadcom-wl-kernel-3.12.13-desktop-2.mga4-6.30.223.141-27
-broadcom-wl-kernel-3.12.13-server-2.mga4-6.30.223.141-27
-broadcom-wl-kernel-desktop-latest-6.30.223.141-27
-broadcom-wl-kernel-server-latest-6.30.223.141-27
-dkms-nvidia-current-331.49-1
-fglrx-kernel-3.12.13-desktop-2.mga4-13.251-12
-fglrx-kernel-3.12.13-desktop586-2.mga4-13.251-12
-fglrx-kernel-3.12.13-server-2.mga4-13.251-12
-fglrx-kernel-desktop-latest-13.251-12
-fglrx-kernel-desktop586-latest-13.251-12
-fglrx-kernel-server-latest-13.251-12
-nvidia173-kernel-3.12.13-desktop-2.mga4-173.14.39-13
-nvidia173-kernel-3.12.13-desktop586-2.mga4-173.14.39-13
-nvidia173-kernel-3.12.13-server-2.mga4-173.14.39-13
-nvidia173-kernel-desktop-latest-173.14.39-13
-nvidia173-kernel-desktop586-latest-173.14.39-13
-nvidia173-kernel-server-latest-173.14.39-13
-nvidia304-kernel-3.12.13-desktop-2.mga4-304.119-5
-nvidia304-kernel-3.12.13-desktop586-2.mga4-304.119-5
-nvidia304-kernel-3.12.13-server-2.mga4-304.119-5
-nvidia304-kernel-desktop-latest-304.119-5
-nvidia304-kernel-desktop586-latest-304.119-5
-nvidia304-kernel-server-latest-304.119-5
-nvidia-current-cuda-opencl-331.49-1
-nvidia-current-devel-331.49-1
-nvidia-current-doc-html-331.49-1
-nvidia-current-kernel-3.12.13-desktop-2.mga4-331.49-2
-nvidia-current-kernel-3.12.13-desktop586-2.mga4-331.49-2
-nvidia-current-kernel-3.12.13-server-2.mga4-331.49-2
-nvidia-current-kernel-desktop-latest-331.49-2
-nvidia-current-kernel-desktop586-latest-331.49-2
-nvidia-current-kernel-server-latest-331.49-2
-x11-driver-video-nvidia-current-331.49-1
-
diff --git a/lists/kernel32 b/lists/kernel32
index a77f72f..a0361a5 100644
--- a/lists/kernel32
+++ b/lists/kernel32
@@ -23,8 +23,15 @@ libkmf0
 liblayout
 libossp_uuid-devel
 libmate-polkit1_0
-nvidia173-kernel-desktop586-latest
-nvidia173-kernel-desktop-latest
-nvidia173-kernel-server-latest
 liblightdm-gobject1_0
 libglapi0
+broadcom-wl-kernel-desktop-latest
+broadcom-wl-kernel-desktop586-latest
+broadcom-wl-kernel-server-latest
+nvidia-current-kernel-desktop-latest
+nvidia-current-kernel-desktop586-latest
+nvidia-current-kernel-server-latest
+nvidia304-kernel-desktop-latest
+nvidia304-kernel-desktop586-latest
+nvidia304-kernel-server-latest
+
diff --git a/lists/kernel64 b/lists/kernel64
index 8eda87c..7355f2d 100644
--- a/lists/kernel64
+++ b/lists/kernel64
@@ -21,10 +21,14 @@ lib64kmf0
 lib64layout
 lib64ossp_uuid-devel
 lib64mate-polkit1_0
-nvidia173-kernel-desktop-latest
-nvidia173-kernel-server-latest
 efibootmgr
 kernel-server
-broadcom-wl-kernel-desktop
-broadcom-wl-kernel-server
 lib64lightdm-gobject1_0
+broadcom-wl-kernel-desktop-latest
+broadcom-wl-kernel-server-latest
+nvidia-current-kernel-desktop-latest
+nvidia-current-kernel-server-latest
+nvidia304-kernel-desktop-latest
+nvidia304-kernel-server-latest
+
+