diff --git a/.data/prefrc b/.data/prefrc
index ba5fd0e..c76651f 100644
--- a/.data/prefrc
+++ b/.data/prefrc
@@ -25,6 +25,5 @@ PipeRead 'echo "InfoStoreAdd    locker     `cat $FVWM_USERDIR/.data/prefs/progs/
 
 # [Current Theme]
 PipeRead 'echo "InfoStoreAdd    theme      `cat $FVWM_USERDIR/.data/prefs/cosmetics/theme`"'
-PipeRead 'echo "InfoStoreAdd    colors     `cat $FVWM_USERDIR/.data/prefs/cosmetics/colors`"'
 PipeRead 'echo "InfoStoreAdd    pape       `cat $FVWM_USERDIR/.data/prefs/cosmetics/pape`"'
 PipeRead 'echo "InfoStoreAdd    std_font   `cat $FVWM_USERDIR/.data/prefs/cosmetics/std_font`"'
diff --git a/.data/prefs/progs/dedit b/.data/prefs/progs/deditor
similarity index 100%
rename from .data/prefs/progs/dedit
rename to .data/prefs/progs/deditor
diff --git a/assets b/assets
new file mode 120000
index 0000000..d95d382
--- /dev/null
+++ b/assets
@@ -0,0 +1 @@
+/home/midfavila/.config/fxde/fxde-assets/
\ No newline at end of file
diff --git a/assets/audio/dummy b/assets/audio/dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/themes b/assets/themes
deleted file mode 100644
index 0b2ebc3..0000000
--- a/assets/themes
+++ /dev/null
@@ -1 +0,0 @@
-Just symlink fxde-themes to this directory, or copy theme packages into it.
diff --git a/assets/wallpaper/dummy b/assets/wallpaper/dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/infra/kbindrc b/infra/kbindrc
index 8cf7829..76eaba7 100644
--- a/infra/kbindrc
+++ b/infra/kbindrc
@@ -19,11 +19,11 @@ Key I A CM Exec exec $[infostore.im]
 Key C A CM Exec exec $[infostore.calc]
 
 # Shortcut for killing stuff
-Key Q A CM Close
+Key Q A CM Destroy
 
 # Window focus
-Key Tab A M  Next (CurrentDesk, AcceptsFocus) FocusFunc
-Key Tab A SM Prev (CurrentDesk, AcceptsFocus) FocusFunc
+Key Tab A M  Next (CurrentPage, AcceptsFocus) TaskSwitchFunc
+Key Tab A SM Prev (CurrentPage, AcceptsFocus) TaskSwitchFunc
 
 # Maximize
 Key F11 A A Maximize
diff --git a/mainrc b/mainrc
index 1d807d7..d517bb5 100644
--- a/mainrc
+++ b/mainrc
@@ -3,11 +3,6 @@
 
 
 
-Read modules/shelf
-Read modules/taskbar
-Read modules/pager
-Read modules/events
-
 Read .data/prefrc
 Read infra/funcrc
 Read infra/varrc
@@ -16,6 +11,11 @@ Read infra/kbindrc
 Read infra/menurc
 Read infra/windrc
 
+Read modules/shelf
+Read modules/taskbar
+Read modules/pager
+Read modules/events
+
 DestroyFunc StartFunction
 AddToFunc StartFunction
 
diff --git a/modules/shelf b/modules/shelf
index a717904..a6772eb 100644
--- a/modules/shelf
+++ b/modules/shelf
@@ -1,7 +1,8 @@
 #Define the shelf.
 
-Style "Shelf" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \
-       CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, !Iconifiable, NeverFocus
+Style "Shelf" NeverFocus, NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \
+       CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \
+       !Iconifiable, !Closable, !Maximizable
 
 DestroyModuleConfig Shelf
 
diff --git a/modules/taskbar b/modules/taskbar
index f59b8a8..c4fe3f4 100644
--- a/modules/taskbar
+++ b/modules/taskbar
@@ -33,10 +33,11 @@ DestroyModuleConfig TaskBarButtons
 *TaskBarButtons: IconButton down
 *TaskBarButtons: IconAndSelectButton down
 *TaskBarButtons: SelectButton up
+*TaskBarButtons: FocusAndSelectButton up
 
 *TaskBarButtons: Colorset 16
 *TaskBarButtons: FocusAndSelectColorset 17
-
+*TaskBarButtons: IconAndSelectColorset 18
 *TaskBarButtons: Shape true
 
 # Button actions.