Bring pkgs in line with original Tin Hat.

20 files changed, 186 insertions, 709 deletions

diff --git a/core/etc/skel/.config/Thunar/accels.scm b/core/etc/skel/.config/Thunar/accels.scm
deleted file mode 100644
index 4f9adb8..0000000
--- a/core/etc/skel/.config/Thunar/accels.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-; Thunar GtkAccelMap rc-file         -*- scheme -*-
-; this file is an automated accelerator map dump
-;
diff --git a/core/etc/skel/.config/Thunar/uca.xml b/core/etc/skel/.config/Thunar/uca.xml
deleted file mode 100644
index 2f0c866..0000000
--- a/core/etc/skel/.config/Thunar/uca.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml encoding="UTF-8" version="1.0"?>
-<actions>
-<action>
-	<icon>utilities-terminal</icon>
-	<name>Open Terminal Here</name>
-	<unique-id>1438016245738870-1</unique-id>
-	<command>exo-open --working-directory %f --launch TerminalEmulator</command>
-	<description>Example for a custom action</description>
-	<patterns>*</patterns>
-	<startup-notify/>
-	<directories/>
-</action>
-</actions>
diff --git a/core/etc/skel/.config/dconf/user b/core/etc/skel/.config/dconf/user
deleted file mode 100644
index 07bbf83..0000000
--- a/core/etc/skel/.config/dconf/user
+++ /dev/null
diff --git a/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini b/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini
deleted file mode 100644
index cf12a1f..0000000
--- a/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Filechooser Settings]
-LocationMode=path-bar
-ShowHidden=false
-ShowSizeColumn=true
-GeometryX=36
-GeometryY=92
-GeometryWidth=952
-GeometryHeight=585
-SortColumn=name
-SortOrder=ascending
-StartupMode=recent
diff --git a/core/etc/skel/.config/smplayer/smplayer.ini b/core/etc/skel/.config/smplayer/smplayer.ini
deleted file mode 100644
index 9770e05..0000000
--- a/core/etc/skel/.config/smplayer/smplayer.ini
+++ /dev/null
@@ -1,560 +0,0 @@
-[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=mplayer
-driver\vo=x11
-driver\audio_output=alsa
-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/core/etc/skel/.config/xfce4/helpers.rc b/core/etc/skel/.config/xfce4/helpers.rc
index 39395dd..97f7c91 100644
--- a/core/etc/skel/.config/xfce4/helpers.rc
+++ b/core/etc/skel/.config/xfce4/helpers.rc
@@ -1,4 +1,4 @@
 TerminalEmulator=xfce4-terminal
-WebBrowser=epiphany
-MailReader=sylpheed-claws
+WebBrowser=firefox
+MailReader=sylpheed
 
diff --git a/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc b/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc
new file mode 100644
index 0000000..d996934
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc
@@ -0,0 +1,17 @@
+UpdateInterval=0
+TimeScale=0
+Size=16
+Mode=0
+Frame=1
+Border=1
+Bars=1
+TrackedCore=0
+Command=xfce4-taskmanager
+InTerminal=0
+StartupNotification=1
+ColorMode=0
+Foreground1=#0000ffff0000
+Foreground2=#ffff00000000
+Foreground3=#00000000ffff
+Background=#ffffffffffff
+
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop b/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop
deleted file mode 100644
index 29e4c72..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Audio Mixer
-Comment=Adjust volume levels
-Icon=multimedia-volume-control
-Exec=xfce4-mixer
-Type=Application
-StartupNotify=true
-Terminal=false
-Categories=X-XFCE;Audio;Mixer;AudioVideo;
-X-XFCE-Source=file:///usr/share/applications/xfce4-mixer.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-17/13679616986.desktop b/core/etc/skel/.config/xfce4/panel/launcher-17/13679616986.desktop
deleted file mode 100644
index 6230ece..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-17/13679616986.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Claws Mail
-GenericName=E-mail client
-Exec=claws-mail %u
-Icon=claws-mail
-Categories=Network;Office;Email;
-Comment=Lightweight and Fast GTK+ based Mail Client
-Terminal=false
-Type=Application
-StartupNotify=true
-MimeType=x-scheme-handler/mailto;
-X-Info=Claws Mail
-X-XFCE-Source=file:///usr/share/applications/claws-mail.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop b/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop
new file mode 100644
index 0000000..06b63d9
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Sylpheed
+Comment=E-Mail client
+Exec=sylpheed
+Icon=sylpheed
+MimeType=message/rfc822;x-scheme-handler/mailto;
+Terminal=false
+Type=Application
+Categories=GTK;Network;Email;News;
+X-XFCE-Source=file:///usr/share/applications/sylpheed.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-18/13954274581.desktop b/core/etc/skel/.config/xfce4/panel/launcher-18/13954274581.desktop
new file mode 100644
index 0000000..d7a4765
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/launcher-18/13954274581.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Aurora
+Comment=Web Browser
+Exec=firefox %U
+Icon=aurora
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
+X-XFCE-Source=file:///usr/share/applications/firefox.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-18/14180858892.desktop b/core/etc/skel/.config/xfce4/panel/launcher-18/14180858892.desktop
deleted file mode 100644
index 9b0503e..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-18/14180858892.desktop
+++ /dev/null
@@ -1,31 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Midori
-GenericName=Web Browser
-X-GNOME-Fullname=Midori 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
-Actions=TabNew;WindowNew;Private;
-X-XFCE-Source=file:///usr/share/applications/midori.desktop
-
-[Desktop Action TabNew]
-Name=New Tab
-Exec=midori -e TabNew
-
-[Desktop Action WindowNew]
-Name=New Window
-Exec=midori -e WindowNew
-
-[Desktop Action Private]
-Name=New Private Browsing Window
-Exec=midori --private
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-20/13732436141.desktop b/core/etc/skel/.config/xfce4/panel/launcher-20/13732436141.desktop
deleted file mode 100644
index 1a1431a..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-20/13732436141.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Image Viewer
-Comment=Browse and rotate images
-TryExec=eog
-Exec=eog %U
-Icon=eog
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=EOG
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.32.1
-X-GNOME-DocPath=eog/eog.xml
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;
-X-XFCE-Source=file:///usr/share/applications/eog.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-20/13954275323.desktop b/core/etc/skel/.config/xfce4/panel/launcher-20/13954275323.desktop
new file mode 100644
index 0000000..1893c26
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/launcher-20/13954275323.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Name=VLC media player
+GenericName=Media player
+Comment=Read, capture, broadcast your multimedia streams
+Exec=/usr/bin/vlc %U
+TryExec=/usr/bin/vlc
+Icon=vlc
+Terminal=false
+Type=Application
+Categories=AudioVideo;Player;Recorder;
+MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;
+X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;
+X-XFCE-Source=file:///usr/share/applications/vlc.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-22/13699065271.desktop b/core/etc/skel/.config/xfce4/panel/launcher-22/13699065271.desktop
deleted file mode 100644
index 926c37f..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-22/13699065271.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Categories=Qt;KDE;AudioVideo;Player;Video;
-Comment=A great MPlayer front-end
-Exec=smplayer %U
-GenericName=Media Player
-Icon=smplayer
-MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
-Name=SMPlayer
-Type=Application
-X-KDE-StartupNotify=false
-X-XFCE-Source=file:///usr/share/applications/smplayer.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-22/13954275454.desktop b/core/etc/skel/.config/xfce4/panel/launcher-22/13954275454.desktop
new file mode 100644
index 0000000..426072c
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/launcher-22/13954275454.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Name=Ristretto Image Viewer
+Comment=Look at your images easily
+GenericName=Image Viewer
+Exec=ristretto %F
+Icon=ristretto
+Terminal=false
+Type=Application
+X-MultipleArgs=false
+Categories=GTK;Graphics;Viewer;
+StartupNotify=true
+MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-pixmap;image/tiff;image/svg+xml;image/x-xpixmap;
+X-XFCE-Source=file:///usr/share/applications/ristretto.desktop
diff --git a/core/etc/skel/.config/xfce4/panel/whiskermenu-25.rc b/core/etc/skel/.config/xfce4/panel/whiskermenu-25.rc
new file mode 100644
index 0000000..ff6957c
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/panel/whiskermenu-25.rc
@@ -0,0 +1,22 @@
+button-title=Applications Menu
+button-icon=xfce4-panel-menu
+show-button-title=true
+show-button-icon=true
+launcher-show-name=true
+launcher-show-description=true
+hover-switch-category=false
+category-icon-size=1
+item-icon-size=2
+load-hierarchy=false
+favorites-in-recent=true
+display-recent-default=false
+position-search-alternate=false
+position-commands-alternate=false
+command-settings=xfce4-settings-manager
+command-lockscreen=xflock4
+command-logout=xfce4-session-logout
+favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop
+recent=xfce-backdrop-settings.desktop,xfce-wmtweaks-settings.desktop,xfcecomped.desktop,xfce-wm-settings.desktop,Thunar.desktop,exo-mail-reader.desktop,xfce-display-settings.desktop,galculator.desktop,xfce-keyboard-settings.desktop
+menu-width=400
+menu-height=500
+
diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
new file mode 100644
index 0000000..781e4e7
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="ristretto" version="1.0">
+  <property name="window" type="empty">
+    <property name="navigationbar" type="empty">
+      <property name="position" type="string" value="left"/>
+    </property>
+  </property>
+</channel>
diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 58ca671..8e41b64 100644
--- a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -11,15 +11,25 @@
       <property name="position-locked" type="bool" value="true"/>
       <property name="size" type="uint" value="30"/>
       <property name="plugin-ids" type="array">
-        <value type="int" value="1"/>
+        <value type="int" value="25"/>
+        <value type="int" value="11"/>
         <value type="int" value="3"/>
         <value type="int" value="15"/>
-        <value type="int" value="4"/>
+        <value type="int" value="19"/>
         <value type="int" value="12"/>
+        <value type="int" value="4"/>
+        <value type="int" value="24"/>
         <value type="int" value="5"/>
         <value type="int" value="6"/>
         <value type="int" value="2"/>
       </property>
+      <property name="background-style" type="uint" value="0"/>
+      <property name="background-color" type="array">
+        <value type="uint" value="60005"/>
+        <value type="uint" value="2359"/>
+        <value type="uint" value="2359"/>
+        <value type="uint" value="65535"/>
+      </property>
     </property>
     <property name="panel-2" type="empty">
       <property name="position" type="string" value="p=10;x=0;y=0"/>
@@ -39,10 +49,22 @@
         <value type="int" value="14"/>
         <value type="int" value="23"/>
       </property>
+      <property name="background-style" type="uint" value="0"/>
+      <property name="background-color" type="array">
+        <value type="uint" value="5652"/>
+        <value type="uint" value="42812"/>
+        <value type="uint" value="51826"/>
+        <value type="uint" value="65535"/>
+      </property>
+      <property name="autohide" type="bool" value="false"/>
+      <property name="disable-struts" type="bool" value="false"/>
+      <property name="mode" type="uint" value="0"/>
+      <property name="size" type="uint" value="45"/>
+      <property name="nrows" type="uint" value="1"/>
+      <property name="length" type="uint" value="1"/>
     </property>
   </property>
   <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu"/>
     <property name="plugin-2" type="string" value="actions">
       <property name="items" type="array">
         <value type="string" value="+lock-screen"/>
@@ -65,7 +87,14 @@
     </property>
     <property name="plugin-4" type="string" value="pager"/>
     <property name="plugin-5" type="string" value="clock"/>
-    <property name="plugin-6" type="string" value="systray"/>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="names-visible" type="array">
+        <value type="string" value="sylpheed"/>
+        <value type="string" value="vlc"/>
+        <value type="string" value="task manager"/>
+        <value type="string" value="thunar"/>
+      </property>
+    </property>
     <property name="plugin-7" type="string" value="showdesktop"/>
     <property name="plugin-8" type="string" value="separator">
       <property name="style" type="uint" value="1"/>
@@ -93,17 +122,17 @@
     </property>
     <property name="plugin-17" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="13679616986.desktop"/>
+        <value type="string" value="13954274922.desktop"/>
       </property>
     </property>
     <property name="plugin-18" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="14180858892.desktop"/>
+        <value type="string" value="13954274581.desktop"/>
       </property>
     </property>
     <property name="plugin-20" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="13732436141.desktop"/>
+        <value type="string" value="13954275323.desktop"/>
       </property>
     </property>
     <property name="plugin-21" type="string" value="launcher">
@@ -113,14 +142,25 @@
     </property>
     <property name="plugin-22" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="13699065271.desktop"/>
+        <value type="string" value="13954275454.desktop"/>
       </property>
     </property>
     <property name="plugin-23" type="string" value="thunar-tpa"/>
-    <property name="plugin-12" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="13698963011.desktop"/>
-      </property>
+    <property name="plugin-11" type="string" value="places">
+      <property name="show-button-type" type="int" value="1"/>
+      <property name="button-label" type="string" value=" Places"/>
+      <property name="mount-open-volumes" type="bool" value="true"/>
+    </property>
+    <property name="plugin-24" type="string" value="mixer">
+      <property name="sound-card" type="string" value="HDAATISBAlsamixer"/>
+      <property name="track" type="string" value="Master"/>
+      <property name="command" type="string" value="xfce4-mixer"/>
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
+    <property name="plugin-25" type="string" value="whiskermenu"/>
+    <property name="plugin-12" type="string" value="cpugraph"/>
+    <property name="plugin-19" type="string" value="separator">
+      <property name="style" type="uint" value="2"/>
     </property>
   </property>
 </channel>
diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index c3f25b1..0974f27 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -1,52 +1,63 @@
+app-admin/metalog
 app-admin/sudo
-app-admin/syslog-ng
-app-arch/file-roller
-app-editors/gedit
+app-admin/sysstat
+app-arch/sharutils
+app-arch/unrar
+app-arch/xarchiver
+app-cdr/cdrtools
+app-editors/mousepad
 app-editors/nano
 app-editors/vim
 app-office/abiword
 app-office/gnumeric
 app-text/evince
+app-portage/gentoolkit
 app-text/tree
-dev-util/strace
-dev-vcs/git
-gnome-extra/gnome-system-monitor
-mail-client/claws-mail
 mail-client/nail
+mail-client/sylpheed
 mail-mta/postfix
-media-gfx/eog
-media-gfx/gimp
+media-video/vlc
+media-gfx/ristretto
 media-sound/alsa-utils
-media-video/smplayer
-net-analyzer/tcpdump
-net-dns/avahi
-net-dns/bind-tools
-net-fs/samba
-net-ftp/lftp
 net-irc/hexchat
 net-misc/openntpd
 net-misc/rdate
 net-misc/tor
+sci-calculators/galculator
 net-misc/vinagre
 net-p2p/transmission
-net-wireless/wpa_supplicant
-sys-apps/dbus
 sys-apps/elfix
 sys-apps/gradm
+sys-apps/iproute2
 sys-apps/less
 sys-apps/pciutils
+sys-fs/btrfs-progs
 sys-fs/cryptsetup
-sys-process/fcron
-sys-process/lsof
-www-client/midori
+sys-fs/dosfstools
+sys-fs/mtools
+sys-fs/eudev
+sys-power/cpupower
+sys-power/upower-pm-utils
+www-client/firefox
 x11-base/xorg-server
-x11-libs/gksu
 x11-misc/slim
 x11-terms/xfce4-terminal
-x11-terms/xterm
-xfce-base/xfce4-appfinder
+xfce-base/thunar
 xfce-base/xfce4-meta
 xfce-extra/thunar-archive-plugin
 xfce-extra/thunar-shares-plugin
+xfce-extra/tumbler
+xfce-extra/xfce-theme-manager
+xfce-extra/xfce4-composite-editor
+xfce-extra/xfce4-cpufreq-plugin
+xfce-extra/xfce4-cpugraph-plugin
+xfce-extra/xfce4-datetime-plugin
+xfce-extra/xfce4-diskperf-plugin
 xfce-extra/xfce4-mixer
-xfce-extra/xfce4-volumed
+xfce-extra/xfce4-notes-plugin
+xfce-extra/xfce4-places-plugin
+xfce-extra/xfce4-screenshooter
+xfce-extra/xfce4-systemload-plugin
+xfce-extra/xfce4-weather-plugin
+xfce-extra/xfce4-whiskermenu-plugin
+xfce-base/xfconf