diff --git a/Makefile b/Makefile
index 658cb482d..6690bad25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERS=5.5
-DATE=2013-09-22
+DATE=2013-09-29
 
 RELATIVE_PATH=YES
 BINDIR=/opt/fhem
@@ -100,7 +100,7 @@ dist:
 		xargs perl -pi -e 's/=VERS=/$(VERS)/g;s/=DATE=/$(DATE)/g'
 	rm -rf .f/www/SVGcache
 	mv .f $(DESTDIR)
-	tar cf - $(DESTDIR) | gzip > $(DESTDIR).tar.gz
+	tar cf - $(DESTDIR) | gzip -9 > $(DESTDIR).tar.gz
 	rm -rf $(DESTDIR)
 
 dist-clean:
diff --git a/demolog/eventTypes.txt b/demolog/eventTypes.txt
index 05f37bcfb..d03f3459d 100644
--- a/demolog/eventTypes.txt
+++ b/demolog/eventTypes.txt
@@ -83,7 +83,7 @@
 1 global DELETED SVG_Log.Dewpoint_1
 1 global DELETED alarmToggler
 741 global DELETED minuteTimer
-29 global INITIALIZED
+31 global INITIALIZED
 1 global RENAMED Lamp1 Outdoor
 1 global RENAMED Lamp2 Office
 1 global RENAMED Lamp3 Livingroom
@@ -98,7 +98,7 @@
 1 global RENAMED Sens.Out Garden
 1 global RENAMED outdoorNotify outdoorNotifier
 42 global SAVE
-29 global SHUTDOWN
+31 global SHUTDOWN
 15 lcCinema scene AllOff
 19 lcCinema scene Break
 16 lcCinema scene Cinema
diff --git a/demolog/fhem.save b/demolog/fhem.save
index 2e6ee935d..60acca981 100644
--- a/demolog/fhem.save
+++ b/demolog/fhem.save
@@ -1,4 +1,4 @@
-#Mon Aug 26 18:01:39 2013
+#Thu Sep 26 12:28:55 2013
 setstate Alarm on
 setstate Alarm 2013-08-23 07:42:48 state on
 setstate AllLights on
@@ -57,8 +57,7 @@ setstate autocreate active
 setstate dew_all active
 setstate et active
 setstate global <no definition>
-setstate lcCinema WatchTV
 setstate outdoorNotifier active
-setstate sunRise Next: 05:55:41
-setstate sunSet Next: 20:59:15
+setstate sunRise Next: 06:44:33
+setstate sunSet Next: 19:49:35
 setstate wlCinema initialized
diff --git a/docs/fhem.html b/docs/fhem.html
index ab6e29715..dc4f67fc5 100644
--- a/docs/fhem.html
+++ b/docs/fhem.html
@@ -33,7 +33,7 @@
         <tr><td></td></tr>
         <tr><td><a href="#Features">Features</a></td></tr>
         <tr><td></td></tr>
-        <tr><td><a href="#Hardware">Hardware</a></td></tr>
+        <tr><td><a href="#Protocols">Protocols</a></td></tr>
         <tr><td></td></tr>
         <tr><td><a href="#Documentation">Documentation</a></td></tr>
         <tr><td></td></tr>
@@ -62,7 +62,7 @@
       The program runs as a server, you can control it via web or smartphone
       frontends, telnet or TCP/IP directly.<br><br>
 
-      In order to use fhem you'll need a 24/7 server (Fritz!Box, NAS, RPi, PC,
+      In order to use FHEM you'll need a 24/7 server (Fritz!Box, NAS, RPi, PC,
       MacMini, etc) with a perl interpreter and some attached hardware like the
       CUL, FHZ1300PC, etc. to access the actors and sensors. See the "Supported
       hardware" section below.</ul>
@@ -98,57 +98,60 @@
     <h3>Frontend screenshots</h3>
     <ul>
 
-      Builtin (default) pgm2 / external pgm5 web frontend:
-      <a href="pgm2-1.png">overview</a>,
-      the same rendered for <a href="pgm2-4.png">smartphones</a>,
-      <a href="pgm2-2.png">detail</a>,
-      <a href="pgm2-3.png">SVG-plots</a>,
-      <a href="pgm2-5.png">dark style</a>.
+      <li>Builtin web frontend: overview on the
+        <a href="pgm2-1.png">desktop</a> or on the
+        <a href="pgm2-3.png">smartphone</a>,
+        <a href="pgm2-2.png">SVG-plots</a>.</li>
         <div class="dist"></div>
 
-      The FHEM FLOORPLAN module: 
+      <li>The FHEM FLOORPLAN module: 
         <a href="tirreG.jpg">Example1</a>,
-        <a href="Benji.png">Example2</a>.
+        <a href="Benji.png">Example2</a>.</li>
         <div class="dist"></div>
 
-      Charting frontend <a href="http://www.fhemwiki.de/wiki/Neues_Charting_Frontend">in fhemwiki</a>.
-        <div class="dist"></div>
-      YAF (Yet another frontend), see the introduction in the <a
-      href="http://forum.fhem.de/index.php?t=rview&th=12629">forum
-      duscussion</a>.
+      <li>Charting frontend
+        <a href="http://www.fhemwiki.de/wiki/Neues_Charting_Frontend">in
+        fhemwiki</a>.</li>
         <div class="dist"></div>
 
