aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2015-06-02 16:16:36 +0100
committerdakkar <dakkar@thenautilus.net>2015-06-02 16:16:36 +0100
commit5fee59e19e46ccee891c96e8177afb7d4c400e57 (patch)
tree5b7bf522a8f77f302bdf6c7c0c98e827605440a2
parentshift-FF for private window (diff)
downloadfvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.tar.gz
fvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.tar.bz2
fvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.zip
update to fvwm-crystal 3.2.3
This update is big: upstream has simplified and refactored everything, so I had to move stuff around a lot. I now rely much more on the overlay system, instead of adding custom files all over the place.
-rw-r--r--.gitignore1
-rw-r--r--README.rest.txt159
-rwxr-xr-xROX-set-horizontal11
-rwxr-xr-xROX-set-vertical11
-rw-r--r--Version1
-rwxr-xr-xamarok3
-rw-r--r--colorsets/DarkDesktop.cs58
-rw-r--r--colorsets/WhiteDesktop.cs58
-rw-r--r--components/apps/ROX-Filer7
-rw-r--r--components/bindings/Desktop-MMB-EdgeScroll1
-rw-r--r--components/bindings/Desktop-MMB-TogglePanels1
-rw-r--r--components/bindings/Extra-Keybindings (renamed from components/bindings/Desktop-dakkar)8
-rw-r--r--components/bindings/Multimedia_Keys4
-rw-r--r--components/bindings/Multimedia_Keys_Numlock1
-rw-r--r--components/bindings/Music8
-rw-r--r--components/bindings/Numpad-Control8
-rw-r--r--components/bindings/Numpad-Focus4
-rw-r--r--components/bindings/Numpad-Warp1
-rw-r--r--components/bindings/Window-Basic6
-rw-r--r--components/bindings/Window-Control2
-rw-r--r--components/bindings/Window-Control-Dakkar9
-rw-r--r--components/bindings/Window-List1
-rw-r--r--components/bindings/Window-Rearrange1
-rw-r--r--components/bindings/Window-Transparency1
-rw-r--r--components/decorations/Buttons-os2-MiniIcon19
-rw-r--r--components/desktop/FVWM-Crystal_Preferences3
-rw-r--r--components/desktop/Keyboard16
-rw-r--r--components/desktop/Keyboard_NumLock1
-rw-r--r--components/desktop/dakkar_Preferences6
-rw-r--r--components/functions/BlingBling1
-rw-r--r--components/functions/Fullscreen1
-rw-r--r--components/functions/Mixer15
-rw-r--r--components/functions/Mixer-amixer25
-rw-r--r--components/functions/Music-amarok49
-rw-r--r--components/functions/Numpad57
-rw-r--r--components/functions/Screen-Menu2
-rw-r--r--components/functions/Urgency-Hint (renamed from components/functions/Notify)1
-rwxr-xr-xcomponents/scripts/FvwmScript-Clock (renamed from components/scripts/FvwmScript-Clock-dakkar)0
-rw-r--r--decorations/Dakkar/Colorsets24
-rw-r--r--decorations/Dakkar/Default/Colorsets19
-rw-r--r--decorations/Dakkar/Default/Theme.os249
-rw-r--r--decorations/Dakkar/README11
-rw-r--r--decorations/Dakkar/Theme.os251
-rw-r--r--decorations/Dakkar/window-active-arrows-down.pngbin490 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-arrows.pngbin548 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-close-down.pngbin510 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-close.pngbin557 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-empty-down.pngbin363 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-empty.pngbin397 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-iconify-down.pngbin381 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-iconify.pngbin421 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-maximize-down.pngbin422 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-maximize.pngbin455 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-options-down.pngbin431 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-options.pngbin480 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-active-title.pngbin230 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-arrows-down.pngbin520 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-arrows.pngbin550 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-close-down.pngbin538 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-close.pngbin555 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-empty-down.pngbin380 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-empty.pngbin417 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-iconify-down.pngbin400 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-iconify.pngbin438 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-maximize-down.pngbin432 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-maximize.pngbin482 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-options-down.pngbin457 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-options.pngbin492 -> 0 bytes
-rw-r--r--decorations/Dakkar/window-inactive-title.pngbin231 -> 0 bytes
-rw-r--r--desktop.jpgbin966600 -> 0 bytes
-rw-r--r--preferences/DefaultFocusPolicy1
-rw-r--r--preferences/DefaultMixer1
-rw-r--r--preferences/DefaultMusicPlayer1
-rw-r--r--preferences/DefaultTerminal2
-rw-r--r--preferences/DeskPageXY2
-rw-r--r--preferences/DesktopMenu1
-rw-r--r--preferences/FvwmConsoleTerminal1
-rw-r--r--preferences/IconDirs11
-rw-r--r--preferences/IconsType1
-rw-r--r--preferences/LastChoosenButtonModel2
-rw-r--r--preferences/LastChoosenColorset2
-rw-r--r--preferences/LastChoosenRecipe2
-rw-r--r--preferences/LastChoosenWallpaper2
-rw-r--r--preferences/LastChoosenWindowDecoration2
-rw-r--r--preferences/MediaDirectories4
-rw-r--r--preferences/MenuFont1
-rw-r--r--preferences/MenuFontSize1
-rw-r--r--preferences/MenuFontStyle1
-rw-r--r--preferences/NotificationAreaManager1
-rw-r--r--preferences/PanelFont1
-rw-r--r--preferences/PanelFontSize1
-rw-r--r--preferences/PanelFontStyle1
-rw-r--r--preferences/QuakeConsoleHeight1
-rw-r--r--preferences/QuakeConsoleTerminal2
-rw-r--r--preferences/Startup2
-rw-r--r--preferences/TitleFont1
-rw-r--r--preferences/TitleFontSize1
-rw-r--r--preferences/TitleFontStyle1
-rw-r--r--preferences/XScreenSaver1
-rw-r--r--recipes/Dakkar93
-rw-r--r--recipes/TopLine1
-rw-r--r--recipes/TopLine-double286
-rw-r--r--recipes/TopLine-single245
l---------wallpapers/drappo-wide.png1
-rwxr-xr-xxinitrc7
105 files changed, 293 insertions, 1106 deletions
diff --git a/.gitignore b/.gitignore
index f175ee0..22c5df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/.FvwmConsole-History
/wallpaper-thumbnails/
/wallpapers/
+/tmp/
diff --git a/README.rest.txt b/README.rest.txt
index c5ff331..4c8d575 100644
--- a/README.rest.txt
+++ b/README.rest.txt
@@ -4,17 +4,12 @@
Dakkar's ``fvwm-crystal`` settings
====================================
-I use a 2800x1050 desktop (two 20" LCD panels on a GeForce 6600), with
-a `slightly modified version`_ of the `TopLine` recipe. I also use a 5x5
-pages virtual desktop, and a Dvorak keyboard with valume keys (mapped
-to the proper keycodes in X11). My music player is `AmaroK`, and my
-desktop manager is `ROX`.
+I use a 3840x2160 desktop (a 4k display), with a `slightly modified
+version`_ of the `TopLine` recipe. I also use a 5x5 pages virtual
+desktop, and a Dvorak keyboard with volume keys (mapped to the proper
+keycodes in X11). My desktop manager is `ROX`.
-.. _`slightly modified version`: ../tree/recipes/TopLine
-
-Since my monitors can "pivot", I have further modified the recipe to
-handle rotating the displays. This needs help from the video card. See
-the section `Rotating the displays`_.
+.. _`slightly modified version`: ../tree/recipes/Dakkar
The recipe
==========
@@ -24,50 +19,25 @@ The main differences from the stock `TopLine` are:
- different desktop bindings
- larger thumbnails
- different behaviour of the edges
-- 2 identical pagers (one per physical screen)
-- geometries rewritten to use ``@g`` to work with `Xinerama`
-- each pager (and my "biff" terminal) is raised above all other
+- the pager (and my "biff" terminal) is raised above all other
windows if I keep the mouse pointer on it long enough
-- some functions added to handle `rotating the displays`_
+- no application button panel
The decoration
==============
-I have changed the `Clearlooks DeepSky` decoration_ to add a mini-icon
+I have changed the `MicroClear Default` decoration_ to add a mini-icon
as button 3.
-.. _decoration: ../tree/decorations/Dakkar/
-
-The colorsets
-=============
-
-Since I use tha `Gentoo` version of ``fvwm2``, it has a patch that
-allow fake transparency in the menus. Thus, I changed the
-`DarkDesktop` and `WhiteDesktop` colorsets_ to use this feature.
-
-.. _colorsets: ../tree/colorsets/
+.. _decoration: ../tree/decorations/Dakkar/Default
The bindings
============
-I redefined most keyboard bindings to my taste. Of particular interest
-may be the Music_ file, where I bind the volume controls to the volume
-keycodes, and the ``Music-GUI`` function to the "eject" keycode. I
-also bound most window manipulation functions to various combination
-of ``Alt`` and the numeric keypad (see the `Window-Control-Dakkar`_
-file)
+I redefined most keyboard bindings to my taste, `overriding some of
+the default ones`_.
-.. _Music: ../tree/components/bindings/Music
-.. _Window-Control-Dakkar: ../tree/components/bindings/Window-Control-Dakkar
-
-The preferences
-===============
-
-To be able to select `AmaroK` as a music player, and `amixer` as a
-mixer control, I created the `dakkar_Preferences`_ file, which adds
-them to the appropriate menus.
-
-.. _`dakkar_Preferences`: ../tree/components/desktop/dakkar_Preferences
+.. _`overriding some of the default ones`: ../tree/components/bindings/
The styles and icons
====================
@@ -79,108 +49,17 @@ and I added icons for ``xchat-2`` and ``skype``)
The functions
=============
-I redefined a couple of function in the Numpad_ to add the
-``AnyScreen`` option.
-
-.. _Numpad: ../tree/components/functions/Numpad
-
-Then I wrote the `Mixer-amixer`_ and `Music-amarok`_ files to interact
-with by chosen music programs.
-
-.. _`Mixer-amixer`: ../tree/components/functions/Mixer-amixer
-.. _`Music-amarok`: ../tree/components/functions/Music-amarok
-
-``amixer`` is a simple command-line mixer, and its integration was
-easy.
-
-`AmaroK` is a `KDE` application, and it's not straightforward to
-control. At the moment only "random", "repeat", "stop", "play/pause"
-and "show/hide" are implemented, all via ``dcop`` calls.
-
-The ``Music-GUI`` function is used to toggle the display of
-`AmaroK`, and also to start it: it the ``dcop`` calls fails, the
-``amarok`` command gets executed, launching the program.
-
-.. note:: `AmaroK` and `Trayer`
-
- For some not-really-clear-to-me reason, the tray icon of `AmaroK`
- is not displayed by `Trayer`, normally. To work around this
- problem, I have written the small ``amarok`` script, which sits in
- my ``~/bin`` directory (which is at the beginning of my
- ``$PATH``). Using this, the icon works as expected.
-
-I also tweaked a Perl script I found on the Web to create a menu for
-my ``screen`` sessions, see the `Screen-Menu`_ configuration file and
-the `fvwm-screen.pl`_ script.
+I tweaked a Perl script I found on the Web to create a menu for my
+``screen`` sessions, see the `Screen-Menu`_ configuration file and the
+`fvwm-screen.pl`_ script.
.. _`Screen-Menu`: ../tree/components/functions/Screen-Menu
.. _`fvwm-screen.pl`: ../tree/scripts/fvwm-screen.pl
-Finally, in the `Notify`_ file, I redefined the ``UrgencyFunc`` to pop
-up a notification via the dbus notification mechanism (using a `simple
+In the `Urgency-Hint`_ file, I redefined the ``UrgencyFunc`` to pop up
+a notification via the dbus notification mechanism (using a `simple
Perl script`_ which uses `Net::DBus`_).
-.. _Notify: ../tree/components/functions/Notify
+.. _Urgency-Hint: ../tree/components/functions/Urgency-Hint
.. _`simple Perl script`: ../tree/FvwmNotify.pm
-.. _`Net::DBus`: http://search.cpan.org/~danberr/Net-DBus-0.33.5/
-
-Rotating the displays
-=====================
-
-This takes a little background.
-
-First of all, my ``/etc/X11/xorg.conf`` file has a ``Screen`` section
-like this::
-
- Section "Screen"
- Identifier "dual-nv"
- Device "nvidia"
- Monitor "LCD"
- DefaultDepth 24
- Option "TwinView" "true"
- Option "MetaModes" "DFP-0: 1400x1050 @1400x1050 +0+0, DFP-1: 1400x1050 @1400x1050 +1400+0"
- Option "RandRRotation" "on"
- Option "Xinerama" "on"
-
- SubSection "Display"
- ViewPort 0 0
- Depth 24
- Modes "1400x1050"
- EndSubSection
- EndSection
-
-This specifies that, normally, I use my displays horizontally, one to
-the right of the other.
-
-Then, in my `~/.xinirc`_, I add a second "MetaMode"::
-
- ./bin/nv-control-dpy --add-metamode \
- 'DFP-0: 1400x1050 @1400x1050 +0+1050, DFP-1: 1400x1050 @1400x1050 +0+0'
-
-The ``nv-control-dpy`` program can be found in the source tarball for
-the ``nvidia-settings`` program, in the ``samples`` subdirectory.
-
-You may be wondering: why adding a second MetaMode in this way, when
-you can specify both in the ``xorg.conf`` file? Good question. The
-answer is that, if you do it "the logical way", the always helpful
-NVidia drivers will tell the X server that you have a virtual screen
-whose size is the bounding box of the union of all MetaModes. Which in
-my case would mean that I'd have a lot of panning around, *very*
-irritating when you use multiple viewports. Adding the MetaMode after
-the startup of the X server avoids this issue.
-
-In the recipe, I have two functions to set landscape (normal) and
-portrait (vertical) orientation. They call ``xrandr`` to set the
-display orientation and size, and do some repositioning of the various
-things that need it:
-
-- a script instructs `ROX-Filer` to change its "pinboard" to the one
- with the proper layout (this is not optimal, but since I very rarely
- change the contents of my pinboard, works well enough for me)
-- `gkrellm2` and my "biff" terminal get moved to their proper
- positions during ``StartFunction``
-
-Maybe there's a samrter way to get the same result, but this works,
-and it only took an evening to set up.
-
-.. _`~/.xinirc`: ../tree/xinitrc
+.. _`Net::DBus`: https://metacpan.org/pod/Net::DBus
diff --git a/ROX-set-horizontal b/ROX-set-horizontal
deleted file mode 100755
index 0f2ac42..0000000
--- a/ROX-set-horizontal
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-rox --RPC <<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2001/12/soap-envelope">
- <env:Body xmlns="http://rox.sourceforge.net/SOAP/ROX-Filer">
- <Pinboard>
- <Name>Default</Name>
- </Pinboard>
- </env:Body>
-</env:Envelope>
-EOF
diff --git a/ROX-set-vertical b/ROX-set-vertical
deleted file mode 100755
index 850b414..0000000
--- a/ROX-set-vertical
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-rox --RPC <<EOF
-<?xml version="1.0"?>
-<env:Envelope xmlns:env="http://www.w3.org/2001/12/soap-envelope">
- <env:Body xmlns="http://rox.sourceforge.net/SOAP/ROX-Filer">
- <Pinboard>
- <Name>Vertical</Name>
- </Pinboard>
- </env:Body>
-</env:Envelope>
-EOF
diff --git a/Version b/Version
new file mode 100644
index 0000000..b347b11
--- /dev/null
+++ b/Version
@@ -0,0 +1 @@
+3.2.3
diff --git a/amarok b/amarok
deleted file mode 100755
index de80bff..0000000
--- a/amarok
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/kde/3.5/bin/amarok
-dcop kded kded loadModule kdetrayproxy
diff --git a/colorsets/DarkDesktop.cs b/colorsets/DarkDesktop.cs
deleted file mode 100644
index 804e82d..0000000
--- a/colorsets/DarkDesktop.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-# DarkDesktop colorset
-# Written by: fRiQ
-
-SetEnv Colorset_Name "DarkDesktop"
-SetEnv Colorset_Author "fRiQ"
-
-# What colorsets do we use?
-Read $[FVWM_SYSTEMDIR]/colorsets/colorset-definition
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# QuakeConsole, thumbnailed windows
-Colorset $[cs_quakeconsole] \
-Foreground "black", Background "black", \
-Hilight "black", Shadow "black", \
-IconAlpha 70
-
-
-Colorset $[cs_panel_inactive] \
-Foreground "white", Background "#444444", \
-Tint "black" 50, RootTransparent, \
-fgTint, IconAlpha, IconTint
-
-Colorset $[cs_panel_active] \
-Foreground "darkgray", Background "darkgray", \
-Hilight "darkgray", Shadow "darkgray", \
-Tint "#000066" 50, RootTransparent
-
-Colorset $[cs_panel_wininactive] \
-Foreground "gray", Background "#777777", \
-Hilight "#444444", Shadow "#444444", \
-Tint "black" 50, RootTransparent
-
-Colorset $[cs_panel_winactive] \
-Foreground "white", Background "#777777", \
-Hilight "#666666", Shadow "#666666", \
-Tint "blue" 50, RootTransparent
-
-Colorset $[cs_panel_border] \
-Background "#777777"
-
-Colorset $[cs_menu_inactive] \
-Foreground "white", Background "#777777", \
-Hilight "#777777", Shadow "#777777", \
-Translucent "black" 60
-
-Colorset $[cs_menu_active] \
-Foreground "black", Background "gray", \
-Hilight "black", Shadow "gray"
-
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Additional variables
-SetEnv ThumbBorderColor "gray"
-SetEnv ExternalFontColor "gray40"
-
-SetEnv TrayerTint "0x000000"
-SetEnv TrayerAlpha "128"
-
diff --git a/colorsets/WhiteDesktop.cs b/colorsets/WhiteDesktop.cs
deleted file mode 100644
index 09249fc..0000000
--- a/colorsets/WhiteDesktop.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-# WhiteDesktop colorset
-# Written by: Social
-
-SetEnv Colorset_Name "WhiteDesktop"
-SetEnv Colorset_Author "Social"
-
-# What colorsets do we use?
-Read $[FVWM_SYSTEMDIR]/colorsets/colorset-definition
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# QuakeConsole, thumbnailed windows
-Colorset $[cs_quakeconsole] \
-Foreground "black", Background "black", \
-Hilight "black", Shadow "black", \
-IconAlpha 70
-
-
-Colorset $[cs_panel_inactive] \
-Foreground "black", Background "#444444", \
-Tint "#aaaaaa" 50, RootTransparent, \
-fgTint, IconAlpha, IconTint
-
-Colorset $[cs_panel_active] \
-Foreground "darkgray", Background "darkgray", \
-Hilight "darkgray", Shadow "darkgray", \
-Tint "#888888" 50, RootTransparent
-
-Colorset $[cs_panel_wininactive] \
-Foreground "#555555", Background "#777777", \
-Hilight "#444444", Shadow "#444444", \
-Tint "#aaaaaa" 60, RootTransparent
-
-Colorset $[cs_panel_winactive] \
-Foreground "black", Background "#777777", \
-Hilight "#666666", Shadow "#666666", \
-Tint "#aaaaaa" 80, RootTransparent
-
-Colorset $[cs_panel_border] \
-Background "#777777"
-
-Colorset $[cs_menu_inactive] \
-Foreground "black", Background "white", \
-Hilight "white", Shadow "white", \
-Translucent "#aaaaaa" 50
-
-Colorset $[cs_menu_active] \
-Foreground "#333333", Background "white", \
-Hilight "#333333", Shadow "gray"
-
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Additional variables
-SetEnv ThumbBorderColor "black"
-SetEnv ExternalFontColor "gray40"
-
-SetEnv TrayerTint "0xaaaaaa"
-SetEnv TrayerAlpha "128"
-
diff --git a/components/apps/ROX-Filer b/components/apps/ROX-Filer
new file mode 100644
index 0000000..889b553
--- /dev/null
+++ b/components/apps/ROX-Filer
@@ -0,0 +1,7 @@
+# Launch the pinboard
+Test (Init) Test (x rox) Exec exec rox --pinboard=Default
+
+# Set the specified wallpaper using ROX-Filer's pinboard
+DestroyFunc Wallpaper-Set
+AddToFunc Wallpaper-Set
++ I Test (x rox) Exec echo "<?xml version=\"1.0\"?><env:Envelope xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\"><env:Body xmlns=\"http://rox.sourceforge.net/SOAP/ROX-Filer\"><SetBackdrop><Filename>$*</Filename><Style>Fit</Style></SetBackdrop></env:Body></env:Envelope>" | rox -R
diff --git a/components/bindings/Desktop-MMB-EdgeScroll b/components/bindings/Desktop-MMB-EdgeScroll
new file mode 100644
index 0000000..9a93de5
--- /dev/null
+++ b/components/bindings/Desktop-MMB-EdgeScroll
@@ -0,0 +1 @@
+# we always want EdgeScroll on!
diff --git a/components/bindings/Desktop-MMB-TogglePanels b/components/bindings/Desktop-MMB-TogglePanels
new file mode 100644
index 0000000..5d49344
--- /dev/null
+++ b/components/bindings/Desktop-MMB-TogglePanels
@@ -0,0 +1 @@
+# not useful for me
diff --git a/components/bindings/Desktop-dakkar b/components/bindings/Extra-Keybindings
index 9b3b434..f8ec431 100644
--- a/components/bindings/Desktop-dakkar
+++ b/components/bindings/Extra-Keybindings
@@ -1,5 +1,9 @@
-# Open screen on Alt+RMB
-Mouse 3 RI $[Mod1] Exec exec $[DefaultTerminal] -title local-screen -e screen -D -RR
+Key apostrophe A $[Mod1] Menu /Applications root c c
+Key quotedbl A $[Mod1] Menu /FVWM-Crystal root c c
+
+Mouse 3 RI $[Mod1] Exec exec $[infostore.DefaultTerminal] -title local-screen -e screen -D -RR
+
+Mouse 3 RI $[Mod2] Popup /Screens
Key XF86Launch3 A N Exec emacsclient -nc
Key XF86Launch4 A N Exec firefox
diff --git a/components/bindings/Multimedia_Keys b/components/bindings/Multimedia_Keys
new file mode 100644
index 0000000..1694805
--- /dev/null
+++ b/components/bindings/Multimedia_Keys
@@ -0,0 +1,4 @@
+Key XF86AudioRaiseVolume A $[Mod0] Change-Volume-Up
+Key XF86AudioLowerVolume A $[Mod0] Change-Volume-Down
+Key XF86AudioMute A $[Mod0] Mixer-Volume-Toggle
+Key XF86Eject A $[Mod0] Mixer-Show
diff --git a/components/bindings/Multimedia_Keys_Numlock b/components/bindings/Multimedia_Keys_Numlock
new file mode 100644
index 0000000..ea1ed71
--- /dev/null
+++ b/components/bindings/Multimedia_Keys_Numlock
@@ -0,0 +1 @@
+# no special numlock stuff
diff --git a/components/bindings/Music b/components/bindings/Music
deleted file mode 100644
index 02d963d..0000000
--- a/components/bindings/Music
+++ /dev/null
@@ -1,8 +0,0 @@
-Key XF86AudioLowerVolume A $[Mod0] Mixer-Volume-Down 5
-Key XF86AudioRaiseVolume A $[Mod0] Mixer-Volume-Up 5
-Key XF86AudioMute A $[Mod0] Mixer-GUI
-Key XF86Eject A $[Mod0] Music-GUI
-
-Key XF86AudioPlay A $[Mod0] Music-PlayPause
-Key XF86AudioNext A $[Mod] Music-Next
-Key XF86AudioPrev A $[Mod] Music-Prev
diff --git a/components/bindings/Numpad-Control b/components/bindings/Numpad-Control
new file mode 100644
index 0000000..76396b5
--- /dev/null
+++ b/components/bindings/Numpad-Control
@@ -0,0 +1,8 @@
+Key KP_Add A $[Mod1] Raise
+Key KP_Subtract A $[Mod1] Lower
+Key KP_Multiply A $[Mod1] PlaceAgain
+Key KP_Equal A $[Mod1] Window-Shade toggle
+
+Key KP_Divide A $[Mod2] Maximize toggle 0 100
+Key KP_Enter A $[Mod2] Maximize toggle 100 0
+Key KP_Decimal A $[Mod2] Maximize toggle 100 100
diff --git a/components/bindings/Numpad-Focus b/components/bindings/Numpad-Focus
index f09ddd9..43a601b 100644
--- a/components/bindings/Numpad-Focus
+++ b/components/bindings/Numpad-Focus
@@ -1,5 +1,3 @@
-# Here are the bindings for focus-switching using the numpad
-# This version only switches the focus
Key KP_Home A $[Mod1] Window-FocusInDirection NorthWest
Key KP_Left A $[Mod1] Window-FocusInDirection West
Key KP_End A $[Mod1] Window-FocusInDirection SouthWest
@@ -9,5 +7,3 @@ Key KP_Page_Up A $[Mod1] Window-FocusInDirection NorthEast
Key KP_Page_Down A $[Mod1] Window-FocusInDirection SouthEast
Key KP_Right A $[Mod1] Window-FocusInDirection East
Key KP_Begin A $[Mod1] Window-FocusInDirection Center
-
-# vim:ft=fvwm
diff --git a/components/bindings/Numpad-Warp b/components/bindings/Numpad-Warp
new file mode 100644
index 0000000..87ef4e0
--- /dev/null
+++ b/components/bindings/Numpad-Warp
@@ -0,0 +1 @@
+# no warping
diff --git a/components/bindings/Window-Basic b/components/bindings/Window-Basic
index d67845b..8143118 100644
--- a/components/bindings/Window-Basic
+++ b/components/bindings/Window-Basic
@@ -1,10 +1,8 @@
-# Basic window bindings
-
Mouse 1 T $[Mod] Window-Raise-RaiseMove
Mouse 2 T $[Mod] Window-Shade-Resize
Mouse 3 T $[Mod] Window-Lower-Move
Mouse 1 WT $[Mod1] Window-Raise-RaiseMove
-Mouse 2 WT $[Mod1] Popup /Window-Menu Mouse -50m +5p
+#Mouse 2 WT $[Mod1] Popup /Window-Menu Mouse -50m +5p
+Mouse 2 WT $[Mod1] Window-Resize-Opaque SE
Mouse 3 WT $[Mod1] Window-Lower-Move
-
diff --git a/components/bindings/Window-Control b/components/bindings/Window-Control
new file mode 100644
index 0000000..2d3fa67
--- /dev/null
+++ b/components/bindings/Window-Control
@@ -0,0 +1,2 @@
+Key W A $[Mod1] Close
+Key M A $[Mod1] Window-Iconify
diff --git a/components/bindings/Window-Control-Dakkar b/components/bindings/Window-Control-Dakkar
deleted file mode 100644
index 3080bfb..0000000
--- a/components/bindings/Window-Control-Dakkar
+++ /dev/null
@@ -1,9 +0,0 @@
-Key W A $[Mod1] Close
-Key M A $[Mod1] Window-Iconify
-Key KP_Add A $[Mod1] Raise
-Key KP_Subtract A $[Mod1] Lower
-Key KP_Multiply A $[Mod1] PlaceAgain
-Key KP_Equal A $[Mod1] Window-Shade toggle
-Key KP_Up A $[Mod2] Maximize toggle 0 100
-Key KP_Right A $[Mod2] Maximize toggle 100 0
-Key KP_Begin A $[Mod2] Maximize toggle 100 100
diff --git a/components/bindings/Window-List b/components/bindings/Window-List
index 9710532..772bfc1 100644
--- a/components/bindings/Window-List
+++ b/components/bindings/Window-List
@@ -5,7 +5,6 @@
# Show windows on all pages
Key Tab A $[Mod1] Window-List "root c c"
-
# This menu shows iconified windows
Key Tab A $[Mod2] Window-List-Icons "root c c"
diff --git a/components/bindings/Window-Rearrange b/components/bindings/Window-Rearrange
new file mode 100644
index 0000000..6755e99
--- /dev/null
+++ b/components/bindings/Window-Rearrange
@@ -0,0 +1 @@
+# I don't understand the default code, let's disable it for now
diff --git a/components/bindings/Window-Transparency b/components/bindings/Window-Transparency
new file mode 100644
index 0000000..880e0ee
--- /dev/null
+++ b/components/bindings/Window-Transparency
@@ -0,0 +1 @@
+# no transparency
diff --git a/components/decorations/Buttons-os2-MiniIcon b/components/decorations/Buttons-os2-MiniIcon
index 798fe66..58b3cf5 100644
--- a/components/decorations/Buttons-os2-MiniIcon
+++ b/components/decorations/Buttons-os2-MiniIcon
@@ -1,9 +1,3 @@
-# OS/2 Button Setup
-# Written by Maciej Delmanowski <harnir@post.pl>
-#
-# This is the window titlebar button setup similar to the OS/2
-# buttons on the titlebar
-
# 1st button - close
Mouse 1 1 $[Mod] Window-Button-Function Button1 /Window-Menu Close
Mouse 2 1 $[Mod] Window-Button-Function Button1 /Window-Menu Nop
@@ -11,12 +5,12 @@ Mouse 3 1 $[Mod] Window-Button-Function Button1 /Window-Menu Window-Iconify
Style * Button 1
# 2nd button - various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize
-Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 100 0
-Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 100
-Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow grow
-Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow 0
-Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 grow
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
Style * Button 2
# MiniIcon
@@ -42,4 +36,3 @@ Style * NoButton 8
Style * NoButton 9
Style * NoButton 0
-
diff --git a/components/desktop/FVWM-Crystal_Preferences b/components/desktop/FVWM-Crystal_Preferences
new file mode 100644
index 0000000..66121aa
--- /dev/null
+++ b/components/desktop/FVWM-Crystal_Preferences
@@ -0,0 +1,3 @@
+LoadPreferences NotificationAreaManager
+LoadPreferences DeskPageXY
+DesktopSize $[infostore.Desk_Pages_X]x$[infostore.Desk_Pages_Y]
diff --git a/components/desktop/Keyboard b/components/desktop/Keyboard
index 84bd7d9..2a2fcc2 100644
--- a/components/desktop/Keyboard
+++ b/components/desktop/Keyboard
@@ -1,17 +1,7 @@
-# Standard keyboard layout
-# You need several functions to use all of the keybindings
-
-Include components/bindings/Music
Include components/bindings/Pager-Square
Include components/bindings/PageSwitch-Square
-#Include components/bindings/Window-Control
+Include components/bindings/Window-Control
Include components/bindings/Window-List
-#Include components/bindings/Window-Rearrange
+Include components/bindings/Window-Rearrange
Include components/bindings/Misc-Keybindings
-Include components/bindings/Window-Control-Dakkar
-Include components/bindings/Numpad-Focus
-Include components/bindings/TheLauncher
-
-Key apostrophe A $[Mod1] Menu /Applications root c c
-Key quotedbl A $[Mod1] Menu /FVWM-Crystal root c c
-
+Include components/bindings/Extra-Keybindings
diff --git a/components/desktop/Keyboard_NumLock b/components/desktop/Keyboard_NumLock
new file mode 100644
index 0000000..7b4fde6
--- /dev/null
+++ b/components/desktop/Keyboard_NumLock
@@ -0,0 +1 @@
+# numlock disables everything! we want this.
diff --git a/components/desktop/dakkar_Preferences b/components/desktop/dakkar_Preferences
deleted file mode 100644
index b2d6254..0000000
--- a/components/desktop/dakkar_Preferences
+++ /dev/null
@@ -1,6 +0,0 @@
-AddToMenu /Preferences/Mixer
-Test (x amixer) + '%22x22/apps/alsamixer.png%ALSA' SelectMixer amixer
-
-AddToMenu /Preferences/MusicPlayer
-Test (x amarok) + '%22x22/apps/amarok.png%AmaroK' SelectMusicPlayer amarok
-
diff --git a/components/functions/BlingBling b/components/functions/BlingBling
new file mode 100644
index 0000000..242aa64
--- /dev/null
+++ b/components/functions/BlingBling
@@ -0,0 +1 @@
+# nothing, no translucency change
diff --git a/components/functions/Fullscreen b/components/functions/Fullscreen
new file mode 100644
index 0000000..8a5a4fd
--- /dev/null
+++ b/components/functions/Fullscreen
@@ -0,0 +1 @@
+# do nothing, we don't want Fullscreen
diff --git a/components/functions/Mixer b/components/functions/Mixer
new file mode 100644
index 0000000..260faeb
--- /dev/null
+++ b/components/functions/Mixer
@@ -0,0 +1,15 @@
+DestroyFunc Change-Volume-Up
+AddToFunc Change-Volume-Up
++ I exec amixer set Master 10%+ >/dev/null
+
+DestroyFunc Change-Volume-Down
+AddToFunc Change-Volume-Down
++ I exec amixer set Master 10%- >/dev/null
+
+DestroyFunc Mixer-Volume-Toggle
+AddToFunc Mixer-Volume-Toggle
++ I exec amixer set Master toggle >/dev/null
+
+DestroyFunc Mixer-Show
+AddToFunc Mixer-Show
++ I exec pavucontrol &
diff --git a/components/functions/Mixer-amixer b/components/functions/Mixer-amixer
deleted file mode 100644
index aec79b6..0000000
--- a/components/functions/Mixer-amixer
+++ /dev/null
@@ -1,25 +0,0 @@
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec amixer set Master "$0"'%' > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec amixer set Master "$0"'%+' > /dev/null
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec amixer set Master "$0"'%-' > /dev/null
-
-DestroyFunc Mixer-GUI
-AddToFunc Mixer-GUI
-+ I Exec exec gamix > /dev/null
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
diff --git a/components/functions/Music-amarok b/components/functions/Music-amarok
deleted file mode 100644
index 8a5ab35..0000000
--- a/components/functions/Music-amarok
+++ /dev/null
@@ -1,49 +0,0 @@
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
-
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
-+ I DestroyMenu recreate /Music
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Music-ToggleRepeat
-+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Music '$[gt.Show/hide player]' Music-GUI
-+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
-
-DestroyFunc Music-Play
-AddToFunc Music-Play
-+ I Exec exec dcop amarok player play 2>/dev/null
-
-DestroyFunc Music-Pause
-AddToFunc Music-Pause
-+ I Exec exec dcop amarok player pause 2>/dev/null
-
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec exec dcop amarok player stop 2>/dev/null
-
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec dcop amarok player playPause 2>/dev/null
-
-DestroyFunc Music-Next
-AddToFunc Music-Next
-+ I Exec exec dcop amarok player next 2>/dev/null
-
-DestroyFunc Music-Prev
-AddToFunc Music-Prev
-+ I Exec exec dcop amarok player prev 2>/dev/null
-
-DestroyFunc Music-ToggleRandom
-AddToFunc Music-ToggleRandom
-+ I Exec exec dcop amarok player enableRandomMode $( if [ $(dcop amarok player randomModeStatus) == false ]; then echo true; else echo false;fi) 2>/dev/null
-
-DestroyFunc Music-ToggleRepeat
-AddToFunc Music-ToggleRepeat
-+ I Exec exec dcop amarok player enableRepeatPlaylist $( if [ $(dcop amarok player repeatPlaylistStatus) == false ]; then echo true; else echo false;fi) 2>/dev/null
-
-DestroyFunc Music-GUI
-AddToFunc Music-GUI
-+ I Exec dcop amarok playlist togglePlaylist 2>/dev/null || amarok
diff --git a/components/functions/Numpad b/components/functions/Numpad
deleted file mode 100644
index b694ee3..0000000
--- a/components/functions/Numpad
+++ /dev/null
@@ -1,57 +0,0 @@
-# Numpad
-
-# ---------------------------------------------------------------------------
-# Focus functions
-DestroyFunc Window-FocusInDirection
-AddToFunc Window-FocusInDirection
-+ I Direction $0 (CurrentPage, AnyScreen, AcceptsFocus, !Iconic) Focus
-
-DestroyFunc Window-FocusAndRaiseInDirection
-AddToFunc Window-FocusAndRaiseInDirection
-+ I Direction $0 (CurrentPage, AnyScreen, AcceptsFocus, !Iconic) Focus
-+ I Current (Focused) Raise
-
-# ---------------------------------------------------------------------------
-# Move functions
-DestroyFunc Window-MPAnimatedMove
-AddToFunc Window-MPAnimatedMove
-+ I Current (HasPointer) AnimatedMove $0 $1 Warp
-+ I TestRc (NoMatch) AnimatedMove $0 $1
-
-DestroyFunc Window-Warp-CenterCenter
-AddToFunc Window-Warp-CenterCenter
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p `expr $[vp.height] / 2 - $[w.height] / 2`p'
-
-DestroyFunc Window-Warp-LeftCenter
-AddToFunc Window-Warp-LeftCenter
-+ I Current Piperead 'echo Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p `expr $[vp.height] / 2 - $[w.height] / 2`p'
-
-DestroyFunc Window-Warp-LeftTop
-AddToFunc Window-Warp-LeftTop
-+ I Current Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p $[EWMH_BS_Panel_Top]p
-
-DestroyFunc Window-Warp-CenterTop
-AddToFunc Window-Warp-CenterTop
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p $[EWMH_BS_Panel_Top]p'
-
-DestroyFunc Window-Warp-RightTop
-AddToFunc Window-Warp-RightTop
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p $[EWMH_BS_Panel_Top]p'
-
-DestroyFunc Window-Warp-RightCenter
-AddToFunc Window-Warp-RightCenter
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p `expr $[vp.height] / 2 - $[w.height] / 2`p'
-
-DestroyFunc Window-Warp-CenterBottom
-AddToFunc Window-Warp-CenterBottom
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p'
-
-DestroyFunc Window-Warp-LeftBottom
-AddToFunc Window-Warp-LeftBottom
-+ I Current Piperead 'echo Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p'
-
-DestroyFunc Window-Warp-RightBottom
-AddToFunc Window-Warp-RightBottom
-+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p'
-
-# vim:ft=fvwm
diff --git a/components/functions/Screen-Menu b/components/functions/Screen-Menu
index e32dc39..28b6c09 100644
--- a/components/functions/Screen-Menu
+++ b/components/functions/Screen-Menu
@@ -7,5 +7,3 @@ AddToFunc BuildScreensMenu
+ I DestroyMenu recreate /Screens
+ I AddToMenu /Screens
+ I PipeRead $[FVWM_USERDIR]/scripts/fvwm-screen.pl
-
-Mouse 3 RI $[Mod1] Popup /Screens
diff --git a/components/functions/Notify b/components/functions/Urgency-Hint
index f0c2a55..af35efe 100644
--- a/components/functions/Notify
+++ b/components/functions/Urgency-Hint
@@ -10,3 +10,4 @@ DestroyFunc UrgencyFunc
AddtoFunc UrgencyFunc
+ I BubbleNotify $[w.name] $[w.name] 'beep!' 2000 $[w.iconfile]
+DestroyFunc UrgencyDoneFunc
diff --git a/components/scripts/FvwmScript-Clock-dakkar b/components/scripts/FvwmScript-Clock
index a298848..a298848 100755
--- a/components/scripts/FvwmScript-Clock-dakkar
+++ b/components/scripts/FvwmScript-Clock
diff --git a/decorations/Dakkar/Colorsets b/decorations/Dakkar/Colorsets
deleted file mode 100644
index 549aaa4..0000000
--- a/decorations/Dakkar/Colorsets
+++ /dev/null
@@ -1,24 +0,0 @@
-# Colorset setup
-
-# What colorset numbers do we use?
-SetEnv cs_window_inactive "9"
-SetEnv cs_window_active "10"
-SetEnv cs_window_inactiveborder "11"
-SetEnv cs_window_activeborder "12"
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Colorsets
-
-Colorset $[cs_window_inactive] \
-Foreground "black", Background "black", \
-Hilight "white", Shadow "#e0d9d2", \
-Fgsh "#e0d9d2"
-
-Colorset $[cs_window_active] \
-Foreground "white", Background "black", \
-Hilight "white", Shadow "gray", \
-fgsh "black"
-
-Colorset $[cs_window_inactiveborder] Background "#3e3c39"
-Colorset $[cs_window_activeborder] Background "#1f252b"
-
diff --git a/decorations/Dakkar/Default/Colorsets b/decorations/Dakkar/Default/Colorsets
new file mode 100644
index 0000000..2b75860
--- /dev/null
+++ b/decorations/Dakkar/Default/Colorsets
@@ -0,0 +1,19 @@
+# Colorset setup
+
+# What colorset numbers do we use?
+InfoStoreAdd cs_window_inactive "9"
+InfoStoreAdd cs_window_active "10"
+
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Colorsets
+
+Colorset $[infostore.cs_window_inactive] \
+Foreground "#7f7d7b", Background "#bfbcb9", \
+Hilight "#666666", Shadow "#666666", \
+VGradient 100 3 "#f2eeeb" 40 "#f1edea" 10 "#bfbcb9" 50 "#d4d1cd", Tint
+
+Colorset $[infostore.cs_window_active] \
+Foreground "white", Background "#637a8a", \
+Hilight "gray", Shadow "gray", \
+VGradient 100 3 "#90a8b9" 40 "#8ba4b6" 10 "#576b79" 50 "#6d8798", Tint
+
diff --git a/decorations/Dakkar/Default/Theme.os2 b/decorations/Dakkar/Default/Theme.os2
new file mode 100644
index 0000000..928f31b
--- /dev/null
+++ b/decorations/Dakkar/Default/Theme.os2
@@ -0,0 +1,49 @@
+# OS/2 version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 17 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1
+
+# Maximize
++ ButtonStyle 2 Vector 13 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1
+
++ ButtonStyle 3 MiniIcon
+
+# Iconify
++ ButtonStyle 4 Vector 5 23x63@4 74x63@1 74x72@1 23x72@1 23x63@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-os2-MiniIcon
+
diff --git a/decorations/Dakkar/README b/decorations/Dakkar/README
deleted file mode 100644
index 780d5d3..0000000
--- a/decorations/Dakkar/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Clearlooks DeepSky window decoration for FVWM & FVWM-Crystal
------------------------------------------------------
-
-Ported by: Maciej Delmanowski <harnir@post.pl>
-Homepage: http://fvwm-crystal.berlios.de/
-License: GPL
-
-Based on Clearlooks GTK2 engine
-Original authors: Richard Stellingwerff, Daniel Borgmann
-Original homepage: http://clearlooks.sourceforge.net/
-
diff --git a/decorations/Dakkar/Theme.os2 b/decorations/Dakkar/Theme.os2
deleted file mode 100644
index 3a0d7dd..0000000
--- a/decorations/Dakkar/Theme.os2
+++ /dev/null
@@ -1,51 +0,0 @@
-# OS/2 version
-
-# Setup colorsets
-Read $./Colorsets
-
-DestroyDecor recreate WindowDecoration
-AddToDecor WindowDecoration
-
-+ TitleStyle Active TiledPixmap $./window-active-title.png
-+ TitleStyle InActive TiledPixmap $./window-inactive-title.png
-+ TitleStyle Centered Height 24 -- flat
-
-+ BorderStyle -- HiddenHandles
-+ BorderStyle -- Flat
-
-+ ButtonStyle 1 \
- ActiveUp (Pixmap $./window-active-close.png) \
- ActiveDown (Pixmap $./window-active-close-down.png) \
- InactiveUp (Pixmap $./window-inactive-close.png) \
- InactiveDown (Pixmap $./window-inactive-close-down.png)
-
-+ ButtonStyle 2 \
- ActiveUp (Pixmap $./window-active-maximize.png) \
- ActiveDown (Pixmap $./window-active-maximize-down.png) \
- InactiveUp (Pixmap $./window-inactive-maximize.png) \
- InactiveDown (Pixmap $./window-inactive-maximize-down.png)
-
-+ ButtonStyle 3 MiniIcon
-
-+ ButtonStyle 4 \
- ActiveUp (Pixmap $./window-active-iconify.png) \
- ActiveDown (Pixmap $./window-active-iconify-down.png) \
- InactiveUp (Pixmap $./window-inactive-iconify.png) \
- InactiveDown (Pixmap $./window-inactive-iconify-down.png)
-
-+ ButtonStyle All -- UseTitleStyle
-+ ButtonStyle All -- flat
-
-Style * HandleWidth 1, BorderWidth 1
-Style * Colorset $[cs_window_inactive], \
- BorderColorset $[cs_window_inactiveborder], \
- HilightColorset $[cs_window_active], \
- HilightBorderColorset $[cs_window_activeborder]
-
-Style * Font shadow="1 1":"xft:Verdana:pixelsize=12:Bold:encoding=iso10646-1"
-
-Style * UseDecor WindowDecoration
-
-# Setup button functions
-Include components/decorations/Buttons-os2-MiniIcon
-
diff --git a/decorations/Dakkar/window-active-arrows-down.png b/decorations/Dakkar/window-active-arrows-down.png
deleted file mode 100644
index 439b303..0000000
--- a/decorations/Dakkar/window-active-arrows-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-arrows.png b/decorations/Dakkar/window-active-arrows.png
deleted file mode 100644
index 7ae7c04..0000000
--- a/decorations/Dakkar/window-active-arrows.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-close-down.png b/decorations/Dakkar/window-active-close-down.png
deleted file mode 100644
index e0bdf5a..0000000
--- a/decorations/Dakkar/window-active-close-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-close.png b/decorations/Dakkar/window-active-close.png
deleted file mode 100644
index cb32d9b..0000000
--- a/decorations/Dakkar/window-active-close.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-empty-down.png b/decorations/Dakkar/window-active-empty-down.png
deleted file mode 100644
index 5464cdd..0000000
--- a/decorations/Dakkar/window-active-empty-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-empty.png b/decorations/Dakkar/window-active-empty.png
deleted file mode 100644
index 3d00ffb..0000000
--- a/decorations/Dakkar/window-active-empty.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-iconify-down.png b/decorations/Dakkar/window-active-iconify-down.png
deleted file mode 100644
index 08fb621..0000000
--- a/decorations/Dakkar/window-active-iconify-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-iconify.png b/decorations/Dakkar/window-active-iconify.png
deleted file mode 100644
index a075000..0000000
--- a/decorations/Dakkar/window-active-iconify.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-maximize-down.png b/decorations/Dakkar/window-active-maximize-down.png
deleted file mode 100644
index 69b47e2..0000000
--- a/decorations/Dakkar/window-active-maximize-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-maximize.png b/decorations/Dakkar/window-active-maximize.png
deleted file mode 100644
index 2d0ce4d..0000000
--- a/decorations/Dakkar/window-active-maximize.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-options-down.png b/decorations/Dakkar/window-active-options-down.png
deleted file mode 100644
index e67784b..0000000
--- a/decorations/Dakkar/window-active-options-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-options.png b/decorations/Dakkar/window-active-options.png
deleted file mode 100644
index 7eaf4f4..0000000
--- a/decorations/Dakkar/window-active-options.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-active-title.png b/decorations/Dakkar/window-active-title.png
deleted file mode 100644
index d6df41b..0000000
--- a/decorations/Dakkar/window-active-title.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-arrows-down.png b/decorations/Dakkar/window-inactive-arrows-down.png
deleted file mode 100644
index d26ba21..0000000
--- a/decorations/Dakkar/window-inactive-arrows-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-arrows.png b/decorations/Dakkar/window-inactive-arrows.png
deleted file mode 100644
index a4191df..0000000
--- a/decorations/Dakkar/window-inactive-arrows.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-close-down.png b/decorations/Dakkar/window-inactive-close-down.png
deleted file mode 100644
index 646dfc3..0000000
--- a/decorations/Dakkar/window-inactive-close-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-close.png b/decorations/Dakkar/window-inactive-close.png
deleted file mode 100644
index b837725..0000000
--- a/decorations/Dakkar/window-inactive-close.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-empty-down.png b/decorations/Dakkar/window-inactive-empty-down.png
deleted file mode 100644
index 8f3d319..0000000
--- a/decorations/Dakkar/window-inactive-empty-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-empty.png b/decorations/Dakkar/window-inactive-empty.png
deleted file mode 100644
index 0a3a3c6..0000000
--- a/decorations/Dakkar/window-inactive-empty.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-iconify-down.png b/decorations/Dakkar/window-inactive-iconify-down.png
deleted file mode 100644
index 51e6df0..0000000
--- a/decorations/Dakkar/window-inactive-iconify-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-iconify.png b/decorations/Dakkar/window-inactive-iconify.png
deleted file mode 100644
index f3d6976..0000000
--- a/decorations/Dakkar/window-inactive-iconify.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-maximize-down.png b/decorations/Dakkar/window-inactive-maximize-down.png
deleted file mode 100644
index daaaf8e..0000000
--- a/decorations/Dakkar/window-inactive-maximize-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-maximize.png b/decorations/Dakkar/window-inactive-maximize.png
deleted file mode 100644
index 9147053..0000000
--- a/decorations/Dakkar/window-inactive-maximize.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-options-down.png b/decorations/Dakkar/window-inactive-options-down.png
deleted file mode 100644
index 3664e8d..0000000
--- a/decorations/Dakkar/window-inactive-options-down.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-options.png b/decorations/Dakkar/window-inactive-options.png
deleted file mode 100644
index 371b8a9..0000000
--- a/decorations/Dakkar/window-inactive-options.png
+++ /dev/null
Binary files differ
diff --git a/decorations/Dakkar/window-inactive-title.png b/decorations/Dakkar/window-inactive-title.png
deleted file mode 100644
index 3266749..0000000
--- a/decorations/Dakkar/window-inactive-title.png
+++ /dev/null
Binary files differ
diff --git a/desktop.jpg b/desktop.jpg
deleted file mode 100644
index 0d736f8..0000000
--- a/desktop.jpg
+++ /dev/null
Binary files differ
diff --git a/preferences/DefaultFocusPolicy b/preferences/DefaultFocusPolicy
new file mode 100644
index 0000000..df39ca8
--- /dev/null
+++ b/preferences/DefaultFocusPolicy
@@ -0,0 +1 @@
+Include components/styles/FocusPolicy-FVWM-Crystal
diff --git a/preferences/DefaultMixer b/preferences/DefaultMixer
deleted file mode 100644
index e09f3e0..0000000
--- a/preferences/DefaultMixer
+++ /dev/null
@@ -1 +0,0 @@
-Include components/functions/Mixer-amixer
diff --git a/preferences/DefaultMusicPlayer b/preferences/DefaultMusicPlayer
deleted file mode 100644
index a2ca0d6..0000000
--- a/preferences/DefaultMusicPlayer
+++ /dev/null
@@ -1 +0,0 @@
-Include components/functions/Music-audacious
diff --git a/preferences/DefaultTerminal b/preferences/DefaultTerminal
index f90afe1..516ba78 100644
--- a/preferences/DefaultTerminal
+++ b/preferences/DefaultTerminal
@@ -1 +1 @@
-FindCommand DefaultTerminal urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal
+FindCommand DefaultTerminal urxvt terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal
diff --git a/preferences/DeskPageXY b/preferences/DeskPageXY
new file mode 100644
index 0000000..5a11560
--- /dev/null
+++ b/preferences/DeskPageXY
@@ -0,0 +1,2 @@
+InfoStoreAdd Desk_Pages_X 5
+InfoStoreAdd Desk_Pages_Y 5
diff --git a/preferences/DesktopMenu b/preferences/DesktopMenu
new file mode 100644
index 0000000..3b753ad
--- /dev/null
+++ b/preferences/DesktopMenu
@@ -0,0 +1 @@
+# no desktop menu
diff --git a/preferences/FvwmConsoleTerminal b/preferences/FvwmConsoleTerminal
new file mode 100644
index 0000000..3fa7b2d
--- /dev/null
+++ b/preferences/FvwmConsoleTerminal
@@ -0,0 +1 @@
+FindCommand FvwmConsoleTerminal urxvt mrxvt urxvt aterm xterm
diff --git a/preferences/IconDirs b/preferences/IconDirs
new file mode 100644
index 0000000..0c3cd05
--- /dev/null
+++ b/preferences/IconDirs
@@ -0,0 +1,11 @@
+# FVWM-Crystal preference for menu icons
+# Put in this file, all the directories that
+# must be searched for icon files.
+# Those directories will be searched by
+# fvwm-crystal.generate-menu for the generation
+# of the application menu.
+# It must be one directory per line.
+# Lines that begin with # will be ignored.
+/usr/share/icons
+/usr/share/pixmaps
+#/usr/kde/3.5/share/icons
diff --git a/preferences/IconsType b/preferences/IconsType
new file mode 100644
index 0000000..bb18dd2
--- /dev/null
+++ b/preferences/IconsType
@@ -0,0 +1 @@
+Include components/desktop/Icon-Thumbnails
diff --git a/preferences/LastChoosenButtonModel b/preferences/LastChoosenButtonModel
index 6ffabc9..793e7e8 100644
--- a/preferences/LastChoosenButtonModel
+++ b/preferences/LastChoosenButtonModel
@@ -1 +1 @@
-SetEnv Window_Decorations_ButtonModel Theme.os2
+SetEnv Window_Decorations_ButtonModel 'Theme.os2'
diff --git a/preferences/LastChoosenColorset b/preferences/LastChoosenColorset
index d756132..0661c12 100644
--- a/preferences/LastChoosenColorset
+++ b/preferences/LastChoosenColorset
@@ -1 +1 @@
-Colorsets-Set '/home/dakkar/.fvwm-crystal/colorsets/WhiteDesktop.cs'
+Colorsets-Set '/usr/bin/../share/fvwm-crystal/fvwm/colorsets/WhiteDesktop.cs'
diff --git a/preferences/LastChoosenRecipe b/preferences/LastChoosenRecipe
index cfaa445..fe9c046 100644
--- a/preferences/LastChoosenRecipe
+++ b/preferences/LastChoosenRecipe
@@ -1 +1 @@
-Read '/home/dakkar/.fvwm-crystal/recipes/TopLine'
+InfoStoreAdd Fvwm_Crystal_Recipe '/home/dakkar/.fvwm-crystal/recipes/Dakkar'
diff --git a/preferences/LastChoosenWallpaper b/preferences/LastChoosenWallpaper
index b3fbef6..ec6c40d 100644
--- a/preferences/LastChoosenWallpaper
+++ b/preferences/LastChoosenWallpaper
@@ -1 +1 @@
-Wallpaper-Set '/usr/bin/../share/fvwm-crystal/fvwm/wallpapers/fvwm-crystal-dark2-1024x768.jpg'
+Wallpaper-Set /home/dakkar/pics/nausicaa/drappo-wide.png
diff --git a/preferences/LastChoosenWindowDecoration b/preferences/LastChoosenWindowDecoration
index a3382ae..4431da2 100644
--- a/preferences/LastChoosenWindowDecoration
+++ b/preferences/LastChoosenWindowDecoration
@@ -1 +1 @@
-Window-Decorations-Set '/home/dakkar/.fvwm-crystal/decorations/Dakkar'
+Window-Decorations-Set '/home/dakkar/.fvwm-crystal/decorations/Dakkar/Default'
diff --git a/preferences/MediaDirectories b/preferences/MediaDirectories
new file mode 100644
index 0000000..8f56dbc
--- /dev/null
+++ b/preferences/MediaDirectories
@@ -0,0 +1,4 @@
+audio /home/name/Musique
+video /home/name/Movies
+cdrom /dev/cdrom0
+dvd /dev/cdrom1
diff --git a/preferences/MenuFont b/preferences/MenuFont
new file mode 100644
index 0000000..f07d3c6
--- /dev/null
+++ b/preferences/MenuFont
@@ -0,0 +1 @@
+SetEnv menu_font "Verdana"
diff --git a/preferences/MenuFontSize b/preferences/MenuFontSize
new file mode 100644
index 0000000..fbeb7ec
--- /dev/null
+++ b/preferences/MenuFontSize
@@ -0,0 +1 @@
+SetEnv menu_font_size 20
diff --git a/preferences/MenuFontStyle b/preferences/MenuFontStyle
new file mode 100644
index 0000000..76a30e3
--- /dev/null
+++ b/preferences/MenuFontStyle
@@ -0,0 +1 @@
+SetEnv menu_font_style Regular
diff --git a/preferences/NotificationAreaManager b/preferences/NotificationAreaManager
new file mode 100644
index 0000000..3a9581b
--- /dev/null
+++ b/preferences/NotificationAreaManager
@@ -0,0 +1 @@
+FindCommand NotificationAreaManager trayer trayer stalonetray
diff --git a/preferences/PanelFont b/preferences/PanelFont
new file mode 100644
index 0000000..067ad64
--- /dev/null
+++ b/preferences/PanelFont
@@ -0,0 +1 @@
+SetEnv panel_font "Verdana"
diff --git a/preferences/PanelFontSize b/preferences/PanelFontSize
new file mode 100644
index 0000000..acfa657
--- /dev/null
+++ b/preferences/PanelFontSize
@@ -0,0 +1 @@
+SetEnv panel_font_size 18
diff --git a/preferences/PanelFontStyle b/preferences/PanelFontStyle
new file mode 100644
index 0000000..d12c3af
--- /dev/null
+++ b/preferences/PanelFontStyle
@@ -0,0 +1 @@
+SetEnv panel_font_style Regular
diff --git a/preferences/QuakeConsoleHeight b/preferences/QuakeConsoleHeight
deleted file mode 100644
index dd36499..0000000
--- a/preferences/QuakeConsoleHeight
+++ /dev/null
@@ -1 +0,0 @@
-SetEnv QuakeConsole_Height 436p
diff --git a/preferences/QuakeConsoleTerminal b/preferences/QuakeConsoleTerminal
index 2a10399..8f519a9 100644
--- a/preferences/QuakeConsoleTerminal
+++ b/preferences/QuakeConsoleTerminal
@@ -1 +1 @@
-FindCommand QuakeConsoleTerminal urxvt
+FindCommand QuakeConsoleTerminal urxvt mrxvt urxvt aterm xterm
diff --git a/preferences/Startup b/preferences/Startup
new file mode 100644
index 0000000..d750037
--- /dev/null
+++ b/preferences/Startup
@@ -0,0 +1,2 @@
+# stuff to do after basic functions are loaded, but before
+# applications / bindings are set \ No newline at end of file
diff --git a/preferences/TitleFont b/preferences/TitleFont
new file mode 100644
index 0000000..c69471e
--- /dev/null
+++ b/preferences/TitleFont
@@ -0,0 +1 @@
+SetEnv title_font "Verdana"
diff --git a/preferences/TitleFontSize b/preferences/TitleFontSize
new file mode 100644
index 0000000..181ced6
--- /dev/null
+++ b/preferences/TitleFontSize
@@ -0,0 +1 @@
+SetEnv title_font_size 22
diff --git a/preferences/TitleFontStyle b/preferences/TitleFontStyle
new file mode 100644
index 0000000..3e5f4e0
--- /dev/null
+++ b/preferences/TitleFontStyle
@@ -0,0 +1 @@
+SetEnv title_font_style Regular
diff --git a/preferences/XScreenSaver b/preferences/XScreenSaver
new file mode 100644
index 0000000..e10b29d
--- /dev/null
+++ b/preferences/XScreenSaver
@@ -0,0 +1 @@
+X xscreensaver -nosplash
diff --git a/recipes/Dakkar b/recipes/Dakkar
new file mode 100644
index 0000000..aab5e96
--- /dev/null
+++ b/recipes/Dakkar
@@ -0,0 +1,93 @@
+Include components/functions/Music
+
+InfoStoreAdd DeskIconsSign " "
+LoadPreferences IconsType
+LoadPreferences DefaultDesktopManager
+
+Style * DecorateTransient, StackTransientParent
+Style * MinOverlapPlacementPenalties 1 0 0 0 0 50
+Style xpad MinOverlapPlacementPenalties 0 0 0 0 0.05 0
+Style * TitleFormat %n, IconTitleFormat %n
+Style * EdgeMoveDelay 250
+Style * EdgeMoveResistance 1 30
+
+EdgeScroll 100 100
+EdgeResistance 250
+HideGeometryWindow Never
+OpaqueMoveSize 100
+EdgeThickness 1
+
+Style * SnapAttraction 10 SameType Screen
+
+EWMH-Desktop 0 0 0 0
+
+Style * IconBox 1300x600+0-0@g, IconFill left bottom, IconGrid 30 30
+Style * StickyIcon
+
+
+Module FvwmAuto 300 -passid -menterleave \
+ "Silent raise_pager" \
+ "Silent lower_pager"
+
+DestroyFunc lower_pager
+AddToFunc lower_pager
++ I WindowId $0 (FvwmPager|mwatch) Layer 0 2
+
+DestroyFunc raise_pager
+AddToFunc raise_pager
++ I WindowId $0 (FvwmPager|mwatch) Layer 0 7
+
+DestroyFunc FvwmPagerWindow
+AddToFunc FvwmPagerWindow
++ I All (FvwmPager) Close
++ I DestroyModuleConfig FvwmPager: *
++ I PipeRead 'echo InfoStoreAdd FvwmPager_Width $((28*$[infostore.Desk_Pages_X])); echo InfoStoreAdd FvwmPager_Height $((24*$[infostore.Desk_Pages_Y]))'
++ I PipeRead 'echo *FvwmPager: Geometry $[infostore.FvwmPager_Width]x$[infostore.FvwmPager_Height]+$((($[vp.width]-$[infostore.FvwmPager_Width])/2))+3'
++ I *FvwmPager: MiniIcons
++ I *FvwmPager: Font none
++ I *FvwmPager: WindowBorderWidth 1
++ I *FvwmPager: NoSeparators
++ I *FvwmPager: UseSkipList
++ I *FvwmPager: Colorset * $[infostore.cs_panel_inactive]
++ I *FvwmPager: HilightColorset * $[infostore.cs_panel_active]
++ I *FvwmPager: WindowColorsets $[infostore.cs_panel_wininactive] $[infostore.cs_panel_winactive]
++ I Module FvwmPager
+
+FvwmPagerWindow
+
+FvwmTrayerPanel request pixel "24" top right "248" "4"
+
+All (FvwmButtons-Panel) Close
+DestroyModuleConfig FvwmButtons-Panel: *
+*FvwmButtons-Panel: Geometry -3+3
+*FvwmButtons-Panel: BoxSize smart
+*FvwmButtons-Panel: ActiveColorset $[infostore.cs_panel_active]
+*FvwmButtons-Panel: Colorset $[infostore.cs_panel_inactive]
+*FvwmButtons-Panel: Rows 1
+*FvwmButtons-Panel: Padding 1 1
+*FvwmButtons-Panel: Frame 0
+*FvwmButtons-Panel: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
+
+# Window list {{{2
+*FvwmButtons-Panel: (1x1, Icon "22x22/fvwm-crystal/window-list.png", \
+Action (Mouse 1) Window-List "$[MenuPosition_SW]", \
+Action (Mouse 2) All (CurrentPage) PlaceAgain anim, \
+Action (Mouse 3) Window-List-Icons "$[MenuPosition_SW]")
+
+# diamond {{{2
+*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/fvwm-crystal.png", \
+ Action (Mouse 1) Menu /FVWM-Crystal $[MenuPosition_SW])
+
+# apps {{{2
+*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/applications.png", \
+ Action (Mouse 1) Menu /Applications $[MenuPosition_SW])
+
+*FvwmButtons-Panel: (7x1, Size 154 24, \
+Swallow (Close, Respawn, FvwmModule) "FvwmScript-Clock" 'Script components/scripts/FvwmScript-Clock', \
+Action (Mouse 3) SendToModule *FvwmScript-Clock SendString 1 1 str)
+
+Module FvwmButtons FvwmButtons-Panel
+
+# This creates the menu with applications available under Alt+Win_R
+PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --search-icons-in=$[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[infostore.Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[infostore.Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=5 --sort=prio --panel-icons=topapp --panel-action1=menu --panel-action2=none --panel-action3=topapp --menu-pos=S --no-panel --check-execs'
+
diff --git a/recipes/TopLine b/recipes/TopLine
deleted file mode 100644
index 9a487ca..0000000
--- a/recipes/TopLine
+++ /dev/null
@@ -1 +0,0 @@
-Read /home/dakkar/.fvwm-crystal/recipes/TopLine-$[fvwm_screen_type]
diff --git a/recipes/TopLine-double b/recipes/TopLine-double
deleted file mode 100644
index 38b5ac0..0000000
--- a/recipes/TopLine-double
+++ /dev/null
@@ -1,286 +0,0 @@
-# TopLine desktop (former "1.1"
-# Written by: Maciej Delmanowski <harnir@post.pl>
-#
-# You can use folding to navigate this file
-
-# ImagePath {{{1
-SetEnv Icon_Theme "Default"
-ImagePath /usr/share/icons/crystalsvg:$[FVWM_USERDIR]/icons/$[Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]
-
-# Includes and FVWM modules {{{1
-Module FvwmCommandS
-
-# Default FVWM-Crystal functions, initialization {{{2
-Include components/desktop/FVWM-Crystal_Functions
-Include components/functions/Clear-FVWM-Settings
-Include components/desktop/FVWM-Crystal_Preferences
-Include components/desktop/dakkar_Preferences
-Append preferences/Startup
-
-# Preferred applications {{{2
-#Include components/functions/Screenshot-import
-Include components/apps/XScreenSaver
-Include components/apps/FvwmMiniConsole
-Include components/apps/QuakeConsole
-Include components/functions/NotificationAreaManager-$[NotificationAreaManager]
-Include preferences/NotificationArea-Width
-Include components/functions/Music-$[MusicPlayer]
-
-# Desktop & window bindings {{{2
-Include components/bindings/Desktop-RMB-OpenTerminal
-Include components/bindings/Desktop-MMB-TogglePanels
-Include components/bindings/Desktop-dakkar
-Include components/bindings/Window-Basic
-Include components/bindings/Window-Border
-Include components/functions/Screen-Menu
-
-# Keyboard bindings {{{2
-Include components/desktop/Keyboard
-#Include components/desktop/Keyboard_NumLock
-#Include components/desktop/Numpad
-
-# Use window thumbnails instead of simple icons on the desktop {{{2
-Include components/desktop/Icon-Thumbnails
-SetEnv ThumbWidth 192
-SetEnv ThumbHeight 192
-
-# Various styles {{{2
-Include components/desktop/FVWM-Crystal_Styles
-Include components/styles/CursorStyle-Border
-
-Style * DecorateTransient, StackTransientParent
-Style * MinOverlapPlacementPenalties 1 0 0 0 0 50
-Style xpad MinOverlapPlacementPenalties 0 0 0 0 0.05 0
-Style * TitleFormat %n, IconTitleFormat %n
-Style * EdgeMoveDelay 250
-Style * EdgeMoveResistance 1 30
-
-# Desktop settings {{{1
-EdgeScroll 100 100
-EdgeResistance 250
-HideGeometryWindow Never
-OpaqueMoveSize 100
-EdgeThickness 1
-
-Style * SnapAttraction 10 SameType Screen
-
-EWMH-Desktop 0 0 0 0
-EWMH-Panel-Top 25
-
-
-## rotations {{{2
-DestroyFunc LandscapeDisplay
-AddToFunc LandscapeDisplay
-+ I Exec xrandr -o normal -s 2800x1050
-+ I Exec ROX-set-horizontal
-+ I Restart
-
-DestroyFunc PortraitDisplay
-AddToFunc PortraitDisplay
-+ I Exec xrandr -o left -s 1400x2100
-+ I Exec ROX-set-vertical
-+ I Restart
-
-AddToFunc StartFunction
-+ I Style mwatch !FixedPosition
-+ I Style gkrellm !FixedPosition
-+ I UpdateStyles
-+ I All (mwatch) Move -0 +25p
-+ I All (gkrellm) Move -0 -0
-+ I Style mwatch FixedPosition
-+ I Style gkrellm FixedPosition
-
-DestroyMenu /Orientation
-AddToMenu /Orientation
-+ 'Landscape' LandscapeDisplay
-+ 'Portrait' PortraitDisplay
-
-## }}}2
-
-# Main menu panel {{{1
-All (FvwmButtons-Panel) Close
-DestroyModuleConfig FvwmButtons-Panel: *
-*FvwmButtons-Panel: Geometry -0+0@g
-*FvwmButtons-Panel: BoxSize smart
-*FvwmButtons-Panel: ActiveColorset $[cs_panel_active]
-*FvwmButtons-Panel: Colorset $[cs_panel_inactive]
-*FvwmButtons-Panel: Rows 1
-*FvwmButtons-Panel: Padding 1 1
-*FvwmButtons-Panel: Frame 0
-
-*FvwmButtons-Panel: (7x1, Size 165 24, Swallow (Close, Respawn, FvwmModule) "FvwmScript-Clock-dakkar")
-
-# Music controls {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/media-skip-forward.png", \
- Action (Mouse 1) Music-Next, \
- Action (Mouse 2) Nop, \
- Action (Mouse 3) Music-Prev, \
- Action (Mouse 4) Music-Forward, \
- Action (Mouse 5) Music-Backward)
-
-# Main music button, with some menus {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/media-playback-start.png", \
-Action (Mouse 1) Menu /Music $[MenuPosition_SW], \
-Action (Mouse 2) Music-GUI, \
-Action (Mouse 3) Music-PlayPause, \
-Action (Mouse 4) Mixer-Volume-Up 10, \
-Action (Mouse 5) Mixer-Volume-Down 10)
-
-# Window list {{{2
-*FvwmButtons-Panel: (1x1, Icon "22x22/fvwm-crystal/window-list.png", \
-Action (Mouse 1) Window-List "$[MenuPosition_SW]", \
-Action (Mouse 2) All (CurrentPage) PlaceAgain anim, \
-Action (Mouse 3) Window-List-Icons "$[MenuPosition_SW]")
-
-# diamond {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/fvwm-crystal.png", \
-Action (Mouse 1) Menu /FVWM-Crystal $[MenuPosition_SW], \
-Action (Mouse 3) Wallpaper-Random $[FVWM_SYSTEMDIR]/wallpapers $[FVWM_USERDIR]/wallpapers ~/wallpapers /usr/local/share/wallpapers /usr/share/wallpapers)
-
-# Main "diamond" menu {{{2
-DestroyMenu /FVWM-Crystal
-AddToMenu /FVWM-Crystal
-+ '%22x22/fvwm-crystal/preferences-desktop-screensaver.png%$[gt.Screensaver]' Popup /Screensaver
-#+ '%22x22/fvwm-crystal/preferences-desktop-theme.png%$[gt.Window decorations]' Popup /Window-Decorations
-+ '%22x22/fvwm-crystal/colorsets.png%$[gt.Colorsets]' Popup /Colorsets
-+ '%22x22/fvwm-crystal/preferences-desktop-wallpaper.png%$[gt.Wallpaper]' Popup /Wallpaper
-+ '%22x22/fvwm-crystal/preferences-desktop.png%$[gt.Preferences]' Popup /Preferences
-+ '%22x22/apps/display.png%$[gt.Screen orientation]' Popup /Orientation
-#+ "" Nop
-#+ '%22x22/fvwm-crystal/applications-development.png%$[gt.Developer menu]' Popup /Developer
-+ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.About FVWM-Crystal]' Include components/functions/About
-+ '%22x22/fvwm-crystal/system-log-out.png%$[gt.Exit]' Popup /Exit
-# }}}2
-
-Module FvwmButtons FvwmButtons-Panel
-Script components/scripts/FvwmScript-Clock-dakkar
-
-# Applications panel and menu generator {{{1
-All (ApplicationPanel) Close
-DestroyModuleConfig ApplicationPanel: *
-*ApplicationPanel: Geometry +0+0@g
-*ApplicationPanel: BoxSize smart
-*ApplicationPanel: ActiveColorset $[cs_panel_active]
-*ApplicationPanel: Colorset $[cs_panel_inactive]
-*ApplicationPanel: Rows 1
-*ApplicationPanel: Padding 1 1
-*ApplicationPanel: Frame 0
-
-# fvwm-crystal.apps {{{2
-
-# This creates the distribution-based panel button - defaut distribution
-# icon, only menu is opened (no default app on the panel)
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --with=/Applications/$[FVWM_DISTROMENUNAME] --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=5 --sort=prio --panel-icons=standard --panel-action1=menu --panel-action2=none --panel-action3=menu --menu-pos=S --menuname-suffix="Panel" --check-execs'
-
-# This creates the main panel with applications - default app icon is
-# shown on the panel, and can be launched using RMB; LMB opens the app
-# category menu
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --without=/Applications/$[FVWM_DISTROMENUNAME] --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=3 --sort=prio --panel-icons=topapp --panel-action3=menu --panel-action2=none --panel-action1=topapp --menu-pos=S --menuname-suffix="Panel" --check-execs'
-
-# This creates the menu with applications available under Alt+Win_R
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=3 --sort=prio --panel-icons=topapp --panel-action3=menu --panel-action2=none --panel-action1=topapp --menu-pos=S --no-panel --check-execs'
-# }}}2
-
-Module FvwmButtons ApplicationPanel
-
-# Pager {{{1
-All (FvwmPager-l) Close
-All (FvwmPager-r) Close
-DestroyModuleConfig FvwmPager-l: *
-DestroyModuleConfig FvwmPager-r: *
-
-SetEnv Desk_Pages_X "5"
-SetEnv Desk_Pages_Y "5"
-
-PipeRead 'echo SetEnv FvwmPager_Width $((24*$[vp.width]/$[vp.height]*$[Desk_Pages_X])); echo SetEnv FvwmPager_Height $((24*$[Desk_Pages_Y]))'
-PipeRead 'echo *FvwmPager-l: Geometry $[FvwmPager_Width]x$[FvwmPager_Height]+$(((($[vp.width]/2)-$[FvwmPager_Width])/2))'
-PipeRead 'echo *FvwmPager-r: Geometry $[FvwmPager_Width]x$[FvwmPager_Height]+$(((3*($[vp.width]/2)-$[FvwmPager_Width])/2))'
-PipeRead 'echo DesktopSize $[Desk_Pages_X]x$[Desk_Pages_Y]'
-
-*FvwmPager-l: MiniIcons
-*FvwmPager-l: Font none
-*FvwmPager-l: WindowBorderWidth 1
-#*FvwmPager-l: Window3DBorders
-*FvwmPager-l: NoSeparators
-*FvwmPager-l: UseSkipList
-*FvwmPager-l: Colorset * $[cs_panel_inactive]
-*FvwmPager-l: HilightColorset * $[cs_panel_active]
-*FvwmPager-l: WindowColorsets $[cs_panel_wininactive] $[cs_panel_winactive]
-
-*FvwmPager-r: MiniIcons
-*FvwmPager-r: Font none
-*FvwmPager-r: WindowBorderWidth 1
-#*FvwmPager-r: Window3DBorders
-*FvwmPager-r: NoSeparators
-*FvwmPager-r: UseSkipList
-*FvwmPager-r: Colorset * $[cs_panel_inactive]
-*FvwmPager-r: HilightColorset * $[cs_panel_active]
-*FvwmPager-r: WindowColorsets $[cs_panel_wininactive] $[cs_panel_winactive]
-
-Module FvwmPager FvwmPager-l
-Module FvwmPager FvwmPager-r
-
-Module FvwmAuto 300 -passid -menterleave \
- "Silent raise_pager" \
- "Silent lower_pager"
-
-DestroyFunc lower_pager
-AddToFunc lower_pager
-+ I WindowId $0 (FvwmPager|mwatch) Layer 0 2
-
-DestroyFunc raise_pager
-AddToFunc raise_pager
-+ I WindowId $0 (FvwmPager|mwatch) Layer 0 7
-
-# Settings for icons on the desktop {{{1
-Style * IconBox 1300x600+0-0@g, IconFill left bottom, IconGrid 30 30
-Style * StickyIcon
-
-# Settings for FvwmIdent {{{1
-*FvwmIdent: Font "xft:Tahoma:pixelsize=12:Bold"
-*FvwmIdent: Colorset $[cs_panel_active]
-
-# Settings for FvwmForm {{{1
-*FvwmFormDefault: Colorset $[cs_panel_inactive]
-*FvwmFormDefault: ItemColorset $[cs_panel_active]
-*FvwmFormDefault: Font "xft:Tahoma:pixelsize=13"
-*FvwmFormDefault: InputFont "xft:Monospace:pixelsize=13"
-*FvwmFormDefault: ButtonFont "xft:Tahoma:pixelsize=13:Bold"
-*FvwmFormDefault: TimeoutFont "xft:Tahoma:pixelsize=13:Bold"
-
-SetEnv NotificationGeom 272
-
-# Settings of stalonetray {{{2
-DestroyFunc NotificationArea-Stalone
-AddToFunc NotificationArea-Stalone
-+ I SetEnv trayer_ic_size "24"
-+ I SetEnv trayer_area_width "$[trayer_width]"
-+ I SetEnv trayer_area_eigth "24"
-+ I SetEnv trayer_x "-$[NotificationGeom]"
-+ I SetEnv trayer_y "+0"
-+ I SetEnv trayer_ic_grav "W"
-+ I SetEnv trayer_vert ""
-
-# Settings of trayer {{{2
-DestroyFunc NotificationArea-Trayer
-AddToFunc NotificationArea-Trayer
-+ I SetEnv trayer_width_t "request"
-+ I SetEnv trayer_heigth_t "pixel"
-+ I SetEnv trayer_edge "top"
-+ I SetEnv trayer_align "right"
-+ I SetEnv trayer_marge "$[NotificationGeom]"
-+ I SetEnv trayer_dist "0"
-+ I SetEnv trayer_width_w ""
-
-Test (EnvMatch NotificationAreaManager stalonetray) NotificationArea-Stalone
-Test (EnvMatch NotificationAreaManager trayer) NotificationArea-Trayer
-Test (!EnvMatch trayer_width 0) TrayerPanel
-
-#AddToFunc ExitFunction I Exec exec killall ivman
-#AddToFunc StartFunction I Exec exec ivman
-
-# notification support
-Include components/functions/Notify
-
-# ViM modeline {{{1
-# vim:foldmethod=marker:foldenable:foldlevel=0
diff --git a/recipes/TopLine-single b/recipes/TopLine-single
deleted file mode 100644
index 684c0c8..0000000
--- a/recipes/TopLine-single
+++ /dev/null
@@ -1,245 +0,0 @@
-# TopLine desktop (former "1.1"
-# Written by: Maciej Delmanowski <harnir@post.pl>
-#
-# You can use folding to navigate this file
-
-# ImagePath {{{1
-SetEnv Icon_Theme "Default"
-ImagePath /usr/share/icons/crystalsvg:$[FVWM_USERDIR]/icons/$[Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]
-
-# Includes and FVWM modules {{{1
-Module FvwmCommandS
-
-# Default FVWM-Crystal functions, initialization {{{2
-Include components/desktop/FVWM-Crystal_Functions
-Include components/functions/Clear-FVWM-Settings
-Include components/desktop/FVWM-Crystal_Preferences
-Include components/desktop/dakkar_Preferences
-Append preferences/Startup
-
-# Preferred applications {{{2
-#Include components/functions/Screenshot-import
-Include components/apps/XScreenSaver
-Include components/apps/FvwmMiniConsole
-Include components/apps/QuakeConsole
-Include components/functions/NotificationAreaManager-$[NotificationAreaManager]
-Include preferences/NotificationArea-Width
-Include components/functions/Music-$[MusicPlayer]
-
-# Desktop & window bindings {{{2
-Include components/bindings/Desktop-RMB-OpenTerminal
-Include components/bindings/Desktop-MMB-TogglePanels
-Include components/bindings/Desktop-dakkar
-Include components/bindings/Window-Basic
-Include components/bindings/Window-Border
-Include components/functions/Screen-Menu
-
-# Keyboard bindings {{{2
-Include components/desktop/Keyboard
-#Include components/desktop/Keyboard_NumLock
-#Include components/desktop/Numpad
-
-# Use window thumbnails instead of simple icons on the desktop {{{2
-Include components/desktop/Icon-Thumbnails
-
-# Various styles {{{2
-Include components/desktop/FVWM-Crystal_Styles
-Include components/styles/CursorStyle-Border
-
-Style * DecorateTransient, StackTransientParent
-Style * MinOverlapPlacementPenalties 1 0 0 0 0 50
-Style xpad MinOverlapPlacementPenalties 0 0 0 0 0.05 0
-Style * TitleFormat %n, IconTitleFormat %n
-Style * EdgeMoveDelay 250
-Style * EdgeMoveResistance 1 30
-
-# Desktop settings {{{1
-EdgeScroll 100 100
-EdgeResistance 250
-HideGeometryWindow Never
-OpaqueMoveSize 100
-EdgeThickness 1
-
-Style * SnapAttraction 10 SameType Screen
-
-EWMH-Desktop 0 0 0 0
-EWMH-Panel-Top 25
-
-AddToFunc StartFunction
-+ I Style mwatch !FixedPosition
-+ I Style gkrellm !FixedPosition
-+ I UpdateStyles
-+ I All (mwatch) Move -0 +25p
-+ I All (gkrellm) Move -0 -0
-+ I Style mwatch FixedPosition
-+ I Style gkrellm FixedPosition
-
-# Main menu panel {{{1
-All (FvwmButtons-Panel) Close
-DestroyModuleConfig FvwmButtons-Panel: *
-*FvwmButtons-Panel: Geometry -0+0
-*FvwmButtons-Panel: BoxSize smart
-*FvwmButtons-Panel: ActiveColorset $[cs_panel_active]
-*FvwmButtons-Panel: Colorset $[cs_panel_inactive]
-*FvwmButtons-Panel: Rows 1
-*FvwmButtons-Panel: Padding 1 1
-*FvwmButtons-Panel: Frame 0
-
-*FvwmButtons-Panel: (7x1, Size 165 24, Swallow (Close, Respawn, FvwmModule) "FvwmScript-Clock-dakkar")
-
-# Music controls {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/media-skip-forward.png", \
- Action (Mouse 1) Music-Next, \
- Action (Mouse 2) Nop, \
- Action (Mouse 3) Music-Prev, \
- Action (Mouse 4) Music-Forward, \
- Action (Mouse 5) Music-Backward)
-
-# Main music button, with some menus {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/media-playback-start.png", \
-Action (Mouse 1) Menu /Music $[MenuPosition_SW], \
-Action (Mouse 2) Music-GUI, \
-Action (Mouse 3) Music-PlayPause, \
-Action (Mouse 4) Mixer-Volume-Up 10, \
-Action (Mouse 5) Mixer-Volume-Down 10)
-
-# Window list {{{2
-*FvwmButtons-Panel: (1x1, Icon "22x22/fvwm-crystal/window-list.png", \
-Action (Mouse 1) Window-List "$[MenuPosition_SW]", \
-Action (Mouse 2) All (CurrentPage) PlaceAgain anim, \
-Action (Mouse 3) Window-List-Icons "$[MenuPosition_SW]")
-
-# diamond {{{2
-*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/fvwm-crystal.png", \
-Action (Mouse 1) Menu /FVWM-Crystal $[MenuPosition_SW], \
-Action (Mouse 3) Wallpaper-Random $[FVWM_SYSTEMDIR]/wallpapers $[FVWM_USERDIR]/wallpapers ~/wallpapers /usr/local/share/wallpapers /usr/share/wallpapers)
-
-# Main "diamond" menu {{{2
-DestroyMenu /FVWM-Crystal
-AddToMenu /FVWM-Crystal
-+ '%22x22/fvwm-crystal/preferences-desktop-screensaver.png%$[gt.Screensaver]' Popup /Screensaver
-#+ '%22x22/fvwm-crystal/preferences-desktop-theme.png%$[gt.Window decorations]' Popup /Window-Decorations
-+ '%22x22/fvwm-crystal/colorsets.png%$[gt.Colorsets]' Popup /Colorsets
-+ '%22x22/fvwm-crystal/preferences-desktop-wallpaper.png%$[gt.Wallpaper]' Popup /Wallpaper
-+ '%22x22/fvwm-crystal/preferences-desktop.png%$[gt.Preferences]' Popup /Preferences
-#+ "" Nop
-#+ '%22x22/fvwm-crystal/applications-development.png%$[gt.Developer menu]' Popup /Developer
-+ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.About FVWM-Crystal]' Include components/functions/About
-+ '%22x22/fvwm-crystal/system-log-out.png%$[gt.Exit]' Popup /Exit
-# }}}2
-
-Module FvwmButtons FvwmButtons-Panel
-Script components/scripts/FvwmScript-Clock-dakkar
-
-# Applications panel and menu generator {{{1
-All (ApplicationPanel) Close
-DestroyModuleConfig ApplicationPanel: *
-*ApplicationPanel: Geometry +0+0
-*ApplicationPanel: BoxSize smart
-*ApplicationPanel: ActiveColorset $[cs_panel_active]
-*ApplicationPanel: Colorset $[cs_panel_inactive]
-*ApplicationPanel: Rows 1
-*ApplicationPanel: Padding 1 1
-*ApplicationPanel: Frame 0
-
-# fvwm-crystal.apps {{{2
-
-# This creates the distribution-based panel button - defaut distribution
-# icon, only menu is opened (no default app on the panel)
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --with=/Applications/$[FVWM_DISTROMENUNAME] --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=5 --sort=prio --panel-icons=standard --panel-action1=menu --panel-action2=none --panel-action3=menu --menu-pos=S --menuname-suffix="Panel" --check-execs'
-
-# This creates the main panel with applications - default app icon is
-# shown on the panel, and can be launched using RMB; LMB opens the app
-# category menu
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --without=/Applications/$[FVWM_DISTROMENUNAME] --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=3 --sort=prio --panel-icons=topapp --panel-action3=menu --panel-action2=none --panel-action1=topapp --menu-pos=S --menuname-suffix="Panel" --check-execs'
-
-# This creates the menu with applications available under Alt+Win_R
-PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --search-icons-in=$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]/22x22/apps:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/categories:$[FVWM_DISTROMENUDIR]/icons/$[Icon_Theme]/22x22/apps --default-file-icon=22x22/apps/default.png --default-dir-icon=22x22/categories/directory.png --min-submenu-length=3 --sort=prio --panel-icons=topapp --panel-action3=menu --panel-action2=none --panel-action1=topapp --menu-pos=S --no-panel --check-execs'
-# }}}2
-
-Module FvwmButtons ApplicationPanel
-
-# Pager {{{1
-All (FvwmPager) Close
-DestroyModuleConfig FvwmPager: *
-
-SetEnv Desk_Pages_X "5"
-SetEnv Desk_Pages_Y "5"
-
-PipeRead 'echo SetEnv FvwmPager_Width $((24*$[vp.width]/$[vp.height]*$[Desk_Pages_X])); echo SetEnv FvwmPager_Height $((24*$[Desk_Pages_Y]))'
-PipeRead 'echo *FvwmPager: Geometry $[FvwmPager_Width]x$[FvwmPager_Height]+$((($[vp.width]-$[FvwmPager_Width])/2))'
-PipeRead 'echo DesktopSize $[Desk_Pages_X]x$[Desk_Pages_Y]'
-
-*FvwmPager: MiniIcons
-*FvwmPager: Font none
-*FvwmPager: WindowBorderWidth 1
-#*FvwmPager: Window3DBorders
-*FvwmPager: NoSeparators
-*FvwmPager: UseSkipList
-*FvwmPager: Colorset * $[cs_panel_inactive]
-*FvwmPager: HilightColorset * $[cs_panel_active]
-*FvwmPager: WindowColorsets $[cs_panel_wininactive] $[cs_panel_winactive]
-
-Module FvwmPager
-
-Module FvwmAuto 300 -passid -menterleave \
- "Silent raise_pager" \
- "Silent lower_pager"
-
-DestroyFunc lower_pager
-AddToFunc lower_pager
-+ I WindowId $0 (FvwmPager|mwatch) Layer 0 2
-
-DestroyFunc raise_pager
-AddToFunc raise_pager
-+ I WindowId $0 (FvwmPager|mwatch) Layer 0 7
-
-# Settings for icons on the desktop {{{1
-Style * IconBox 1000x600+0-0, IconFill left bottom, IconGrid 30 30
-Style * StickyIcon
-
-# Settings for FvwmIdent {{{1
-*FvwmIdent: Font "xft:Tahoma:pixelsize=12:Bold"
-*FvwmIdent: Colorset $[cs_panel_active]
-
-# Settings for FvwmForm {{{1
-*FvwmFormDefault: Colorset $[cs_panel_inactive]
-*FvwmFormDefault: ItemColorset $[cs_panel_active]
-*FvwmFormDefault: Font "xft:Tahoma:pixelsize=13"
-*FvwmFormDefault: InputFont "xft:Monospace:pixelsize=13"
-*FvwmFormDefault: ButtonFont "xft:Tahoma:pixelsize=13:Bold"
-*FvwmFormDefault: TimeoutFont "xft:Tahoma:pixelsize=13:Bold"
-
-SetEnv NotificationGeom 272
-
-# Settings of stalonetray {{{2
-DestroyFunc NotificationArea-Stalone
-AddToFunc NotificationArea-Stalone
-+ I SetEnv trayer_ic_size "24"
-+ I SetEnv trayer_area_width "$[trayer_width]"
-+ I SetEnv trayer_area_eigth "24"
-+ I SetEnv trayer_x "-$[NotificationGeom]"
-+ I SetEnv trayer_y "0"
-+ I SetEnv trayer_ic_grav "W"
-+ I SetEnv trayer_vert ""
-
-# Settings of trayer {{{2
-DestroyFunc NotificationArea-Trayer
-AddToFunc NotificationArea-Trayer
-+ I SetEnv trayer_width_t "request"
-+ I SetEnv trayer_heigth_t "pixel"
-+ I SetEnv trayer_edge "top"
-+ I SetEnv trayer_align "right"
-+ I SetEnv trayer_marge "$[NotificationGeom]"
-+ I SetEnv trayer_dist "0"
-+ I SetEnv trayer_width_w ""
-
-Test (EnvMatch NotificationAreaManager stalonetray) NotificationArea-Stalone
-Test (EnvMatch NotificationAreaManager trayer) NotificationArea-Trayer
-Test (!EnvMatch trayer_width 0) TrayerPanel
-
-# notification support
-Include components/functions/Notify
-
-# ViM modeline {{{1
-# vim:foldmethod=marker:foldenable:foldlevel=0
diff --git a/wallpapers/drappo-wide.png b/wallpapers/drappo-wide.png
deleted file mode 120000
index 350630b..0000000
--- a/wallpapers/drappo-wide.png
+++ /dev/null
@@ -1 +0,0 @@
-/home/dakkar/pics/nausicaa/drappo-wide.png \ No newline at end of file
diff --git a/xinitrc b/xinitrc
index 3014f0d..45b203b 100755
--- a/xinitrc
+++ b/xinitrc
@@ -3,12 +3,13 @@ cd
export LC_ALL=en_US.UTF-8
xgamma -rgamma 0.825 -ggamma 0.85 -bgamma 0.95
xsetroot -solid black
-./bin/nv-control-dpy --add-metamode 'DFP-0: 1400x1050 @1400x1050 +0+1050, DFP-1: 1400x1050 @1400x1050 +0+0'
export GTK_IM_MODULE="xim"
xrdb -load .Xdefaults
xset dpms 1800 3600 3600
+#uim-xim --engine=anthy &
gkrellm &
~/bin/mwatch &
+xpad &
+start-pulseaudio-x11
-exec dbus-launch fvwm-crystal
-
+exec dbus-launch --exit-with-session fvwm-crystal