diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
index f9f79f63..f499bc15 100644
--- a/tools-uclibc/desktop/config
+++ b/tools-uclibc/desktop/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.8.6-hardened Kernel Configuration
+# Linux/x86_64 3.8.12-hardened Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6515,7 +6515,10 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
@@ -6646,19 +6649,8 @@ CONFIG_OPTIMIZE_INLINING=y
CONFIG_TASK_SIZE_MAX_SHIFT=47
CONFIG_PAX_USERCOPY_SLABS=y
CONFIG_GRKERNSEC=y
-CONFIG_GRKERNSEC_CONFIG_AUTO=y
-# CONFIG_GRKERNSEC_CONFIG_CUSTOM is not set
-# CONFIG_GRKERNSEC_CONFIG_SERVER is not set
-CONFIG_GRKERNSEC_CONFIG_DESKTOP=y
-CONFIG_GRKERNSEC_CONFIG_VIRT_NONE=y
-# CONFIG_GRKERNSEC_CONFIG_VIRT_GUEST is not set
-# CONFIG_GRKERNSEC_CONFIG_VIRT_HOST is not set
-# CONFIG_GRKERNSEC_CONFIG_PRIORITY_PERF is not set
-CONFIG_GRKERNSEC_CONFIG_PRIORITY_SECURITY=y
-
-#
-# Default Special Groups
-#
+# CONFIG_GRKERNSEC_CONFIG_AUTO is not set
+CONFIG_GRKERNSEC_CONFIG_CUSTOM=y
CONFIG_GRKERNSEC_PROC_GID=10
CONFIG_GRKERNSEC_TPE_TRUSTED_GID=10
CONFIG_GRKERNSEC_SYMLINKOWN_GID=9996
@@ -6707,7 +6699,6 @@ CONFIG_PAX_RANDMMAP=y
CONFIG_PAX_MEMORY_STACKLEAK=y
CONFIG_PAX_MEMORY_STRUCTLEAK=y
CONFIG_PAX_REFCOUNT=y
-CONFIG_PAX_CONSTIFY_PLUGIN=y
CONFIG_PAX_USERCOPY=y
# CONFIG_PAX_USERCOPY_DEBUG is not set
CONFIG_PAX_SIZE_OVERFLOW=y
@@ -6761,12 +6752,13 @@ CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
CONFIG_GRKERNSEC_CHROOT_NICE=y
CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
CONFIG_GRKERNSEC_CHROOT_CAPS=y
+# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
#
# Kernel Auditing
#
CONFIG_GRKERNSEC_AUDIT_GROUP=y
-CONFIG_GRKERNSEC_AUDIT_GID=100
+CONFIG_GRKERNSEC_AUDIT_GID=9995
CONFIG_GRKERNSEC_EXECLOG=y
CONFIG_GRKERNSEC_RESLOG=y
CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
diff --git a/tools-uclibc/desktop/gentoo/.config/midori/config b/tools-uclibc/desktop/gentoo/.config/midori/config
new file mode 100644
index 00000000..30bd0dd9
--- /dev/null
+++ b/tools-uclibc/desktop/gentoo/.config/midori/config
@@ -0,0 +1,7 @@
+[settings]
+default-encoding=ISO-8859-1
+enable-site-specific-quirks=true
+last-window-state=MIDORI_WINDOW_MAXIMIZED
+location-entry-search=https://duckduckgo.com/?q=%s
+enable-html5-database=true
+user-agent=Mozilla/5.0 (Macintosh; U; Intel Mac OS X; c) AppleWebKit/535+ (KHTML, like Gecko) Version/5.0 Safari/535.22+ Midori/0.4
diff --git a/tools-uclibc/desktop/gentoo/.config/midori/session.xbel b/tools-uclibc/desktop/gentoo/.config/midori/session.xbel
new file mode 100644
index 00000000..08427a17
--- /dev/null
+++ b/tools-uclibc/desktop/gentoo/.config/midori/session.xbel
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+‪Google
+
+
+
+
+
diff --git a/tools-uclibc/desktop/gentoo/.config/midori/speeddial b/tools-uclibc/desktop/gentoo/.config/midori/speeddial
new file mode 100644
index 00000000..1a6505b5
--- /dev/null
+++ b/tools-uclibc/desktop/gentoo/.config/midori/speeddial
@@ -0,0 +1,3 @@
+[settings]
+columns=3
+rows=3
diff --git a/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini b/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini
new file mode 100644
index 00000000..4d223a32
--- /dev/null
+++ b/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini
@@ -0,0 +1,560 @@
+[update_checker]
+checked_date=@Variant(\0\0\0\xe\0%{\x9c)
+last_known_version=0.8.5.5487
+
+[smplayer]
+stable_version=0.8.5
+check_for_new_version=true
+
+[actions]
+open_file=Ctrl+F
+open_directory=
+open_playlist=
+open_vcd=
+open_audio_cd=
+open_dvd=
+open_dvd_folder=
+open_url=Ctrl+U
+close=Ctrl+X
+clear_recents=
+favorites_menu=
+tv_menu=
+edit_tv_list=
+jump_tv_list=
+next_tv=H
+previous_tv=L
+radio_menu=
+edit_radio_list=
+jump_radio_list=
+next_radio=Shift+H
+previous_radio=Shift+L
+play=
+play_or_pause=Media Play
+pause=Space
+pause_and_frame_step=
+stop=Media Stop
+frame_step=.
+rewind1=Left
+rewind2=Down
+rewind3=PgDown
+forward1=Right
+forward2=Up
+forward3=PgUp
+set_a_marker=
+set_b_marker=
+clear_ab_markers=
+repeat=
+jump_to=Ctrl+J
+normal_speed=Backspace
+halve_speed={
+double_speed=}
+dec_speed=[
+inc_speed=]
+dec_speed_4=
+inc_speed_4=
+dec_speed_1=
+inc_speed_1=
+fullscreen=F
+compact=Ctrl+C
+video_equalizer=Ctrl+E
+screenshot=S
+multiple_screenshots=Shift+D
+video_preview=
+flip=
+mirror=
+postprocessing=
+autodetect_phase=
+deblock=
+dering=
+gradfun=
+add_noise=
+add_letterbox=
+upscaling=
+audio_equalizer=
+mute=M
+decrease_volume="9, /"
+increase_volume="0, *"
+dec_audio_delay=-
+inc_audio_delay=+
+audio_delay=
+load_audio_file=
+unload_audio_file=
+extrastereo_filter=
+karaoke_filter=
+volnorm_filter=
+load_subs=
+unload_subs=
+dec_sub_delay=Z
+inc_sub_delay=X
+sub_delay=
+dec_sub_pos=R
+inc_sub_pos=T
+dec_sub_scale=Shift+R
+inc_sub_scale=Shift+T
+dec_sub_step=G
+inc_sub_step=Y
+use_ass_lib=
+use_forced_subs_only=
+subtitle_visibility=V
+show_find_sub_dialog=
+upload_subtitles=
+show_playlist=Ctrl+L
+show_file_properties=Ctrl+I
+show_preferences=Ctrl+P
+show_tube_browser=F11
+show_mplayer_log=Ctrl+M
+show_smplayer_log=Ctrl+S
+first_steps=
+faq=
+cl_options=
+check_updates=
+show_config=
+about_qt=
+about_smplayer=
+facebook=
+twitter=
+gmail=
+hotmail=
+yahoo=
+play_next=>
+play_prev=<
+move_up=Alt+Up
+move_down=Alt+Down
+move_left=Alt+Left
+move_right=Alt+Right
+inc_zoom=E
+dec_zoom=W
+reset_zoom=Shift+E
+auto_zoom=Shift+W
+zoom_169=Shift+A
+zoom_235=Shift+S
+exit_fullscreen=Esc
+next_osd=O
+dec_contrast=1
+inc_contrast=2
+dec_brightness=3
+inc_brightness=4
+dec_hue=5
+inc_hue=6
+dec_saturation=7
+inc_saturation=8
+dec_gamma=
+inc_gamma=
+next_video=
+next_audio=K
+next_subtitle=J
+next_chapter=@@
+prev_chapter=!
+toggle_double_size=Ctrl+D
+reset_video_equalizer=
+reset_audio_equalizer=
+show_context_menu=
+next_aspect=A
+next_wheel_function=
+show_filename=Shift+I
+toggle_deinterlacing=D
+osd_none=
+osd_seek=
+osd_timer=
+osd_total=
+denoise_none=
+denoise_normal=
+denoise_soft=
+unsharp_off=
+blur=
+sharpen=
+size_50=
+size_75=
+size_100=Ctrl+1
+size_125=
+size_150=
+size_175=
+size_200=Ctrl+2
+size_300=
+size_400=
+deinterlace_none=
+deinterlace_l5=
+deinterlace_yadif0=
+deinterlace_yadif1=
+deinterlace_lb=
+deinterlace_kern=
+channels_stereo=
+channels_surround=
+channels_ful51=
+channels_ful61=
+channels_ful71=
+stereo=
+left_channel=
+right_channel=
+mono=
+reverse_channels=
+aspect_detect=
+aspect_1%3A1=
+aspect_3%3A2=
+aspect_4%3A3=
+aspect_5%3A4=
+aspect_14%3A9=
+aspect_14%3A10=
+aspect_16%3A9=
+aspect_16%3A10=
+aspect_2.35%3A1=
+aspect_none=
+rotate_none=
+rotate_clockwise_flip=
+rotate_clockwise=
+rotate_counterclockwise=
+rotate_counterclockwise_flip=
+on_top_always=
+on_top_never=
+on_top_playing=
+toggle_stay_on_top=
+cc_none=
+cc_ch_1=
+cc_ch_2=
+cc_ch_3=
+cc_ch_4=
+sub_fps_none=
+sub_fps_23976=
+sub_fps_24=
+sub_fps_25=
+sub_fps_29970=
+sub_fps_30=
+dvdnav_up=Shift+Up
+dvdnav_down=Shift+Down
+dvdnav_left=Shift+Left
+dvdnav_right=Shift+Right
+dvdnav_menu=Shift+Return
+dvdnav_select=Return
+dvdnav_prev=Shift+Esc
+dvdnav_mouse=
+disc_menu=
+speed_menu=
+ab_menu=
+videotrack_menu=
+videosize_menu=
+zoom_menu=
+aspect_menu=
+deinterlace_menu=
+videofilter_menu=
+denoise_menu=
+unsharp_menu=
+rotate_menu=
+ontop_menu=
+audiotrack_menu=
+audiofilter_menu=
+audiochannels_menu=
+stereomode_menu=
+subtitlestrack_menu=
+subfps_menu=
+closed_captions_menu=
+titles_menu=
+chapters_menu=
+angles_menu=
+programtrack_menu=
+osd_menu=
+quit=Ctrl+Q
+show_tray_icon=
+restore\hide=
+pl_open=
+pl_save=
+pl_play=
+pl_next=N
+pl_prev=P
+pl_move_up=
+pl_move_down=
+pl_repeat=
+pl_shuffle=
+pl_add_current=
+pl_add_files=
+pl_add_directory=
+pl_add_urls=
+pl_remove_selected=
+pl_remove_all=
+pl_edit=
+toggle_video_info=
+toggle_frame_counter=
+edit_main_toolbar=
+edit_control1=
+edit_control2=
+edit_floating_control=
+show_main_toolbar=F5
+show_language_toolbar=F6
+
+[%General]
+config_version=4
+mplayer_bin=mplayer2
+driver\vo="xv,"
+driver\audio_output=
+use_screenshot=true
+screenshot_folder=/home/gentoo/Pictures/smplayer_screenshots
+dont_remember_media_settings=false
+dont_remember_time_pos=false
+audio_lang=
+subtitle_lang=
+use_direct_rendering=false
+use_double_buffer=true
+use_soft_video_eq=false
+use_slices=false
+autoq=6
+add_blackborders_on_fullscreen=false
+disable_screensaver=true
+vdpau_ffh264vdpau=true
+vdpau_ffmpeg12vdpau=true
+vdpau_ffwmv3vdpau=true
+vdpau_ffvc1vdpau=true
+vdpau_ffodivxvdpau=false
+vdpau_disable_video_filters=true
+use_soft_vol=true
+softvol_max=110
+use_scaletempo=-1
+use_hwac3=false
+use_audio_equalizer=true
+global_volume=true
+volume=50
+mute=false
+autosync=false
+autosync_factor=100
+use_mc=false
+mc_value=0
+osd=0
+osd_delay=2200
+file_settings_method=hash
+
+[drives]
+dvd_device=
+cdrom_device=/dev/cdrom
+vcd_initial_title=2
+use_dvdnav=false
+
+[performance]
+priority=2
+frame_drop=false
+hard_frame_drop=false
+coreavc=false
+h264_skip_loop_filter=1
+HD_height=720
+fast_audio_change=-1
+threads=1
+cache_for_files=2048
+cache_for_streams=2048
+cache_for_dvds=0
+cache_for_vcds=1024
+cache_for_audiocds=1024
+cache_for_tv=3000
+
+[youtube]
+quality=22
+user_agent=
+
+[subtitles]
+font_file=
+font_name=
+use_fontconfig=false
+subcp=ISO-8859-1
+use_enca=false
+enca_lang=
+font_autoscale=1
+subfuzziness=1
+autoload_sub=true
+use_ass_subtitles=true
+ass_line_spacing=0
+use_forced_subs_only=false
+sub_visibility=true
+subtitles_on_screenshots=false
+use_new_sub_commands=-1
+change_sub_scale_should_restart=-1
+fast_load_sub=true
+styles\fontname=Arial
+styles\fontsize=20
+styles\primarycolor=4294967295
+styles\backcolor=4278190080
+styles\outlinecolor=4278190080
+styles\bold=false
+styles\italic=false
+styles\halignment=2
+styles\valignment=0
+styles\borderstyle=1
+styles\outline=1
+styles\shadow=2
+styles\marginl=20
+styles\marginr=20
+styles\marginv=8
+force_ass_styles=false
+user_forced_ass_style=
+freetype_support=true
+
+[advanced]
+color_key=20202
+use_mplayer_window=false
+monitor_aspect=
+use_idx=false
+mplayer_additional_options=
+mplayer_additional_video_filters=
+mplayer_additional_audio_filters=
+log_mplayer=true
+verbose_log=false
+autosave_mplayer_log=false
+mplayer_log_saveto=
+log_smplayer=true
+log_filter=.*
+save_smplayer_log=false
+repaint_video_background=false
+use_edl_files=true
+prefer_ipv4=true
+use_short_pathnames=false
+change_video_equalizer_on_startup=true
+use_pausing_keep_force=true
+correct_pts=-1
+actions_to_run=
+show_tag_in_window_title=true
+time_to_kill_mplayer=1000
+
+[gui]
+fullscreen=false
+start_in_fullscreen=false
+compact_mode=false
+stay_on_top=0
+size_factor=100
+resize_method=0
+style=
+move_when_dragging=false
+mouse_left_click_function=dvdnav_mouse
+mouse_right_click_function=show_context_menu
+mouse_double_click_function=fullscreen
+mouse_middle_click_function=mute
+mouse_xbutton1_click_function=
+mouse_xbutton2_click_function=
+mouse_wheel_function=2
+wheel_function_cycle=30
+wheel_function_seeking_reverse=false
+seeking1=10
+seeking2=60
+seeking3=600
+seeking4=30
+update_while_seeking=false
+time_slider_drag_delay=100
+relative_seeking=false
+precise_seeking=true
+reset_stop=false
+language=
+iconset=
+balloon_count=5
+restore_pos_after_fullscreen=false
+save_window_size_on_exit=true
+close_on_finish=false
+default_font=
+pause_when_hidden=false
+allow_video_movement=false
+gui=DefaultGUI
+gui_minimum_width=0
+default_size=@Size(683 509)
+hide_video_window_on_audio_files=true
+report_mplayer_crashes=true
+reported_mplayer_is_old=false
+auto_add_to_playlist=true
+add_to_playlist_consecutive_files=false
+
+[tv]
+check_channels_conf_on_startup=true
+initial_tv_deinterlace=4
+last_dvb_channel=
+last_tv_channel=
+
+[directories]
+latest_dir=/home/gentoo
+last_dvd_directory=
+save_dirs=true
+
+[defaults]
+initial_sub_scale=5
+initial_sub_scale_ass=1
+initial_volume=40
+initial_contrast=0
+initial_brightness=0
+initial_hue=0
+initial_saturation=0
+initial_gamma=0
+initial_audio_equalizer=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+initial_zoom_factor=1
+initial_sub_pos=100
+initial_volnorm=false
+initial_postprocessing=false
+initial_deinterlace=0
+initial_audio_channels=2
+initial_stereo_mode=0
+initial_audio_track=1
+initial_subtitle_track=1
+
+[mplayer_info]
+mplayer_detected_version=-1
+mplayer_user_supplied_version=-1
+is_mplayer2=false
+mplayer2_detected_version=
+
+[instances]
+single_instance_enabled=true
+
+[floating_control]
+margin=0
+width=70
+animated=true
+display_in_compact_mode=false
+bypass_window_manager=true
+
+[history]
+recents=@Invalid()
+recents\max_items=10
+urls=@Invalid()
+urls\max_items=50
+
+[filter_options]
+blur=lc:-1.5
+deblock=vb/hb
+denoise_normal=
+denoise_soft=2:1:2
+gradfun=
+noise=9ah:5ah
+sharpen=lc:1.5
+volnorm=1
+
+[default_gui]
+video_info=false
+frame_counter=false
+fullscreen_toolbar1_was_visible=false
+fullscreen_toolbar2_was_visible=false
+compact_toolbar1_was_visible=false
+compact_toolbar2_was_visible=false
+pos=@Point(0 31)
+size=@Size(683 509)
+toolbars_state=@ByteArray(\0\0\0\xff\0\0\x12\xc4\xfd\0\0\0\x1\0\0\0\x3\0\0\0\0\0\0\0\0\xfc\x1\0\0\0\x1\xfb\0\0\0\x18\0p\0l\0\x61\0y\0l\0i\0s\0t\0\x64\0o\0\x63\0k\x2\0\0\0\0\0\0\0\0\0\0\0\x64\0\0\0\x1e\0\0\x2\xab\0\0\x1\x88\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x2\0\0\0\x2\0\0\0\x2\0\0\0\x10\0t\0o\0o\0l\0\x62\0\x61\0r\0\x31\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x10\0t\0o\0o\0l\0\x62\0\x61\0r\0\x32\x1\0\0\x1\x9b\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x3\0\0\0\x2\0\0\0\x1a\0\x63\0o\0n\0t\0r\0o\0l\0w\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0$\0\x63\0o\0n\0t\0r\0o\0l\0w\0i\0\x64\0g\0\x65\0t\0_\0m\0i\0n\0i\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+actions\toolbar1=open_file, open_url, favorites_menu, separator, screenshot, separator, show_file_properties, show_playlist, show_tube_browser, separator, show_preferences, separator, play_prev, play_next
+actions\controlwidget=play, pause_and_frame_step, stop, separator, rewindbutton_action, timeslider_action, forwardbutton_action, separator, fullscreen, mute, volumeslider_action
+actions\controlwidget_mini=play_or_pause, stop, separator, rewind1, timeslider_action, forward1, separator, mute, volumeslider_action
+actions\floating_control=play, pause, stop, separator, rewindbutton_action, timeslider_action, forwardbutton_action, separator, fullscreen, mute, volumeslider_action, separator, timelabel_action
+actions\toolbar1_version=1
+
+[base_gui_plus]
+show_tray_icon=false
+mainwindow_visible=true
+trayicon_playlist_was_visible=false
+widgets_size=0
+fullscreen_playlist_was_visible=false
+fullscreen_playlist_was_floating=false
+compact_playlist_was_visible=false
+ignore_playlist_events=false
+
+[playlist]
+repeat=false
+shuffle=false
+auto_get_info=false
+recursive_add_directory=false
+save_playlist_in_config=true
+play_files_from_start=true
+automatically_play_next=true
+row_spacing=-1
+latest_dir=
+
+[playlist_contents]
+count=0
+current_item=-1
+modified=false
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc b/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc
index 43dd5dcc..823dc688 100644
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc
@@ -1,4 +1,4 @@
TerminalEmulator=gnome-terminal
-WebBrowser=epiphany
+WebBrowser=midori
MailReader=sylpheed-claws
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13679617457.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13679617457.desktop
deleted file mode 100644
index 86f96795..00000000
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13679617457.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Epiphany
-GenericName=Web Browser
-X-GNOME-FullName=Epiphany Web Browser
-Comment=Browse the web
-Exec=epiphany %U
-StartupNotify=true
-Terminal=false
-Type=Application
-Icon=gnome-web-browser
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=epiphany
-X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.30.6
-Categories=Network;GNOME;GTK;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
-X-XFCE-Source=file:///usr/share/applications/epiphany.desktop
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop
new file mode 100644
index 00000000..4178d8e6
--- /dev/null
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop
@@ -0,0 +1,33 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Midori
+GenericName=Web Browser
+Comment=Browse the Web
+X-GNOME-Keywords=Internet;WWW;Explorer
+X-AppInstall-Keywords=Internet;WWW;Explorer
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;image/svg+xml;
+Exec=midori %U
+Icon=midori
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=midori
+X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private
+X-XFCE-Source=file:///usr/share/applications/midori.desktop
+
+[TabNew Shortcut Group]
+Name=New _Tab
+Exec=midori -e TabNew
+TargetEnvironment=Unity
+
+[WindowNew Shortcut Group]
+Name=New _Window
+Exec=midori -e WindowNew
+TargetEnvironment=Unity
+
+[Private Shortcut Group]
+Name=New P_rivate Browsing Window
+Exec=midori --private
+TargetEnvironment=Unity
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 57ea34e0..c6814b7f 100644
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -98,7 +98,7 @@
-
+
diff --git a/tools-uclibc/desktop/passwd.sh b/tools-uclibc/desktop/passwd.sh
index 58e2aa9a..fcd57591 100755
--- a/tools-uclibc/desktop/passwd.sh
+++ b/tools-uclibc/desktop/passwd.sh
@@ -15,3 +15,9 @@ gpasswd -a gentoo usb
gpasswd -a gentoo games
echo gentoo:gentoo | chpasswd
+
+groupadd -g 9995 graudit
+groupadd -g 9996 grslink
+groupadd -g 9997 grasock
+groupadd -g 9998 grcsock
+groupadd -g 9999 grssock
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index 3f5879d1..074ce5da 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -14,7 +14,7 @@ USE_UDEV="gudev hwdb keymap kmod"
USE_VCS="git"
USE_CHAR="fontforge icu idn"
-USE_SERVERS="cups dbus sasl mbox zeroconf"
+USE_SERVERS="cups dbus sasl mbox"
USE_PAX="xtpax -ptpax"
USE_AUDIO="openal"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 5435da46..18bfaa92 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -34,7 +34,7 @@ USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-synt
USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LANG} ${USE_UDEV} ${USE_VCS} ${USE_CHAR} ${USE_SERVERS} ${USE_PAX} ${USE_AUDIO} ${USE_IMG} ${USE_GRAPH} ${USE_DISPLAY} ${USE_MULTI} ${USE_MPLAYER} ${USE_BROWSE} ${USE_WORD} ${USE_GAMES} ${USE_XFCE4} ${USE_MISC}"
XFCE_PLUGINS="trash menu logout"
-INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount synaptics tslib void"
+INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount synaptics tslib void wacom"
VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
LINGUAS="en"
diff --git a/tools-uclibc/desktop/resolv.conf b/tools-uclibc/desktop/resolv.conf
new file mode 100644
index 00000000..d55a5304
--- /dev/null
+++ b/tools-uclibc/desktop/resolv.conf
@@ -0,0 +1,4 @@
+# Add your own name server here.
+# This is only for the build. It
+# will be removed in the final image.
+nameserver 192.168.3.1
diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index 89330cac..38ec408f 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -33,6 +33,7 @@ add_overlay() {
populate_etc() {
cp -f fstab "${ROOTFS}"/etc/fstab
cp -f lilo.conf "${ROOTFS}"/etc/lilo.conf
+ cp -f resolv.conf "${ROOTFS}"/etc/resolv.conf
rm -f "${ROOTFS}"/etc/portage/make.conf.catalyst
cp -f portage/make.conf.1 "${ROOTFS}"/etc/portage/make.conf
@@ -126,6 +127,7 @@ cleanup_dirs() {
rm -rf "${ROOTFS}"/tmp/*
rm -rf "${ROOTFS}"/var/log/*
rm -rf "${ROOTFS}"/var/tmp/*
+ rm -rf "${ROOTFS}"/etc/resolv.conf
}
unmount_dirs() {
diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world
index de1fcc41..ffd86fd7 100644
--- a/tools-uclibc/desktop/world
+++ b/tools-uclibc/desktop/world
@@ -54,6 +54,7 @@ sys-devel/gcc
sys-devel/gdb
sys-fs/cryptsetup
sys-kernel/genkernel
+sys-kernel/linux-firmware
sys-libs/cracklib
sys-libs/db
sys-libs/gdbm
@@ -63,7 +64,7 @@ sys-process/lsof
virtual/libiconv
virtual/libintl
virtual/package-manager
-www-client/epiphany
+www-client/midori
x11-base/xorg-server
x11-drivers/xf86-video-nouveau
x11-drivers/xf86-video-vesa