-
-      pgm3 web frontend: <a
-      href="http://www.martin-haas.de/fhz/screenshots.html">screenshot
-      gallery</a>
+      <li>YAF (Yet another frontend), see the introduction in the <a
+        href="http://forum.fhem.de/index.php?t=rview&th=12629">forum
+        duscussion</a>.</li>
         <div class="dist"></div>
 
-      myHCE: <a
-      href="http://www.fischer-net.de/hausautomation/myhce/screenshots.html">
-      screenshot gallery</a>
+      <li>pgm3 web frontend:
+        <a href="http://www.martin-haas.de/fhz/screenshots.html">screenshot
+        gallery</a></li>
         <div class="dist"></div>
 
-      fheME: <a href="http://www.phynx.de/?p=108"> screenshot gallery</a>
+      <li>myHCE:
+        <a href="http://www.fischer-net.de/hausautomation/myhce/screenshots.html">
+        screenshot gallery</a></li>
         <div class="dist"></div>
 
-      HomeMini: <a
-      href="http://heimserver.nendzig.net/wiki/index.php/HomeMini">
-      screenshot & download</a>
+      <li>fheME: <a href="http://www.phynx.de/?p=108"> screenshot gallery</a>
+        </li>
         <div class="dist"></div>
 
-      iPhone frontends: 
-      <a href="itms://itunes.apple.com/us/app/fhemobile/id389951065?mt=8">Fhemobile</a> (native app),
-      <a href="http://www.dhs-computertechnik.de/support-iphone.html">
-      dhs-computertechnik</a> or
-      <a href="http://code.google.com/p/phyfhem/">phyfhem</a>
+      <li>HomeMini: <a
+        href="http://heimserver.nendzig.net/wiki/index.php/HomeMini">
+        screenshot & download</a></li>
         <div class="dist"></div>
-      
-      Android frontends:
-      <a href="http://andFHEM.klass.li">andFHEM</a> (native app),
-      <a href="http://forum.fhem.de/index.php?t=msg&th=10628&start=0&rid=8">Fullscreen Browser App</a>,
-      <a href="http://forum.fhem.de/index.php?t=rview&th=12624">ORCA addition</a>,
-      <a href="http://www.homegroup.de/index.php/android/notify-app">notify-app</a>
+
+      <li>iPhone frontends: 
+        <a href="itms://itunes.apple.com/us/app/fhemobile/id389951065?mt=8">Fhemobile</a> (native app),
+        <a href="http://www.dhs-computertechnik.de/support-iphone.html">
+        dhs-computertechnik</a> or
+        <a href="http://code.google.com/p/phyfhem/">phyfhem</a></li>
+        <div class="dist"></div>
+
+      <li>Android frontends:
+        <a href="http://andFHEM.klass.li">andFHEM</a> (native app),
+        <a href="http://forum.fhem.de/index.php?t=msg&th=10628&start=0&rid=8">
+          Fullscreen Browser App</a>,
+        <a href="http://forum.fhem.de/index.php?t=rview&th=12624">ORCA addition</a>,
+        <a href="http://www.homegroup.de/index.php/android/notify-app">notify-app</a>
+        </li>
         <div class="dist"></div>
     </ul>
 
@@ -156,16 +159,15 @@
     <a name="Features"></a>
     <h3>Features</h3>
     <ul>
-      <li>support for a lot of protocols used in house automation like FS20,
-          HomeMatic, OneWire, X10, ZWave, EnOcean, KNX. See the <a
-          href="#Hardware">Hardware</a> section for more.
+      <li>support for a lot of protocols used in house automation, audio/video
+          devices, weather services, online calendars and more.
           </li>
           <div class="dist"></div>
       <li>autocreating devices/logs when receiving data from a new device:
-          start fhem and watch how the plots of your sensors are appearing
+          start FHEM and watch how the plots of your sensors are appearing
           automatically.</li>
           <div class="dist"></div>
-      <li>logging events to files or databases, with regexp filters</li>
+      <li>logging events to files or a database, with regexp filters</li>
           <div class="dist"></div>
       <li>notifying external programs or scripts when receiving certain
           events</li>
@@ -173,93 +175,36 @@
       <li>timed commands (e.g. switching a lamp on from sunset till midnight)
           </li>
           <div class="dist"></div>
-      <li>watchdog (e.g. trigger if the HMS100-FIT is inactive for HH:MM:SS)
-          </li>
-          <div class="dist"></div>
       <li>lot of interfaces: simple text, JSON, XML, each of them over plain
           TCP/IP, SSL or HTTP.
           <div class="dist"></div>
-      <li>modular architecture, easy to add your special device</li>
+      <li>modular architecture with currently over 150 modules, easy to add
+          your special device</li>
           <div class="dist"></div>
       <li>lot of frontends, choose your favorite</li>
           <div class="dist"></div>
     </ul>
 
