diff --git a/options.conf b/options.conf
index 09323ac..58867d7 100644
--- a/options.conf
+++ b/options.conf
@@ -15,7 +15,7 @@
 
 # opengl, video, X
 */* dri opengl sdl -wayland xv xvmc X
-*/* video_drivers: nouveau
+*/* video_drivers: nouveau intel vesa
 
 # image formats
 */* apng exif gif jpeg jpeg2k png svg tiff wmf
@@ -31,7 +31,7 @@
 */* x86_cpu_features: aes avx mmxext mmx popcnt sse sse2 ssse3 sse4.1 sse4.2
 
 # build options
-*/* build_options: jobs=8 -optional_tests -recommended_tests -expensive_tests
+*/* build_options: symbols=split jobs=8 -optional_tests -recommended_tests -expensive_tests
 
 # targets
 */* targets: x86_64-pc-linux-gnu
diff --git a/options.conf.d/laptop.conf b/options.conf.d/laptop.conf
deleted file mode 100644
index a6cc81a..0000000
--- a/options.conf.d/laptop.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-*/* video_drivers: intel vesa
-
-*/* build_options: symbols=strip
diff --git a/options.conf.d/non-laptop.conf b/options.conf.d/non-laptop.conf
index 7314cde..e204da8 100644
--- a/options.conf.d/non-laptop.conf
+++ b/options.conf.d/non-laptop.conf
@@ -1,5 +1,3 @@
 */* x86_cpu_features: avx2 fma sse3
 
-*/* build_options: symbols=split
-
 */* targets: i686-pc-linux-gnu