-    <a name="Hardware"></a>
-    <h3>Supported hardware</h3>
+    <a name="Protocols"></a>
+    <h3>Supported protocols</h3>
     <ul>
-      <li>Via an attached CUL or CUN (see <a
-        href="http://www.busware.de">www.busware.de</a>) access to the
-        following protocols: FS20, EM (EM1000EM, EM1000GZ and
-        EM1000WZ), FHT80b, HMS, S300 (KS300, S300TH, KS555, S555TH, etc),
-        HomeMatic, La Crosse TX2/TX3, MAX!</li>
-        <div class="dist"></div>
-
-      <li>Via an attached FHZ1000 or FHZ1300 access to the following protocols:
-        FS20 (all devices), FHT80b, HMS, KS300. <b>Note:</b> For the WLAN
-        version of the FHZ1300 see this <a
-        href="http://www.thinkwiki.org/wiki/User:Akw/FHZ">
-        link</a>.
-        </li>
-        <div class="dist"></div>
-
-      <li>reading and sending X10 events via the CM11 module (with access
-        to a X10 computer interface)</li>
-        <div class="dist"></div>
-
-      <li>Some TV models from Samsung/Panasonic/LG and amplifier (YAMAHA)</li>
-        <div class="dist"></div>
-
-      <li>More than one way to receive 1Wire sensor data or to switch 1wire actors.
-        <div class="dist"></div>
-
-      <li>Allnet 3076, Temperatures sensors and Allnet 4027
-        relay box connected to an Allnet 4000</li>
-        <div class="dist"></div>
-
-      <li>Davis VantagePro2 weatherstation</li>
-        <div class="dist"></div>
-
-      <li>Via the RFXCOM RFXtrx433 transceiver (433 Mhz) support for various
-         protocols (ANSLUT, ByeByeStandBy, Chacon EMW200, COCO, DomiaLite, Duewi,
-         ELRO AB400/AB600, HomeEasy EU, HomeEasy UK, IMPULS, Intertechno, KD101,
-         KlikAanKlikUit (KAKU), NEXA, Oregon Scientific, X10 security and
-         lighting, Visonic, Waveman, X10).</li>
-        <div class="dist"></div>
-
-      <li>Via the old RFXCOM USB or LAN based 433 Mhz RF receivers 
-         (order code 80002 and others) the following devices: 
-         Oregon Scientific weather sensors, RFXCOM RFXMeter, 
-         X10 security and X10 lighting devices.</li>
-        <div class="dist"></div>
-
-      <li>Via the ELV USB-WDE1 access to ELV sensors KS200/KS300, S300IA,
-          S300TH, ASH2200, PS 50 and Conrad sensors KS555, S555TH and
-          ASH555.</li>
-        <div class="dist"></div>
-
-      <li>Via an eQ-3 HomeMatic Lan Configurator (or HM-CFG-USB + <a
-      href="https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb">hmland</a>)
-      access to selected HomeMatic devices.
-
-        <div class="dist"></div>
-
-      <li>Via the eibd or a TUL (see <a
-          href="http://www.busware.de">www.busware.de</a>) access to the EIB/KNX
-          protocol.
-        <div class="dist"></div>
-
-      <li>Via a TCM120 (e.g. the BSC BOR) or a TCM310 (e.g. busware EUL) access
-      to the EnOcean protocol.
-        <div class="dist"></div>
-
-      <li>Via a ZWave USB Dongle (e.g. the Goodway WD6001) access to the ZWave protocol.
-        <div class="dist"></div>
-
+      <li>eQ3 specific: FS20, HomeMatic, MAX!, EM1000, FHT80b, HMS, S300,
+          ESA2000</li>
+          <div class="dist"></div>
+      <li>KNX, ZWave, EnOcean, X10, FRITZ!Dect, Intertechno, HomeEasy,
+          Philipps HUE</li>
+          <div class="dist"></div>
+      <li>1Wire, Firmata, webio, panStamp, LIRC, JeeLink, RFXCOM, TellStick</li>
+          <div class="dist"></div>
+      <li>Davis VantagePro2, Oregon Scientific, Allnet</li>
+          <div class="dist"></div>
+      <li>TVs from Samsung/Panasonic/LG, devices from Sonos, amplifier from
+          YAMAHA</li>
+          <div class="dist"></div>
       <br>
 
-      A complete list with a detailed description can be found in the <a
-      href="commandref.html">commandref</a> document.
+      A complete list of all FHEM-modules with a detailed description can be
+      found in the <a href="commandref.html">commandref</a> document.
 
 
     </ul>
@@ -294,7 +239,7 @@
 
       <div class="dist"><a href="README.contrib">contrib/README</a> describes
       some loosely coupled useful modules / scripts which can be used with
-      fhem.</div>
+      FHEM.</div>
         <div class="dist"></div>
 
     </ul>
@@ -321,6 +266,7 @@
         <li>Instructions for the Allnet all6250:
           <a href="http://wiki.dungeon.de/all6250_opennas_mit_fhem">
           http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li>
+        <li>Raspberry PI with <a href="http://www.enocean.com/fileadmin/redaktion/pdf/white_paper/wp_Raspberry_talks_EnOcean.pdf">EnOcean</a></li>
         <li>Linux driver installation:
           <a href="linux.html">linux.html</a></li>
         <li>Misc USB problems:
@@ -360,21 +306,21 @@
     <ul>
     <h4>Fritz!Box</h4>
     <ul>
-      <li>On the FB7390 install <a
-          href="http://fhem.de/fhem-=VERS=-fb7390.image">this</a> image. Note: it
-          is needed <i>additionally</i> to the OS image from AVM.<br>
+      <li>On the FB7390 or FB7490 install <a
+        href="http://fhem.de/fhem-=VERS=-fb7390.image">this</a> image. Note: it
+        is needed <i>additionally</i> to the OS image from AVM.<br>
       <li>On the FB7270 unpack <a
-          href="http://fhem.de/fhem-=VERS=-fb7270.zip">this</a> zip file to a USB-Disk,
-          attach the disk to the FritzBox, log in, and start fhem from there.
+        href="http://fhem.de/fhem-=VERS=-fb7270.zip">this</a> zip file to a USB-Disk,
+        attach the disk to the FritzBox, log in, and start FHEM from there.
       <li>See also the detailed documentation <a href="fritzbox.html">here</a>.
      </ul>
 
     <h4>Debian/Ubuntu</h4>
     <ul>
       <li>Install <a href="http://fhem.de/fhem-=VERS=.deb">this</a> package.
-      <b>Note:</b> For upgrading it is necessary to purge the old package (dpkg
-      -P fhem), as the directory structure has changed to be the same as with
-      .tar.gz or fritzbox.
+      <b>Note:</b> For upgrading from 5.2 or earlier it is necessary to purge
+      the old package (dpkg -P fhem), as the directory structure has changed to
+      be the same as with .tar.gz or fritzbox.
     </ul>
 
     <h4>Unix / OSX</h4>
@@ -385,25 +331,20 @@
           </li>
       <li>Download the <a href="http://fhem.de/fhem-=VERS=.tar.gz">
           .tar.gz</a> package, unpack it, and change to the unpacked directory.
-      <li>start fhem directly from this directory (perl fhem.pl fhem.cfg).
+      <li>start FHEM directly from this directory (perl fhem.pl fhem.cfg).
     </ul>
 
     <h4>Windows</h4>
     <ul>
-      <b>Note:</b>If you are using cygwin for your perl installation you can
-      follow the guidelines for Unix.<br><br>
-
-      <li>Be sure you have perl.exe in your path (%PATH%), and the module
-          Win32::SerialPort is installed.</li>
-      <li>Make sure that you can access your device (CUL/FHZ/etc) via virtual
-          COM-Port or via socket (e.g. <code>COMX or xport:10001</code>).</li>
-      <li>Download the <a href="http://fhem.de/fhem-=VERS=.tar.gz">
-          .tar.gz</a> package, unpack it, and change to the unpacked directory.
-      <li>Start the server with <code>perl fhem.pl fhem.cfg</code></li>
+      <li>See the <a href="HOWTO_Windows.html">HOWTO_Windows.html</a> for a
+      detailed description.</li>
+      <li>If you are using cygwin for your perl installation you can
+      follow the guidelines for Unix.</li>
     </ul>
-
     <br><br>
-    After installation follow the <a href="HOWTO.html">HOWTO</a> for adding devices.
+
+    After the installation follow the <a href="HOWTO.html">HOWTO</a> for adding
+    devices.
     </ul>
 
     <a name="License"></a>
@@ -416,7 +357,7 @@
         instead)</li>
         <li>Martin Haas (webfrontends/pgm3)</li>
         <li>Olaf Droegehorn (webfrontends/pgm5)</li>
-        <li><a href="MAINTAINER.txt">Numerous other people with their fhem modules</a></li>
+        <li><a href="MAINTAINER.txt">Numerous other people with their FHEM modules</a></li>
       </ul>
       License: GPL (v2)<br>
       Thanks to TOSTi for inspiration and numerous other people for help. <br>
diff --git a/docs/fhem_DE.html b/docs/fhem_DE.html
index f668a73c6..841178a62 100644
--- a/docs/fhem_DE.html
+++ b/docs/fhem_DE.html
@@ -32,7 +32,7 @@
         <tr><td></td></tr>
         <tr><td><a href="#Features">Features</a></td></tr>
         <tr><td></td></tr>
-        <tr><td><a href="#Hardware">Hardware</a></td></tr>
+        <tr><td><a href="#Protocols">Protokolle</a></td></tr>
         <tr><td></td></tr>
         <tr><td><a href="#Documentation">Dokumentation</a></td></tr>
         <tr><td></td></tr>
@@ -66,10 +66,11 @@
       XML existieren ebenfalls.
       <br><br>
 
-      Um es zu verwenden ben&ouml;tigt man einen 24/7 Rechner (Fritz!Box, NAS, RPi,
-      PC, MacMini, etc) mit einem perl Interpreter und angeschlossene
-      Hardware-Komponenten wie CUL, FHZ1300PC, etc. f&uuml;r einen Zugang zu den
-      Aktoren und Sensoren. Siehe den Hardware Abschnitt f&uuml;r mehr.
+      Um es zu verwenden ben&ouml;tigt man einen 24/7 Rechner (Fritz!Box, NAS,
+      RPi, PC, MacMini, etc) mit einem perl Interpreter und angeschlossene
+      Hardware-Komponenten wie CUL, FHZ1300PC, etc. f&uuml;r einen Zugang zu
+      den Aktoren und Sensoren. Siehe den Hardware Abschnitt f&uuml;r mehr.
+
     </ul>
 
     <a name="Download"></a>
@@ -100,59 +101,60 @@
     <a name="Screenshots"></a>
     <h3>Frontend Screenshots</h3>
     <ul>
-
-      Das eingebaute (default) pgm2 web frontend:
-      <a href="pgm2-1.png">&Uuml;bersicht</a>,
-      das gleiche f&uuml;r <a href="pgm2-4.png">Smartphones</a>,
-      <a href="pgm2-2.png">Detail-Ansicht</a>,
-      <a href="pgm2-3.png">SVG-plots</a>,
-      <a href="pgm2-5.png">Dark-style</a>.
+      <li>Das eingebaute web frontend:
+        &Uuml;bersicht auf dem 
+        <a href="pgm2-1.png">Desktop</a> bzw.
+        <a href="pgm2-3.png">Smartphones</a>,
+        <a href="pgm2-2.png">SVG-plots</a>.</li>
         <div class="dist"></div>
 
-      Das FHEM FLOORPLAN Modul: 
+      <li>Das FHEM FLOORPLAN Modul: 
         <a href="tirreG.jpg">Beispiel1</a>,
-        <a href="Benji.png">Beispiel2</a>.
+        <a href="Benji.png">Beispiel2</a>.</li>
         <div class="dist"></div>
 
-      Charting frontend <a href="http://www.fhemwiki.de/wiki/Neues_Charting_Frontend">in fhemwiki</a>.
-        <div class="dist"></div>
-      YAF (Yet another frontend), see the introduction in the <a
-      href="http://forum.fhem.de/index.php?t=rview&th=12629">forum
-      duscussion</a>.
+      <li>Charting frontend
+          <a href="http://www.fhemwiki.de/wiki/Neues_Charting_Frontend">in
+          fhemwiki</a>.</li>
         <div class="dist"></div>
 
-      pgm3 Web Frontend: <a
-      href="http://www.martin-haas.de/fhz/screenshots.html">Screenshot
-      Gallerie</a>
+      <li>YAF (Yet another frontend), siehe die Anleitung in der<a
+        href="http://forum.fhem.de/index.php?t=rview&th=12629">
+        Forum-Diskussion</a>.</li>
         <div class="dist"></div>
 
-      myHCE: <a
-      href="http://www.fischer-net.de/hausautomation/myhce/screenshots.html">
-      Screenshot Gallerie</a>
+      <li>pgm3 Web Frontend: <a
+        href="http://www.martin-haas.de/fhz/screenshots.html">
+        Bilder-Galerie</a></li>
         <div class="dist"></div>
 
-      fheME: <a href="http://www.phynx.de/?p=108"> Screenshot Gallerie</a>
+      <li>myHCE: <a
+        href="http://www.fischer-net.de/hausautomation/myhce/screenshots.html">
+        Bilder-Galerie</a></li>
         <div class="dist"></div>
 
-      HomeMini: <a
+      <li>fheME: <a href="http://www.phynx.de/?p=108">Bilder-Galerie</a></li>
+        <div class="dist"></div>
+
+      <li>HomeMini: <a
       href="http://heimserver.nendzig.net/wiki/index.php/HomeMini">
-      Screenshot & Download</a>
+      Screenshot & Download</a></li>
         <div class="dist"></div>
 
-      iPhone Frontends: 
+      <li>iPhone Frontends: 
       <a
       href="itms://itunes.apple.com/us/app/fhemobile/id389951065?mt=8">Fhemobile</a>
       (natives App),
       <a href="http://www.dhs-computertechnik.de/support-iphone.html">
       dhs-computertechnik</a> und
-      <a href="http://code.google.com/p/phyfhem/">phyfhem</a>
+      <a href="http://code.google.com/p/phyfhem/">phyfhem</a></li>
         <div class="dist"></div>
       
-      Android Frontends:
+      <li>Android Frontends:
       <a href="http://andFHEM.klass.li">andFHEM</a> (natives App)
       <a href="http://forum.fhem.de/index.php?t=msg&th=10628&start=0&rid=8">Fullscreen Browser App</a>
       <a href="http://forum.fhem.de/index.php?t=rview&th=12624">ORCA addition</a>,
-      <a href="http://www.homegroup.de/index.php/android/notify-app">notify-app</a>
+      <a href="http://www.homegroup.de/index.php/android/notify-app">notify-app</a></li>
         <div class="dist"></div>
 
     </ul>
@@ -161,120 +163,62 @@
     <a name="Features"></a>
     <h3>Features</h3>
     <ul>
-      <li>Gleichzeitige Unterst&uuml;tzung vieler in der Hausautomation &uuml;blicher
-          Protokolle wie FS20, HomeMatic, OneWire, X10, ZWave, EnOcean, KNX. Siehe
-          den <a href="#Hardware">Hardware</a> Abschnitt f&uuml;r mehr.
-          </li>
+      <li>Unterst&uuml;tzung vieler in der Hausautomation &uuml;blicher
+          Protokolle, Fernseh- oder Audiogeräte, Wetterdienste,
+          Online-Kalender, und mehr.</li>
           <div class="dist"></div>
 
       <li>Plug &amp; play: Bei vielen Protokollen werden die FHEM-Eintr&auml;ge
           automatisch beim Empfang der Funktelegramme angelegt, zusammen mit
           der Definition der Logdatei und etwaiger Visualisierung. Einfach FHEM
           mit angeschlossenen USB-Hardware starten, und zusehen, wie die Plots
-          der Sensoren auf der Webseite nacheinander auftauchen.
-          </li>
+          der Sensoren auf der Webseite nacheinander auftauchen.</li>
           <div class="dist"></div>
 
-        <li>Ereignisse in Dateien oder Datenbanken loggen, optionale Filterung mit regexp.
-          </li>
+        <li>Ereignisse in Dateien oder Datenbanken loggen, optionale Filterung
+          mit regexp.  </li>
           <div class="dist"></div>
 
-        <li>Beim Auftreten definierbarer Ereignisse externe Programme  bzw. Skripte
-          starten.</li>
+        <li>Beim Auftreten definierbarer Ereignisse externe Programme bzw.
+          Skripte starten.</li>
           <div class="dist"></div>
 
         <li>Zeitabh&auml;ngige Befehle (z.Bsp. die Lampe vom Sonnenuntergang bis
-            Mitternacht einschalten).
-            </li>
+          Mitternacht einschalten).</li>
           <div class="dist"></div>
 
-        <li>watchdog (z.Bsp. Email versenden, falls das Fenster zu lange offen ist)
-            </li>
+        <li>Diverse Schnittstellen: ASCII, JSON, XML, jeweils &uuml;ber TCP/IP,
+          SSL, HTTP oder HTTPS.
           <div class="dist"></div>
 
-        <li>Diverse Schnittstellen: ASCII, JSON, XML, jeweils
-            &uuml;ber TCP/IP, SSL, HTTP oder HTTPS.
-          <div class="dist"></div>
-
-        <li>Modulare Architektur mit &uuml;ber 100 Modulen f&uuml;r die
-            unterschiedlichen Ger&auml;te oder Hilfsdienste.</li>
+        <li>Modulare Architektur mit &uuml;ber 150 Modulen f&uuml;r die
+          unterschiedlichen Ger&auml;te oder Hilfsdienste.</li>
           <div class="dist"></div>
 
         <li>Viele Frontends, damit jeder das Passende finden kann.</li>
           <div class="dist"></div>
       </ul>
 
-    <a name="Hardware"></a>
-    <h3>Unterst&uuml;tzte hardware</h3>
+    <a name="Protocols"></a>
+    <h3>Unterst&uuml;tzte Protokolle (Auszug)</h3>
     <ul>
-      <li>Mit CUL oder CUN(O) (siehe <a
-        href="http://www.busware.de">www.busware.de</a>) Zugang zu folgenden
-        Protokollen: FS20, EM (EM1000EM, EM1000GZ und EM1000WZ), FHT80b, HMS,
-        S300 (KS300, S300TH, KS555, S555TH, usw.), HomeMatic, La Crosse TX2/TX3,
-        MAX!, Intertechno (nur senden), Hoermann (nur empfangen).
-        </li>
-        <div class="dist"></div>
-
-      <li>Mit FHZ1000 oder FHZ1300 Zugang zu folgenden Protokollen:
-        FS20, FHT80b, HMS, KS300. <b>Achtung:</b> F&uuml;r die WLAN Version der
-        FHZ1300 siehe <a href="http://www.thinkwiki.org/wiki/User:Akw/FHZ">
-        diesen</a> Hinweis.  </li>
-        <div class="dist"></div>
-
-      <li>X10 &uuml;ber das CM11 Modul mit Zugang zu einem X10 Computer-Interface</li>
-        <div class="dist"></div>
-
-      <li>Diverse Fernseher von Samsung/Panasonic/LG und Verst&auml;rker (YAMAHA)</li>
-        <div class="dist"></div>
-
-      <li>Diverse Wege um 1Wire Sensoren zu empfangen bzw. Aktoren zu steuern.</li>
-        <div class="dist"></div>
-
-      <li>Allnet 3076, Temperatursensoren und an Allnet 4000 angeschlossene
-        Allnet 4027 relay box</li>
-        <div class="dist"></div>
-
-      <li>Davis VantagePro2 Wetterstation</li>
-        <div class="dist"></div>
-
-      <li>Mit dem RFXCOM RFXtrx433 transceiver (433 Mhz) Unterst&uuml;tzung f&uuml;r diverse 
-        Protokolle (ANSLUT, ByeByeStandBy, Chacon EMW200, COCO, DomiaLite, D&uuml;wi,
-        ELRO AB400/AB600, HomeEasy EU, HomeEasy UK, IMPULS, Intertechno, KD101,
-        KlikAanKlikUit (KAKU), NEXA, Oregon Scientific, X10 security and
-        lighting, Visonic, Waveman, X10).</li>
-        <div class="dist"></div>
-
-      <li>Mit dem alten RFXCOM USB oder LAN basierten 433 Mhz RF Receiver 
-        (order code 80002 usw.) die folgenden Ger&auml;te: Oregon Scientific
-        Wettersensoren, RFXCOM RFXMeter, X10 Sicherheits- und
-        Beleuchtungsger&auml;te.</li>
-        <div class="dist"></div>
-
-      <li>Mit dem ELV USB-WDE1 Zugang zu den ELV Sensoren KS200/KS300, S300IA,
-        S300TH, ASH2200, PS 50 und Conrad Sensoren KS555, S555TH und
-        ASH555.</li>
-        <div class="dist"></div>
-
-      <li>Mit einem eQ-3 HomeMatic Lan Konfigurator (oder dem HM-CFG-USB + <a
-        href="https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb">hmland</a>)
-        Zugang zu Homematic Ger&auml;ten.</li>
-        <div class="dist"></div>
-
-      <li>Mit dem eibd oder einem TUL (siehe <a
-        href="http://www.busware.de">www.busware.de</a>) Zugang zum EIB/KNX
-        Protokoll.
-        <div class="dist"></div>
-
-      <li>Mit einem TCM120 (z.Bsp. das BSC BOR) oder einem TCM310 (z.Bsp.
-        busware EUL) Zugang zum EnOcean Protokoll.
-        <div class="dist"></div>
-
-      <li>Mit einem ZWave USB Dongle (z.Bsp. das Goodway WD6001) Zugang zum ZWave Protokoll.
-        <div class="dist"></div>
-
+      <li>eQ3 spezifisch: FS20, HomeMatic, MAX!, EM1000, FHT80b, HMS, S300,
+          ESA2000</li>
+          <div class="dist"></div>
+      <li>KNX, ZWave, EnOcean, X10, FRITZ!Dect, Intertechno, HomeEasy,
+          Philipps HUE</li>
+          <div class="dist"></div>
+      <li>1Wire, Firmata, webio, panStamp, LIRC, JeeLink, RFXCOM, TellStick</li>
+          <div class="dist"></div>
+      <li>Davis VantagePro2, Oregon Scientific, Allnet</li>
+          <div class="dist"></div>
+      <li>Fernseher von Samsung/Panasonic/LG, Ger&auml;te von Sonos,
+          Verst&auml;rker von YAMAHA</li>
+          <div class="dist"></div>
       <br>
-      Eine detaillierte Beschreibung auch anderer Ger&auml;te/Protokolle befindet
-      sich in der <a href="commandref_DE.html">commandref</a> Dokument.
+
+      Eine detaillierte Beschreibung aller Ger&auml;te/Protokolle befindet
+      sich in dem <a href="commandref_DE.html">commandref</a> Dokument.
 
 
     </ul>
@@ -340,6 +284,8 @@
           http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li>
           <div class="dist"></div>
 
+        <li>Raspberry PI mit <a href="http://www.enocean.com/fileadmin/redaktion/pdf/white_paper/wp_Raspberry_talks_EnOcean.pdf">EnOcean</a></li>
+
         <li>Linux Treiber Installation :
           <a href="http://fhem.de/linux.html">
           http://fhem.de/linux.html</a>(nur im Problemfall, english)</li>
@@ -384,7 +330,7 @@
     <ul>
     <h4>Fritz!Box</h4>
     <ul>
-      <li>FB7390: Folgenden FHEM
+      <li>FB7390/FB7490: Folgenden FHEM
          <a href="http://fhem.de/fhem-=VERS=-fb7390.image">Image</a>
          <i>zus&auml;tzlich</i> zum normalen oder labor Image von AVM installieren.
          Beide sind vollkommen unabh&auml;ngig und deswegen jeweils austauschbar.
@@ -399,21 +345,22 @@
     <ul>
       <li><a href="http://fhem.de/fhem-=VERS=.deb">Dieses</a> FHEM Paket (.deb) installieren.
       <b>Achtung:</b> Beim upgrade von einer FHEM Version vor 5.3 muss das alte
-      Paket vorher per "dpkg -P fhem" vollst&auml;ndig entfernt werden, da das
-      Verzeichnisstruktur sich ge&auml;ndert hat.  Ab Version 5.3 haben alle FHEM
-      Installations-Varianten die gleiche Verzeichnisstruktur.
+      Paket vorher per "dpkg -P fhem" vollst&auml;ndig entfernt werden, da die
+      Verzeichnisstruktur sich ge&auml;ndert hat.  Ab Version 5.3 haben alle
+      FHEM Installations-Varianten die gleiche Verzeichnisstruktur.
     </ul>
 
     <h4>Unix / OSX</h4>
     <ul>
       <li>Zuerst sollte sichergestellt werden, da&szlig; perl installiert ist.
-        Vermutlich wird das Perl-Modul Device::SerialPort ben&ouml;tigt (falls man
-        mit fhem USB-Ger&auml;te ansprechen m&ouml;chte), diesen kann man meist mit
-        "sudo cpan Device::SerialPort" oder "apt-get install
+        Vermutlich wird das Perl-Modul Device::SerialPort ben&ouml;tigt (falls
+        man mit fhem USB-Ger&auml;te ansprechen m&ouml;chte), diesen kann man
+        meist mit "sudo cpan Device::SerialPort" oder "apt-get install
         libdevice-serialport-perl" installieren.
         </li>
       <li><a href="http://fhem.de/fhem-=VERS=.tar.gz">Dieses</a> FHEM Paket
-        herunterladen, auspacken, und in das neu erstellte Verzeichnis wechseln.</li>
+        herunterladen, auspacken, und in das neu erstellte Verzeichnis
+        wechseln.</li>
       <li>Starten sie FHEM mit<br>
         <ul>
           <code>perl fhem.pl fhem.cfg</code>
@@ -423,23 +370,12 @@
 
     <h4>Windows</h4>
     <ul>
-      <b>Achtung:</b> Falls Sie FHEM unter cygwin installieren wollen, dann
-      k&ouml;nnen Sie die Installationsanleitung f&uuml;r UNIX befolgen.
-      <br><br>
+      <li>Siehe <a href="HOWTO_Windows.html">HOWTO_Windows.html</a> f&uuml;r
+      eine detaillierte Beschreibung.</li>
+
+      <li>Falls Sie FHEM unter cygwin installieren wollen, dann
+      k&ouml;nnen Sie die Installationsanleitung f&uuml;r UNIX befolgen.</li>
 
-      <li>Stellen Sie sicher, da&szlig; perl.exe in dem Pfad (%PATH%) ist, und das
-        Perl-Modul Win32::SerialPort installiert ist.</li>
-      <li>Stellen Sie sicher, da&szlig; das ben&ouml;tigte Ger&auml;t (CUL/FHZ/etc) &uuml;ber
-        einen virtuellen COM-Port oder via socket (e.g. <code>COMX or
-        xport:10001</code>) zur Verf&uuml;gung steht.
-        </li>
-      <li>Packen Sie <a href="http://fhem.de/fhem-=VERS=.tar.gz">diese</a>
-        Datei aus, und wechseln Sie in das neu erstellte Verzeichnis.
-      <li>Starten sie FHEM aus der Kommandozeile mit<br>
-        <ul>
-          <code>perl fhem.pl fhem.cfg</code>
-        </ul>
-        </li>
     </ul>
 
     <br><br>
diff --git a/docs/fritzbox.html b/docs/fritzbox.html
index 5f3feea17..c5f05d92b 100644
--- a/docs/fritzbox.html
+++ b/docs/fritzbox.html
@@ -26,7 +26,7 @@
 <h2><a href="fhem.html">FHEM</a> on the Fritz!Box</h2>
 
 
-<h3>Fritz!Box 7390 (as of 2011-09-03)</h3>
+<h3>Fritz!Box 7390 / 7490</h3>
     <ul>
     After the CeBIT 2011 AVM released an image for the Fritz!Box7390 containing
     fhem, see <a href="http://www.avm.de/de/Service/Service-Portale/Labor/index.php"
diff --git a/docs/pgm2-1.png b/docs/pgm2-1.png
index eba0a7d24..f906c0a0a 100644
Binary files a/docs/pgm2-1.png and b/docs/pgm2-1.png differ
diff --git a/docs/pgm2-2.png b/docs/pgm2-2.png
index 3093f4a23..41b78bd57 100644
Binary files a/docs/pgm2-2.png and b/docs/pgm2-2.png differ
diff --git a/docs/pgm2-3.png b/docs/pgm2-3.png
index 8d894cf07..deddd1cd3 100644
Binary files a/docs/pgm2-3.png and b/docs/pgm2-3.png differ
diff --git a/docs/pgm2-4.png b/docs/pgm2-4.png
deleted file mode 100644
index f2af44b9e..000000000
Binary files a/docs/pgm2-4.png and /dev/null differ
diff --git a/docs/pgm2-5.png b/docs/pgm2-5.png
deleted file mode 100644
index 6692da62e..000000000
Binary files a/docs/pgm2-5.png and /dev/null differ
diff --git a/www/pgm2/brightstyle.css b/www/pgm2/brightstyle.css
index c335e7d0f..4c16c9b8a 100644
--- a/www/pgm2/brightstyle.css
+++ b/www/pgm2/brightstyle.css
@@ -62,10 +62,10 @@ select {  border:0px none; margin-left:5px; margin-right:5px; }
 .handle { position:relative; cursor:pointer; width:50px; 
           height:20px; line-height:20px;
           -webkit-user-select:none; -moz-user-select:none; -user-select:none;
-          border:2px solid; color:white; text-align:center; }
+          border:2px solid; color:#309bbd; text-align:center; }
 .downText { margin-top:8px; font-weight:bold; }
 
-svg { height:32px; width:32px; fill:#fff; }
+svg { height:32px; width:32px; fill:#309bbd; }
 g.on { fill:red; }
 div[id*="Kalender-"] { width: 250px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 div[id*="disp"] { width: 250px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }