Change to version 3.25

vuall: small fix bcm3466
Origin commit data ------------------ Branch: master Commit: ff14fd96bb Author: BPanther <bpanther_ts@hotmail.com> Date: 2024-12-28 (Sat, 28 Dec 2024) ------------------ Missing context and justification in the original commit message. Identified a consistent pattern in commit practices. ------------------ This commit was generated by Migit
2025-09-18 10:51:12 +02:00 · 2025-01-01 20:05:41 +01:00 · 2025-01-01 20:01:53 +01:00 · 2024-12-31 14:53:21 +01:00 · 2024-12-22 16:37:37 +01:00 · 2024-12-22 14:18:28 +01:00
1156 changed files with 72077 additions and 56569 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,82 @@
-### mostly autoconf crap
+### http://www.gnu.org/software/automake
 Makefile
-autom4te.cache
-*.in
-aclocal.m4
-compile
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp-h1
-README
-COPYING
-INSTALL
+Makefile.in

-### objects and libs
+### http://www.gnu.org/software/autoconf
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h*
+
+### https://www.gnu.org/software/libtool/
+/libtool
+/ltmain.sh
+
+### http://www.gnu.org/software/m4/
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+### compiled objects and libs
 .libs
-.deps
+*.lo
 *.o
 *.so
-*.lo
-*.a
+*.lai
 *.la
-.*.swp
+*.a

-### editor crap
+### dependency files
+.deps
+*.Plo
+*.Po
+
+### diff and patch files
+*.patch
+*.diff
 *.orig
 *.rej
+
+### system generated stuff
+# dolphin
+.directory
+# kate
+*-swp
+.*.swp
+
+### generally excluded files
 *~
+*.pc
+git-*
+go_*

 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
-src/neutrino
-src/nhttpd/web/*.js.gz
-src/zapit/src/pzapit
-src/zapit/src/udpstreampes
 src/drivertool
 src/dt
-src/rcsim.h
-src/rcsim
-src/gui/version.h
-src/nhttpd/nhttpd.conf
 src/mdev_helper
+src/neutrino
+src/rcsim
+src/zapit/src/pzapit
+src/zapit/src/udpstreampes
+
+### header files that fall out of the build
+src/rcsim.h
+src/gui/version.h
 local_build_config.h

 ### system generated stuff
@@ -52,3 +84,13 @@ local_build_config.h
 .directory
 # kate
 *-swp
+
+### other files that fall out of the build
+src/nhttpd/nhttpd.conf
+
+### IDE-specific settings
+# Visual Studio Code settings
+.vscode/
+
+### python environment fallout
+venv
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1,126 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+# With this file it is possible with an easy way to clean up the repository
+# in combination with git-filter-repo too.
+# see https://github.com/newren/git-filter-repo
+#
+# 	$ git filter-repo -f --use-mailmap
+#
+
+Andrej Tobola <andrej.tobola+gifthub@gmail.com>
+bazi98 <bazi98@web.de>
+bazi98 <bazi98@web.de> bazi98 <fritz@example.com>
+Benny <Benny@users.noreply.github.com>
+Benny <Benny@users.noreply.github.com> Benny <>
+BPanther <bpanther_ts@hotmail.com>
+Christian Ege <k4230r6@googlemail.com>
+Christian Schuett <Gaucho316@hotmail.com>
+[CST] Bas <bas@coolstreamtech.com>
+[CST] Bas <bas@coolstreamtech.com> S.R. van Loon <bas@bvl-mbp-001.(none)>
+[CST] Focus <focus.cst@gmail.com>
+[CST] Focus <focus.cst@gmail.com> focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+[CST] Lucian <lucian@coolstreamtech.com>
+[CST] Lucian <lucian@coolstreamtech.com> lucgas <lucgas@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+[CST] Micha <Micha.R@no-access.de>
+[CST] Nicu <popescunicolae7@hotmail.com>
+[CST] Nicu <popescunicolae7@hotmail.com> [CST]Nicu <popescunicolae7@hotmail.com>
+DboxOldie <DboxOldie@users.noreply.github.com> DboxOldie <>
+DboxOldie <DboxOldie@users.noreply.github.com> DboxOldie <dbo@ddt>
+defans <defans@bluepeercrew.us>
+defans <defans@bluepeercrew.us> snafed <snafed@bluepeercrew.us>
+defans <defans@bluepeercrew.us> svenhoefer, SatBaby, snafed <svenhoefer@svenhoefer.com>
+defans <defans@bluepeercrew.us> svenhoefer, snafed <svenhoefer@svenhoefer.com>
+Don de Deckelwech <dondede@gmx.de>
+Don de Deckelwech <dondede@gmx.de> Don-de-Deckelwech <32013899+Don-de-Deckelwech@users.noreply.github.com>
+Ezak <marc.szymkowiak91@googlemail.com>
+FlatTV <FlatTV@gmx.de> 
+FlatTV <FlatTV@gmx.de> FlatTV <FlatTV@linux-z6o4.site>
+Frankenstone <dampf_acc@online.de>
+Frankenstone <dampf_acc@online.de> Frankenstone <dampf_acc@yahoo.com>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de> fredfeuerstein2 <fred_feuerstein@herr-der-mails.de>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de> fredfeuerstein2 <52878780+fredfeuerstein2@users.noreply.github.com>
+Gaucho316 <Gaucho316@hotmail.com>
+GetAway <get-away@t-online.de>
+gixxpunk <thomas.harfmann@gmail.com>
+gixxpunk <thomas.harfmann@gmail.com> gandharva <gandharva@gmx.de>
+gixxpunk <thomas.harfmann@gmail.com> Striper <gandharva@gmx.de>
+gixxpunk <thomas.harfmann@gmail.com> striper <striper@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+gixxpunk <thomas.harfmann@gmail.com> striper <striper@gmx.de>
+Hendi <hendi48@freenet.de>
+Hendi <hendi48@freenet.de> Hendi48 <32822533+Hendi48@users.noreply.github.com>
+horsti58 <horsti58@gmx.net>
+horsti58 <horsti58@gmx.net> horsti58 <horsti58@gmx.netm>
+IngoF <ingo.fischer@arcormail.de>
+Jacek Jendrzej <overx300@gmail.com>
+Jacek Jendrzej <overx300@gmail.com> Jacek Jendrzej <crashdvb@googlemail.com>
+Jacek Jendrzej <overx300@gmail.com> Jacek Jendrzej <satbaby@kawaii.com>
+Jacek Jendrzej <overx300@gmail.com> satbaby <>
+Jacek Jendrzej <overx300@gmail.com> satbaby <crashdvb@googlemail.com>
+Jacek Jendrzej <overx300@gmail.com> satbaby <satbaby>
+Jacek Jendrzej <overx300@gmail.com> satbaby <satbaby@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Jacek Jendrzej <overx300@gmail.com> j00zek <j00zek@ubuntu.(none)>
+Jacek Jendrzej <overx300@gmail.com> j00zek <zdzislaw22@windowslive.com>
+Janus <janus@debian>
+J. Krieg <bellum07@googlemail.com>
+J. Krieg <bellum07@googlemail.com> bellum <bellum07@googlemail.com>
+JohnnyRun <giannicarabelli@gmail.com>
+klauser <baumeister23@freenet.de>
+Knicko007 <knicko@glj.servebbs.com>
+Knicko007 <knicko@glj.servebbs.com> Knicko <knicko@glj.servebbs.com>
+limes007 <39467727+limes007@users.noreply.github.com>
+Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
+Markus Volk <f_l_k@t-online.de>
+Markus Volk <f_l_k@t-online.de> flk <f_l_k@t-online.de>
+Markus Volk <f_l_k@t-online.de> Markus Volk <flk@linux.fritz.box>
+Markus Volk <f_l_k@t-online.de> MarkusVolk <f_l_k@t-online.de>
+martii <m4rtii@gmx.de>
+martii <m4rtii@gmx.de> martii <you@example.com>
+max_10 <max_10@gmx.de>
+max_10 <max_10@gmx.de> max10 <max_10@gmx.de>
+Michael Liebmann <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <micha-bbg@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <tuxcode.bbg@googlemail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> Michael Liebmann <micha-bbg@users.noreply.github.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> M. Liebmann <git@tuxcode.de>
+Michael Liebmann <tuxcode.bbg@gmail.com> M. Liebmann <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> [priv] M. Liebmann <git@tuxcode.de>
+Michael Liebmann <tuxcode.bbg@gmail.com> [priv] M. Liebmann <tuxcode.bbg@gmail.com>
+mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+NadjaW <nadja.wilx@web.de>
+nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+ni-visitor <neutrino.images@gmail.com>
+no@ma.il <one@localhost.(none)>
+OneOfNine <oneofnine@web.de>
+redblue.pkt <redblue.pkt@orange.pl>
+redblue.pkt <redblue.pkt@orange.pl> redblue-pkt <17146148+redblue-pkt@users.noreply.github.com>
+redblue.pkt <redblue.pkt@orange.pl> redblue-pkt <redblue-pkt@orange.pl>
+retsim01 <mrdata1972+neutrino@gmail.com>
+rhabarber1848 <rhabarber1848@web.de>
+rhabarber1848 <rhabarber1848@web.de> rhabarber1848 <rhabarber1848>
+Sascha Zelzer <sascha.zelzer@gmail.com>
+SnowHead <snowhead@spinnes-netz.de>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de> seife <seife@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Stefan Seyfried <seife+github@b1-systems.com>
+swing99 <swing0815@googlemail.com>
+TangoCash <eric@loxat.de> Eric Loxat <eric@loxat.de>
+TangoCash <eric@loxat.de> TangoCash <DaHooD@web.de>
+TangoCash <eric@loxat.de> TangoCash <me@spamdot.com>
+Thilo Graf <dbt@novatux.de>
+Thilo Graf <dbt@novatux.de> thilo <dbt@novatux.de> 
+Thilo Graf <dbt@novatux.de> Thilo Graf <tg.pnhd@novatux.de>
+Thilo Graf <dbt@novatux.de> thilo <thilo@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Thilo Graf <dbt@novatux.de> Thilo Graf <dbt1@users.noreply.github.com>
+tomworld <atzeworld@msn.com>
+vanhofen <vanhofen@gmx.de>
+vanhofen <vanhofen@gmx.de> svenhoefer <svenhoefer@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+vanhofen <vanhofen@gmx.de> svenhoefer <svenhoefer@svenhoefer.com>
+vanhofen <vanhofen@gmx.de> Sven Höfer <svenhoefer@svenhoefer.com>
+yjogol <yjogol2@online.de>
+yjogol <yjogol2@online.de> yjogol <yjogol@e54a6e83-5905-42d5-8d5c-058d10e6a962>
--- a/0
+++ b/0
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1 @@
 SUBDIRS = lib src data
-
-locale-update:
-	make -C $(top_builddir)/data/locale install-locals
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,180 +1,131 @@
 AC_DEFUN([TUXBOX_APPS], [
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE

 AC_GNU_SOURCE

+AC_MSG_CHECKING(target)
 AC_ARG_WITH(target,
-	AS_HELP_STRING([--with-target=TARGET], [target for compilation [[native,cdk]]]),
+	AS_HELP_STRING([--with-target=TARGET], [Target mode for compilation, either "native" or "cdk", keep empty for native]),
 	[TARGET="$withval"],
 	[TARGET="native"])

+AC_MSG_CHECKING([targetroot (target system root)])
+AC_ARG_WITH(targetroot,
+	AS_HELP_STRING([--with-targetroot=PATH], [The target root (only applicable in native mode.]),
+	[TARGET_ROOT="$withval"],
+	[TARGET_ROOT="NONE"])
+
 AC_ARG_WITH(targetprefix,
-	AS_HELP_STRING([--with-targetprefix=PATH], [prefix relative to target root (only applicable in cdk mode)]),
+	AS_HELP_STRING([--with-targetprefix=PATH], [Prefix relative to target root, e.g. /usr (only applicable in cdk mode)]),
 	[TARGET_PREFIX="$withval"],
-	[TARGET_PREFIX=""])
+	[TARGET_PREFIX="NONE"])

 AC_ARG_WITH(debug,
-	AS_HELP_STRING([--without-debug], [disable debugging code @<:@default=no@:>@]),
+	AS_HELP_STRING([--without-debug], [Disable debugging code @<:@default=no@:>@]),
 	[DEBUG="$withval"],
 	[DEBUG="yes"])

+AC_MSG_CHECKING(debug enabled)
 if test "$DEBUG" = "yes"; then
-	DEBUG_CFLAGS="-g3 -ggdb"
+	AC_MSG_RESULT([$DEBUG])
 	AC_DEFINE(DEBUG, 1, [enable debugging code])
+
+	AC_MSG_CHECKING(debug flags)
+	if test "$DEBUG_CFLAGS" = ""; then
+		DEBUG_CFLAGS="-g3 -ggdb"
+		AC_MSG_RESULT([Environment variable DEBUG_CFLAGS is not set, default debug flags will be used: $DEBUG_CFLAGS])
+	else
+		AC_MSG_RESULT([Defined by environment variable DEBUG_CFLAGS: $DEBUG_CFLAGS])
+	fi
+else
+	AC_MSG_RESULT([$DEBUG])
 fi

-
-# tmdb
-AC_ARG_WITH(tmdb-dev-key,
-	AS_HELP_STRING([--with-tmdb-dev-key=KEY], [API dev key to get data from tmdb data base, required for additional epg informations.]),
-	[TMDB_DEV_KEY="$withval"],
-	[TMDB_DEV_KEY=""])
-AC_DEFINE_UNQUOTED([TMDB_DEV_KEY], ["$TMDB_DEV_KEY"], [API dev key to get data from tmdb data base, required for additional epg informations.])
-
-
-AC_ARG_ENABLE([tmdb-key-manage],
-	[AS_HELP_STRING([--enable-tmdb-key-manage], [Enable manage tmdb api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
-	[enable_tmdb_key_manage="$enableval"],
-	[enable_tmdb_key_manage="yes"])
-tmdb_key_manage_val=1
-if test "$enable_tmdb_key_manage" = "no" ; then
-	tmdb_key_manage_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_TMDB_KEY_MANAGE],[$tmdb_key_manage_val],[Enable manage tmdb api dev key via gui for additional epg informations.])
-# end tmdb
-
-
-# omdb
-AC_ARG_WITH(omdb-api-key,
-	AS_HELP_STRING([--with-omdb-api-key=KEY], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.]),
-	[OMDB_API_KEY="$withval"],
-	[OMDB_API_KEY=""])
-AC_DEFINE_UNQUOTED([OMDB_API_KEY], ["$OMDB_API_KEY"], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.])
-
-AC_ARG_ENABLE([omdb-key-manage],
-	[AS_HELP_STRING([--enable-omdb-key-manage], [Enable manage omdb (imdb) api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
-	[enable_omdb_key_manage="$enableval"],
-	[enable_omdb_key_manage="yes"])
-omdb_key_manage_val=1
-if test "$enable_omdb_key_manage" = "no" ; then
-	omdb_key_manage_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_OMDB_KEY_MANAGE],[$omdb_key_manage_val],[Enable manage omdb (imdb) api dev key via gui for additional epg informations.])
-# end omdb
-
-
-# youtube
-AC_ARG_WITH(youtube-dev-key,
-	AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming.]),
-	[YT_DEV_KEY="$withval"],
-	[YT_DEV_KEY=""])
-AC_DEFINE_UNQUOTED([YT_DEV_KEY], ["$YT_DEV_KEY"], [API dev key for YouTube streaming.])
-
-AC_ARG_ENABLE([youtube-key-manage],
-	[AS_HELP_STRING([--enable-youtube-key-manage], [Enable manage youtube dev key via gui for additional epg informations. @<:@default=yes@:>@])],
-	[enable_youtube_key_manage="$enableval"],
-	[enable_youtube_key_manage="yes"])
-youtube_key_manage_val=1
-if test "$enable_youtube_key_manage" = "no" ; then
-	youtube_key_manage_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_KEY_MANAGE],[$youtube_key_manage_val], [Enable manage youtube dev key via gui for additional epg informations.])
-
-AC_ARG_ENABLE([youtube-player],
-	[AS_HELP_STRING([--enable-youtube-player], [Enable play and control youtube streams with moviebrowser. @<:@default=yes@:>@])],
-	[enable_youtube_player="$enableval"],
-	[enable_youtube_player="yes"])
-youtube_player_val=1
-if test "$enable_youtube_player" = "no" ; then
-	youtube_player_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_PLAYER],[$youtube_player_val], [Enable play and control YouTube streams with moviebrowser.])
-# end youtube
-
-
-# shoutcast
-AC_ARG_WITH(shoutcast-dev-key,
-	AS_HELP_STRING([--with-shoutcast-dev-key=KEY], [API dev key to get stream data lists from ShoutCast service.]),
-	[SHOUTCAST_DEV_KEY="$withval"],
-	[SHOUTCAST_DEV_KEY=""])
-AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_KEY], ["$SHOUTCAST_DEV_KEY"], [API dev key to get stream data lists from ShoutCast service.])
-
-AC_ARG_ENABLE([shoutcast-key-manage],
-	[AS_HELP_STRING([--enable-shoutcast-key-manage], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui. @<:@default=yes@:>@])],
-	[enable_shoutcast_key_manage="$enableval"],
-	[enable_shoutcast_key_manage="yes"])
-shoutcast_key_manage_val=1
-if test "$enable_shoutcast_key_manage" = "no" ; then
-	shoutcast_key_manage_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_SHOUTCAST_KEY_MANAGE],[$shoutcast_key_manage_val], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui.])
-# end shoutcast
-
-
-AC_ARG_WITH(libcoolstream-static-dir,
-	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]),
-	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
-	[LIBCOOLSTREAM_STATIC_DIR=""])
-
-AC_ARG_ENABLE(libcoolstream-static,
-	AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
-AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
-
-AC_ARG_ENABLE(reschange,
-	AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]),
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]))
-AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")
-
-# default theme
-AC_ARG_WITH(default-theme,
-	AS_HELP_STRING([--with-default-theme=THEMENAME], [Default theme for gui. Default it is empty for internal fallback to default colors.]),
-	[default_theme="$withval"],
-	[default_theme=""])
-AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui.])
-
 AC_MSG_CHECKING(target)
+if test "$TARGET" = "native" || test "$TARGET" = "cdk"; then
+	AC_MSG_RESULT($TARGET)
+else
+	AC_MSG_ERROR([Invalid target '$TARGET'. Use either 'native' or 'cdk' or leave empty for native.])
+fi

 if test "$TARGET" = "native"; then
-	AC_MSG_RESULT(native)
+	AC_MSG_CHECKING(prefix)
+	if test "$prefix" = "NONE"; then
+		prefix=/usr/local
+	fi
+	AC_MSG_RESULT($prefix)
+
+	AC_MSG_CHECKING([targetroot])
+	if test "$TARGET_ROOT" = "NONE"; then
+		TARGET_ROOT=""
+		AC_MSG_RESULT([Is not set, use default target system root: empty])
+	else
+		AC_MSG_RESULT([user defined target system root: $TARGET_ROOT])
+	fi
+
+	AC_MSG_CHECKING([targetprefix])
+	if test "$TARGET_PREFIX" = "NONE"; then
+		TARGET_PREFIX=
+		AC_MSG_RESULT([Is not set, use default target prefix relative to target root: empty])
+	else
+		AC_MSG_RESULT([$TARGET_PREFIX])
+	fi

 	if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
 		CFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
 		CXXFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
 	fi
-	if test "$prefix" = "NONE"; then
-		prefix=/usr/local
-	fi
-	if test "$exec_prefix" = "NONE"; then
-		exec_prefix=$prefix
-	fi
-	targetprefix=$prefix
-	TARGET_PREFIX=$prefix
-	AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
 elif test "$TARGET" = "cdk"; then
-	AC_MSG_RESULT(cdk)
-
-	if test "$CC" = "" -a "$CXX" = ""; then
-		AC_MSG_ERROR([you need to specify variables CC or CXX in cdk])
-	fi
-	if test "$CFLAGS" = "" -o "$CXXFLAGS" = ""; then
-		AC_MSG_ERROR([you need to specify variables CFLAGS and CXXFLAGS in cdk])
-	fi
+	AC_MSG_CHECKING(prefix in cdk mode)
 	if test "$prefix" = "NONE"; then
-		AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
+		AC_MSG_ERROR([$prefix invalid prefix, you need to specify one in cdk mode])
 	fi
-	if test "$TARGET_PREFIX" != "NONE"; then
-		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
+	AC_MSG_RESULT($prefix)
+
+	AC_MSG_CHECKING([targetroot in cdk mode])
+	OLD_TARGET_ROOT=$TARGET_ROOT
+	TARGET_ROOT=""
+	if test "$TARGET_ROOT" = "NONE"; then
+		AC_MSG_NOTICE([Is not set "$OLD_TARGET_ROOT", using fallback to default: empty])
+
+	else
+		AC_MSG_NOTICE([Is set to "$OLD_TARGET_ROOT", but using default: empty])
 	fi
+
+	AC_MSG_CHECKING([targetprefix in cdk mode])
 	if test "$TARGET_PREFIX" = "NONE"; then
-		AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
 		TARGET_PREFIX=""
+		AC_MSG_RESULT([default target prefix relative to target root: empty])
+	else
+		AC_MSG_RESULT([user defined target prefix relative to target root: $TARGET_PREFIX])
 	fi
-else
-	AC_MSG_RESULT(none)
-	AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
+
+	AC_MSG_CHECKING([gcc/g++ in cdk mode])
+	if test "$CC" = "" -a "$CXX" = ""; then
+		AC_MSG_ERROR([you need to specify variables CC and CXX in cdk mode in your envirionment])
+	fi
+	AC_MSG_RESULT($CC / $CXX)
+
+	AC_MSG_CHECKING([CFLAGS and CXXFLAGS in cdk mode])
+	if test "$CFLAGS" = "" -o "$CXXFLAGS" = ""; then
+		AC_MSG_ERROR([you need to specify variables CFLAGS and CXXFLAGS in cdk mode in your envirionment])
+	fi
+	AC_MSG_RESULT(CFLAGS: $CFLAGS)
+	AC_MSG_RESULT(CXXLAGS: $CXXFLAGS)
 fi

+AC_MSG_CHECKING(exec_prefix)
+if test "$exec_prefix" = "NONE"; then
+	exec_prefix=$prefix
+fi
+AC_MSG_RESULT($exec_prefix)
+
+AC_DEFINE_UNQUOTED([TARGET], ["$TARGET"], [target for compilation])
+AC_DEFINE_UNQUOTED([TARGET_ROOT], ["$TARGET_ROOT"], [root path at the target system native: the target root; cdk: empty])
+AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["$TARGET_PREFIX"], [native: auto-assigned path; cdk: path relative to target root])
+
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_SYS_LARGEFILE
@@ -223,27 +174,49 @@ AC_SUBST(TARGET_$2)
 AC_DEFUN([TUXBOX_APPS_DIRECTORY], [
 AC_REQUIRE([TUXBOX_APPS])

+#
+# FIXME:
+# This breaks --sysconfdir= etc. switches in cdk mode.
+#
 if test "$TARGET" = "cdk"; then
 	datadir="\${prefix}/share"
-	sysconfdir="\${prefix}/etc"
-	localstatedir="\${prefix}/var"
-	libdir="\${prefix}/lib"
-	mntdir="\${prefix}/mnt"
 	targetdatadir="\${TARGET_PREFIX}/share"
-	targetsysconfdir="\${TARGET_PREFIX}/etc"
-	targetlocalstatedir="\${TARGET_PREFIX}/var"
+
+	libdir="\${prefix}/lib"
 	targetlibdir="\${TARGET_PREFIX}/lib"
-	targetmntdir="\${TARGET_PREFIX}/mnt"
+
+	sysconfdir="/etc"
+	targetsysconfdir="/etc"
+
+	localstatedir="/var"
+	targetlocalstatedir="/var"
+
+	mntdir="/mnt"
+	targetmntdir="/mnt"
+	MNTDIR=$targetmntdir
 else
-	mntdir="/mnt" # hack
+	mntdir="/mnt"
+	MNTDIR=$mntdir
 fi

 TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config,
 	[--with-configdir=PATH], [where to find config files])

+TUXBOX_APPS_DIRECTORY_ONE(zapitdir, ZAPITDIR, localstatedir, /var, /tuxbox/config/zapit,
+	[--with-zapitdir=PATH], [where to find zapit files])
+
 TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
 	[--with-datadir=PATH], [where to find data files])

+TUXBOX_APPS_DIRECTORY_ONE(datadir_var, DATADIR_VAR, localstatedir, /var, /tuxbox,
+	[--with-datadir_var=PATH], [where to find data files in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
+	[--with-controldir=PATH], [where to find control scripts])
+
+TUXBOX_APPS_DIRECTORY_ONE(controldir_var, CONTROLDIR_VAR, localstatedir, /var, /tuxbox/control,
+	[--with-controldir_var=PATH], [where to find control scripts in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
 	[--with-fontdir=PATH], [where to find fonts])

@@ -256,7 +229,7 @@ TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games
 TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
 	[--with-libdir=PATH], [where to find internal libs])

-TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, datadir, /share, /tuxbox/neutrino/plugins,
 	[--with-plugindir=PATH], [where to find plugins])

 TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
@@ -265,9 +238,12 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tu
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
 	[--with-plugindir_mnt=PATH], [where to find external plugins])

-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
 	[--with-luaplugindir=PATH], [where to find Lua plugins])

+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir_var, LUAPLUGINDIR_VAR, localstatedir, /var, /tuxbox/luaplugins,
+	[--with-luaplugindir_var=PATH], [where to find Lua plugins in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
 	[--with-webradiodir=PATH], [where to find webradio content])

@@ -298,6 +274,18 @@ TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/
 TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
 	[--with-iconsdir_var=PATH], [where to find icons in /var])

+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbox/neutrino/lcd/icons,
+	[--with-lcd4liconsdir=PATH], [where to find lcd4linux icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons,
+	[--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(logodir, LOGODIR, datadir, /share, /tuxbox/neutrino/icons/logo,
+	[--with-logodir=PATH], [where to find channel logos])
+
+TUXBOX_APPS_DIRECTORY_ONE(logodir_var, LOGODIR_VAR, localstatedir, /var, /tuxbox/icons/logo,
+	[--with-logodir_var=PATH], [where to find channel logos in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH], [where to find private httpd files])

@@ -313,7 +301,11 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,

 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
+AC_SUBST(ZAPITDIR)
 AC_SUBST(DATADIR)
+AC_SUBST(DATADIR_VAR)
+AC_SUBST(CONTROLDIR)
+AC_SUBST(CONTROLDIR_VAR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
@@ -323,6 +315,7 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(PLUGINDIR_VAR)
 AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(LUAPLUGINDIR_VAR)
 AC_SUBST(WEBRADIODIR)
 AC_SUBST(WEBRADIODIR_VAR)
 AC_SUBST(WEBTVDIR)
@@ -333,9 +326,14 @@ AC_SUBST(THEMESDIR)
 AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
 AC_SUBST(ICONSDIR_VAR)
+AC_SUBST(LCD4L_ICONSDIR)
+AC_SUBST(LCD4L_ICONSDIR_VAR)
+AC_SUBST(LOGODIR)
+AC_SUBST(LOGODIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
+AC_SUBST(FLAGDIR)
 dnl end workaround

 AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG], [
@@ -413,9 +411,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)

 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		tripledragon|coolstream|spark|azbox|generic|armbox)
+		generic|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -425,10 +423,18 @@ AC_ARG_WITH(boxtype,
 	[BOXTYPE="generic"])

 AC_ARG_WITH(boxmodel,
-	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
-AS_HELP_STRING([], [valid for armbox: hd51])
-AS_HELP_STRING([], [valid for generic: raspi]),
+	AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
+AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox, multiboxse, hd51, bre2ze4k, h7, e4hdultra, protek4k, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
+AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
 	[case "${withval}" in
+		generic|raspi)
+			if test "$BOXTYPE" = "generic"; then
+				BOXMODEL="$withval"
+			else
+				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
+			fi
+		;;
 		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
 				BOXMODEL="$withval"
@@ -448,15 +454,15 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51)
+		hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		raspi)
-			if test "$BOXTYPE" = "generic"; then
+		vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
+			if test "$BOXTYPE" = "mipsbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
@@ -465,48 +471,188 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 		;;
-	esac])
+	esac],
+	[BOXMODEL="generic"])

 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)

-AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
-AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
-AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
+AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
+AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")

-AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
-AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
-
+# generic
+AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic")
 AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")

-if test "$BOXTYPE" = "azbox"; then
-	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
-elif test "$BOXTYPE" = "tripledragon"; then
-	AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
-elif test "$BOXTYPE" = "coolstream"; then
-	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
-elif test "$BOXTYPE" = "spark"; then
-	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
-elif test "$BOXTYPE" = "generic"; then
+# coolstream
+AM_CONDITIONAL(BOXMODEL_CST_HD1, test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2")
+
+# armbox
+AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61")
+AM_CONDITIONAL(BOXMODEL_MULTIBOX, test "$BOXMODEL" = "multibox")
+AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse")
+
+AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
+AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
+AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
+AM_CONDITIONAL(BOXMODEL_E4HDULTRA, test "$BOXMODEL" = "e4hdultra")
+AM_CONDITIONAL(BOXMODEL_PROTEK4K, test "$BOXMODEL" = "protek4k")
+
+AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k")
+AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
+AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus")
+
+AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4KSE, test "$BOXMODEL" = "vuduo4kse")
+AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
+AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
+
+# mipsbox
+AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
+AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2")
+
+AM_CONDITIONAL(BOXMODEL_GB800SE, test "$BOXMODEL" = "gb800se")
+
+AM_CONDITIONAL(BOXMODEL_OSNINO, test "$BOXMODEL" = "osnino")
+AM_CONDITIONAL(BOXMODEL_OSNINOPLUS, test "$BOXMODEL" = "osninoplus")
+AM_CONDITIONAL(BOXMODEL_OSNINOPRO, test "$BOXMODEL" = "osninopro")
+
+if test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
+elif test "$BOXTYPE" = "coolstream"; then
+	AC_DEFINE(HAVE_CST_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "armbox"; then
 	AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox])
+elif test "$BOXTYPE" = "mipsbox"; then
+	AC_DEFINE(HAVE_MIPS_HARDWARE, 1, [building for an mipsbox])
 fi

-# TODO: do we need more defines?
-if test "$BOXMODEL" = "hd1"; then
-	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
-elif test "$BOXMODEL" = "hd2"; then
-	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
-elif test "$BOXMODEL" = "hd51"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+# generic
+if test "$BOXMODEL" = "generic"; then
+	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
 elif test "$BOXMODEL" = "raspi"; then
 	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
+
+# coolstream
+elif test "$BOXMODEL" = "hd1"; then
+	AC_DEFINE(BOXMODEL_CST_HD1, 1, [coolstream hd1/neo/neo2/zee])
+elif test "$BOXMODEL" = "hd2"; then
+	AC_DEFINE(BOXMODEL_CST_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
+
+# armbox
+elif test "$BOXMODEL" = "hd60"; then
+	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+elif test "$BOXMODEL" = "hd61"; then
+	AC_DEFINE(BOXMODEL_HD61, 1, [hd61])
+elif test "$BOXMODEL" = "multibox"; then
+	AC_DEFINE(BOXMODEL_MULTIBOX, 1, [multibox])
+elif test "$BOXMODEL" = "multiboxse"; then
+	AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse])
+
+elif test "$BOXMODEL" = "hd51"; then
+	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
+elif test "$BOXMODEL" = "bre2ze4k"; then
+	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
+elif test "$BOXMODEL" = "h7"; then
+	AC_DEFINE(BOXMODEL_H7, 1, [h7])
+elif test "$BOXMODEL" = "e4hdultra"; then
+	AC_DEFINE(BOXMODEL_E4HDULTRA, 1, [e4hdultra])
+elif test "$BOXMODEL" = "protek4k"; then
+	AC_DEFINE(BOXMODEL_PROTEK4K, 1, [protek4k])
+
+elif test "$BOXMODEL" = "osmini4k"; then
+	AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
+elif test "$BOXMODEL" = "osmio4k"; then
+	AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k])
+elif test "$BOXMODEL" = "osmio4kplus"; then
+	AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus])
+
+elif test "$BOXMODEL" = "vusolo4k"; then
+	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
+elif test "$BOXMODEL" = "vuduo4k"; then
+	AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
+elif test "$BOXMODEL" = "vuduo4kse"; then
+	AC_DEFINE(BOXMODEL_VUDUO4KSE, 1, [vuduo4kse])
+elif test "$BOXMODEL" = "vuultimo4k"; then
+	AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
+elif test "$BOXMODEL" = "vuuno4k"; then
+	AC_DEFINE(BOXMODEL_VUUNO4K, 1, [vuuno4k])
+elif test "$BOXMODEL" = "vuuno4kse"; then
+	AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse])
+elif test "$BOXMODEL" = "vuzero4k"; then
+	AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
+
+# mipsbox
+elif test "$BOXMODEL" = "vuduo"; then
+	AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])
+elif test "$BOXMODEL" = "vuduo2"; then
+	AC_DEFINE(BOXMODEL_VUDUO2, 1, [vuduo2])
+
+elif test "$BOXMODEL" = "gb800se"; then
+	AC_DEFINE(BOXMODEL_GB800SE, 1, [gb800se])
+
+elif test "$BOXMODEL" = "osnino"; then
+	AC_DEFINE(BOXMODEL_OSNINO, 1, [osnino])
+elif test "$BOXMODEL" = "osninoplus"; then
+	AC_DEFINE(BOXMODEL_OSNINOPLUS, 1, [osninoplus])
+elif test "$BOXMODEL" = "osninopro"; then
+	AC_DEFINE(BOXMODEL_OSNINOPRO, 1, [osninopro])
 fi
+
+# all vuplus BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2)
+		AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all])
+		vuplus_all=true
+	;;
+	*)
+		vuplus_all=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true")
+
+# all vuplus arm BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm])
+		vuplus_arm=true
+	;;
+	*)
+		vuplus_arm=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true")
+
+# all vuplus mips BOXMODELs
+case "$BOXMODEL" in
+	vuduo|vuduo2)
+		AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips])
+		vuplus_mips=true
+	;;
+	*)
+		vuplus_mips=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
+
+# all hisilicon BOXMODELs
+case "$BOXMODEL" in
+	hd60|hd61|multibox|multiboxse)
+		AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon])
+		hisilicon=true
+	;;
+	*)
+		hisilicon=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
 ])

 dnl backward compatiblity
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,10 +6,10 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

 cd "$srcdir"
-echo "Generating configuration files for $package, please wait...."
+echo "Generating configuration files for $package, please wait ..."

 aclocal --force
 libtoolize --force
 autoconf --force
-autoheader  --force
+autoheader --force
 automake --add-missing --force-missing
--- a/autorun.sh
+++ b/autorun.sh
@@ -1,19 +1,28 @@
 export LD_LIBRARY_PATH=/var/lib
 export PATH=${PATH}:/var/bin:/var/plugins

-echo "### Starting NEUTRINO ###"
+# Simple Neutrino start script
+
+# Neutrino's exit codes
+ERROR=-1
+NORMAL=0
+SHUTDOWN=1
+REBOOT=2
+
+echo "Starting Neutrino"

 cd /tmp
-/bin/neutrino > /dev/null 2> /dev/null
+/bin/neutrino >/dev/null 2>&1; RET=$?
+sync

-/bin/sync
-/bin/sync
+echo "Neutrino exited with exit code $RET"

-if [ -e /tmp/.reboot ] ; then
-    /bin/dt -t"Rebooting..."
-    /sbin/reboot -f
-else
-    /bin/dt -t"Panic..."
-    sleep 5
-    /sbin/reboot -f
+if [ $RET -eq $NORMAL ]; then
+	# do nothing
+elif [ $RET -eq $SHUTDOWN ]; then
+	poweroff
+elif [ $RET -eq $REBOOT ]; then
+	reboot
+else # $RET -eq $ERROR
+	reboot -f
 fi
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,32 @@
-AC_INIT(Tuxbox-Neutrino,3.8.0)
+# explicit defines for separate revision handling
+define(ver_major, 3)
+define(ver_minor, 25)
+define(ver_micro, 0)
+define(rel_cycle, "ver_major.0")
+
+# sync with current git
+define(ver_git, m4_esyscmd([
+	GITBRANCH=$(git rev-parse --abbrev-ref HEAD);
+	GITDESCRIBE=$(git describe --always --tags --dirty);
+	printf "$GITDESCRIBE $GITBRANCH"
+]))
+
+define(ver_date, m4_esyscmd([
+	BUILTDATE=$(date);
+	printf "$BUILTDATE"
+]))
+
+AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
 AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])

-AC_DEFINE(RELEASE_CYCLE, "2.5", [Release cycle information; used in update code])
+AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
+
+AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
+AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
+AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
+AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info])
+AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date])

 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
@@ -12,7 +36,12 @@ TUXBOX_BOXTYPE
 AC_PROG_CC
 AC_PROG_CXX
 AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_INIT
+
+# Set default for ARFLAGS, since autoconf does not have a macro for it.
+# This allows people to set it when running configure or make
+test -n "$ARFLAGS" || ARFLAGS="cr"
+AC_SUBST(ARFLAGS)

 # Add build information to local_build_config.h.tmp
 # -------------------------------------------------
@@ -89,10 +118,6 @@ TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)

 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")

-if test "$BOXTYPE" = "tripledragon"; then
-	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
-fi
-
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)

@@ -134,7 +159,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)

-if test "$BOXTYPE" = "armbox"; then
+if test "$BOXTYPE" = "armbox" -o "$BOXTYPE" = "mipsbox"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
 fi

@@ -142,14 +167,262 @@ if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi

-if test "$BOXTYPE" = "coolstream" ||
+if test "$BOXTYPE" = "generic" ||
+   test "$BOXTYPE" = "coolstream" ||
   test "$BOXTYPE" = "armbox" ||
-   test "$BOXTYPE" = "generic" ||
-   test "$BOXTYPE" = "tripledragon" ||
-   test "$BOXTYPE" = "spark"; then
+   test "$BOXTYPE" = "mipsbox"; then
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi

+AC_ARG_ENABLE(lcd4linux,
+	AS_HELP_STRING([--enable-lcd4linux], [enable LCD4Linux support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD4LINUX, 1, [enable LCD4Linux support]))
+AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
+
+# lcd
+AC_ARG_ENABLE(lcd,
+	AS_HELP_STRING([--enable-lcd], [enable internal lcd support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD, 1, [enable internal lcd support]))
+AM_CONDITIONAL(ENABLE_LCD, test "$enable_lcd" = "yes")
+
+# lcd update
+if test "$enable_lcd" = "yes"; then
+	AC_DEFINE(LCD_UPDATE, 1, [include internal lcd update support])
+fi
+AM_CONDITIONAL(LCD_UPDATE, test "$enable_lcd" = "yes")
+
+AC_ARG_ENABLE(graphlcd,
+	AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_GRAPHLCD, 1, [enable GraphLCD support]))
+AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes")
+
+## OpenWeather API key
+# Check and configure the OpenWeather API key
+AC_MSG_CHECKING([for OpenWeather API key])
+AC_ARG_WITH([weather-api-key],
+	AS_HELP_STRING([--with-weather-api-key=KEY], [Specify the OpenWeather API key for accessing weather information]),
+	[WEATHER_API_KEY="$withval"],
+	[WEATHER_API_KEY=""])
+# Fallback to deprecated developer OpenWeather API key option string, if obsolete option is specified.
+warning_msg=""
+AC_ARG_WITH([weather-dev-key],
+	AS_HELP_STRING([--with-weather-dev-key=KEY], [DEPRECATED: Legacy API key for accessing weather information]),
+	[if test -z "$WEATHER_API_KEY"; then
+		WEATHER_API_KEY="$withval"
+		warning_msg="Using deprecated option --with-weather-dev-key. Please switch to --with-weather-api-key."
+	fi])
+
+# Output the result of the OpenWeather API key check
+if test -z "$WEATHER_API_KEY"; then
+	result_msg="no"
+else
+	# Display shortened and masked OpenWeather API key
+	discrete_key=`echo $WEATHER_API_KEY | cut -c1-7`
+	result_msg="yes [$discrete_key***]"
+fi
+AC_MSG_RESULT([$result_msg])
+
+# Output the warning separately if present
+if test -n "$warning_msg"; then
+	AC_MSG_WARN([$warning_msg])
+fi
+AC_DEFINE_UNQUOTED([WEATHER_API_KEY], ["$WEATHER_API_KEY"], [OpenWeather API key])
+
+# Configuration for used OpenWeather API version
+AC_MSG_CHECKING([for OpenWeather API version])
+AC_ARG_WITH([weather-api-version],
+	AS_HELP_STRING([--with-weather-api-version=VERSION], [Specify the OpenWeather API version]),
+	[WEATHER_API_VERSION="$withval"],
+	[WEATHER_API_VERSION=""])
+if test -z "$WEATHER_API_VERSION"; then
+	AC_MSG_RESULT([no])
+else
+	AC_MSG_RESULT([yes $WEATHER_API_VERSION])
+fi
+AC_DEFINE_UNQUOTED([WEATHER_API_VERSION], ["$WEATHER_API_VERSION"], [OpenWeather API version])
+
+# Handle optional GUI managed OpenWeather API key
+AC_ARG_ENABLE([weather-key-manage],
+	AS_HELP_STRING([--enable-weather-key-manage], [Enable management of the OpenWeather API key via a GUI @<:@default=no@:>@. Warning: Enabling this feature may expose the key to users!]),
+	[enable_weather_key_manage="$enableval"],
+	[enable_weather_key_manage="no"])
+if test "$enable_weather_key_manage" = "yes"; then
+	AC_DEFINE([ENABLE_WEATHER_KEY_MANAGE], 1, [Enable management of the OpenWeather API key via GUI])
+	AC_MSG_WARN([Warning: Enabling GUI management for OpenWeather API key is enabled. This may expose the key to users!])
+fi
+## END: OpenWeather API key
+
+## TMDb API key
+# Check and configure the TMDb API key
+AC_MSG_CHECKING([for TMDb API key])
+AC_ARG_WITH([tmdb-api-key],
+	AS_HELP_STRING([--with-tmdb-api-key=KEY], [Specify the TMDb API key for accessing movie information]),
+	[TMDB_API_KEY="$withval"],
+	[TMDB_API_KEY=""])
+# Fallback to deprecated TMDb API key option string, if obsolete option is specified.
+warning_msg=""
+AC_ARG_WITH([tmdb-dev-key],
+	AS_HELP_STRING([--with-tmdb-dev-key=KEY], [DEPRECATED: Legacy API dev key, it's obsolete, use --with-tmdb-api-key=KEY]),
+	[if test -z "$TMDB_API_KEY"; then
+		TMDB_API_KEY="$withval"
+		warning_msg="Using deprecated option --with-tmdb-dev-key. Please switch to --with-tmdb-api-key."
+	fi])
+
+# Output the result of the TMDb API key check
+if test -z "$TMDB_API_KEY"; then
+	result_msg="no"
+else
+	# Display shortened and masked TMDb API key
+	discrete_key=`echo $TMDB_API_KEY | cut -c1-7`
+	result_msg="yes [$discrete_key***]"
+fi
+AC_MSG_RESULT([$result_msg])
+
+# Output the warning separately if present
+if test -n "$warning_msg"; then
+	AC_MSG_WARN([$warning_msg])
+fi
+
+AC_DEFINE_UNQUOTED([TMDB_API_KEY], ["$TMDB_API_KEY"], [TMDB API key])
+
+# Handle optional GUI managed TMDb API key
+AC_ARG_ENABLE([tmdb-key-manage],
+	AS_HELP_STRING([--enable-tmdb-key-manage], [Enable management of the TMDb API key via a GUI @<:@default=no@:>@. Warning: Enabling this feature may expose the key to users!]),
+	[enable_tmdb_key_manage="$enableval"],
+	[enable_tmdb_key_manage="no"])
+if test "$enable_tmdb_key_manage" = "yes"; then
+	AC_DEFINE([ENABLE_TMDB_KEY_MANAGE], 1, [Enable management of the TMDb API key via GUI])
+	AC_MSG_WARN([Warning: Enabling GUI management for the TMDb API key is enabled. This may expose the key to users!])
+fi
+## END: TMDb API key
+
+## OMDb API key
+# Check and configure the OMDb API key
+AC_MSG_CHECKING([for OMDb API key])
+AC_ARG_WITH([omdb-api-key],
+	AS_HELP_STRING([--with-omdb-api-key=KEY], [Specify the OMDb API key for accessing IMDb movie information]),
+	[OMDB_API_KEY="$withval"],
+	[OMDB_API_KEY=""])
+
+# Output the result of the OMDb API key check
+if test -z "$OMDB_API_KEY"; then
+	result_msg="no"
+else
+	# Display shortened and masked OMDb API key
+	discrete_key=`echo $OMDB_API_KEY | cut -c1-7`
+	result_msg="yes [$discrete_key***]"
+fi
+AC_MSG_RESULT([$result_msg])
+
+AC_DEFINE_UNQUOTED([OMDB_API_KEY], ["$OMDB_API_KEY"], [OMDb API key])
+
+# Handle optional GUI managed OMDb API key
+AC_ARG_ENABLE([omdb-key-manage],
+	AS_HELP_STRING([--enable-omdb-key-manage], [Enable management of the OMDb API key via a GUI @<:@default=no@:>@. Warning: Enabling this feature may expose the key to users!]),
+	[enable_omdb_key_manage="$enableval"],
+	[enable_omdb_key_manage="no"])
+if test "$enable_omdb_key_manage" = "yes"; then
+	AC_DEFINE([ENABLE_OMDB_KEY_MANAGE], 1, [Enable management of the OMDb API key via GUI])
+	AC_MSG_WARN([Warning: Enabling GUI management for the OMDb API key is enabled. This may expose the key to users!])
+fi
+## END: OMDb API key
+
+## Shoutcast Developer ID
+# Check and configure the Shoutcast Developer ID
+AC_MSG_CHECKING([for Shoutcast Develper ID])
+AC_ARG_WITH([shoutcast-dev-id],
+	AS_HELP_STRING([--with-shoutcast-dev-id=ID], [Specify the Shoutcast Developer ID for accessing streaming service information]),
+	[SHOUTCAST_DEV_ID="$withval"],
+	[SHOUTCAST_DEV_ID=""])
+
+# Fallback for deprecated Shoutcast Dev key option string, if obsolete option is specified.
+warning_msg=""
+AC_ARG_WITH([shoutcast-dev-key],
+	AS_HELP_STRING([--with-shoutcast-dev-key=KEY], [DEPRECATED: Legacy API dev key, it's obsolete, use --with-shoutcast-dev-id instead]),
+	[if test -z "$SHOUTCAST_DEV_ID"; then
+		SHOUTCAST_DEV_ID="$withval"
+		warning_msg="Using deprecated option --with-shoutcast-dev-key. Please switch to --with-shoutcast-dev-id."
+	fi])
+
+# Output the result of the Shoutcast Developer ID check
+if test -z "$SHOUTCAST_DEV_ID"; then
+	result_msg="no"
+else
+	# Display shortened and masked Shoutcast Developer ID
+	discrete_key=`echo $SHOUTCAST_DEV_ID | cut -c1-7`
+	result_msg="yes [$discrete_key***]"
+fi
+AC_MSG_RESULT([$result_msg])
+
+# Output the warning separately if present
+if test -n "$warning_msg"; then
+	AC_MSG_WARN([$warning_msg])
+fi
+
+AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_ID], ["$SHOUTCAST_DEV_ID"], [Shoutcast Developer ID])
+
+# Handle optional GUI managed Shoutcast Developer ID
+AC_ARG_ENABLE([shoutcast-id-manage],
+	AS_HELP_STRING([--enable-shoutcast-id-manage], [Enable management of the Shoutcast Developer ID via a GUI @<:@default=no@:>@. Warning: Enabling this feature may expose the ID to users!]),
+	[enable_shoutcast_id_manage="$enableval"],
+	[enable_shoutcast_id_manage="no"])
+# Fallback for deprecated Shoutcast Dev key GUI management option, if present
+AC_ARG_ENABLE([shoutcast-key-manage],
+	AS_HELP_STRING([--enable-shoutcast-key-manage], [DEPRECATED: Use --enable-shoutcast-id-manage instead]),
+	[AC_MSG_WARN([Using deprecated option --enable-shoutcast-key-manage. Please switch to --enable-shoutcast-id-manage.])
+	enable_shoutcast_id_manage="$enableval"],
+	[])
+
+if test "$enable_shoutcast_id_manage" = "yes"; then
+	AC_DEFINE([ENABLE_SHOUTCAST_ID_MANAGE], 1, [Enable management of the Shoutcast Developer ID via GUI])
+	AC_MSG_WARN([Warning: Enabling GUI management for the Shoutcast Developer ID is enabled. This may expose the ID to users!])
+fi
+# END: Shoutcast Developer ID
+
+## YouTube API key
+# Check and configure the YouTube API key
+AC_MSG_CHECKING([for YouTube API key])
+AC_ARG_WITH([youtube-api-key],
+	AS_HELP_STRING([--with-youtube-api-key=KEY], [Specify the YouTube API key for accessing streaming services]),
+	[YOUTUBE_API_KEY="$withval"],
+	[YOUTUBE_API_KEY=""])
+# Fallback for deprecated developer key if no new key is specified
+warning_msg=""
+AC_ARG_WITH([youtube-dev-key],
+	AS_HELP_STRING([--with-youtube-dev-key=KEY], [DEPRECATED: Legacy API dev key, use --with-youtube-api-key instead]),
+	[if test -z "$YOUTUBE_API_KEY"; then
+		YOUTUBE_API_KEY="$withval"
+		warning_msg="Using deprecated option --with-youtube-dev-key. Please switch to --with-youtube-api-key."
+	fi])
+
+# Output the result of the YouTube API key check
+if test -z "$YOUTUBE_API_KEY"; then
+	result_msg="no"
+else
+	# Display shortened and masked YouTube API key
+	discrete_key=`echo $YOUTUBE_API_KEY | cut -c1-7`
+	result_msg="yes [$discrete_key***]"
+fi
+AC_MSG_RESULT([$result_msg])
+
+# Output the warning separately if present
+if test -n "$warning_msg"; then
+	AC_MSG_WARN([$warning_msg])
+fi
+
+AC_DEFINE_UNQUOTED([YOUTUBE_API_KEY], ["$YOUTUBE_API_KEY"], [YouTube API key])
+
+# Handle optional GUI managed YouTube API key
+AC_ARG_ENABLE([youtube-key-manage],
+	AS_HELP_STRING([--enable-youtube-key-manage], [Enable management of the YouTube API key via a GUI @<:@default=no@:>@. Warning: Enabling this feature may expose the key to users!]),
+	[enable_youtube_key_manage="$enableval"],
+	[enable_youtube_key_manage="no"])
+if test "$enable_youtube_key_manage" = "yes"; then
+	AC_DEFINE([ENABLE_YOUTUBE_KEY_MANAGE], 1, [Enable management of the YouTube API key via GUI])
+	AC_MSG_WARN([Warning: Enabling GUI management for the YouTube API key is enabled. This may expose the key to users!])
+fi
+## END: YouTube API key
+
 AC_ARG_ENABLE(keyboard-no-rc,
 	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
 	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))
@@ -171,6 +444,16 @@ AC_ARG_ENABLE(fastscan,
 	AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code]))
 AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")

+AC_ARG_ENABLE(aitscan,
+	AS_HELP_STRING([--enable-aitscan], [enable Application Information Table support @<:@default=yes@:>@]),
+	[enable_aitscan="$enableval"],
+	[enable_aitscan="yes"])
+
+if test "$enable_aitscan" = "yes"; then
+	AC_DEFINE(ENABLE_AITSCAN, 1, [enable Application Information Table support])
+fi
+AM_CONDITIONAL(ENABLE_AITSCAN, test "$enable_aitscan" = "yes")
+
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
@@ -196,11 +479,36 @@ if test "$enable_upnp" = "yes"; then
 fi
 AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")

+AC_ARG_ENABLE(arm-acc,
+	AS_HELP_STRING([--enable-arm-acc], [enable arm hardware acceleration @<:@default=yes@:>@]]),
+	[enable_arm_acc="$enableval"],
+	[enable_arm_acc="yes"])
+
+if test "$enable_arm_acc" = "yes"; then
+	AC_DEFINE(ENABLE_ARM_ACC, 1, [enable arm hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_ARM_ACC, test "$enable_arm_acc" = "yes")
+
+AC_ARG_ENABLE(mips-acc,
+	AS_HELP_STRING([--enable-mips-acc], [enable mips hardware acceleration @<:@default=yes@:>@]]),
+	[enable_mips_acc="$enableval"],
+	[enable_mips_acc="yes"])
+
+if test "$enable_mips_acc" = "yes"; then
+	AC_DEFINE(ENABLE_MIPS_ACC, 1, [enable mips hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_MIPS_ACC, test "$enable_mips_acc" = "yes")
+
 AC_ARG_ENABLE(extupdate,
 	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))
 AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes")

+AC_ARG_ENABLE(pkg-management,
+	AS_HELP_STRING([--enable-pkg-management], [enable gui package management @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_PKG_MANAGEMENT, 1, [enable package management]))
+AM_CONDITIONAL(ENABLE_PKG_MANAGEMENT, test "$enable_pkg_management" = "yes")
+
 AC_ARG_ENABLE(lua,
 	AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]),
 	[enable_lua="$enableval"],
@@ -208,19 +516,20 @@ AC_ARG_ENABLE(lua,

 if test "$enable_lua" = "yes"; then
 	AC_DEFINE(ENABLE_LUA, 1, [include Lua support])
-	PKG_CHECK_MODULES([LUA], [lua >= 5.2], [
-		echo "lua >= 5.2 found"
-	], [
-		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], [
-			echo "lua5.2 found"
-		], [
+	PKG_CHECK_MODULES(LUA, lua, LLUA="yes", LLUA="no")
+	PKG_CHECK_MODULES(luajit, luajit, LLUAJIT="yes", LLUAJIT="no")
+		if test "x$LLUAJIT" = "xyes"; then
+			LUA_LIBS="-lluajit-5.1"
+			AC_DEFINE(LUA_COMPAT_5_2, 1, [needed for build with lua 5.1])
+		elif test "x$LLUA" = "xyes"; then
+			LUA_LIBS="-llua"
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		else
 			echo "lualib not found, assuming static lua in linker path..."
 			LUA_LIBS="-llua -ldl"
 			AC_DEFINE(STATIC_LUAPOSIX, 1, [Define to 1 for static lua build.])
-		])
-	])
-	# hack...
-	AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+])
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		fi
 fi
 AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")

@@ -231,6 +540,23 @@ AC_ARG_ENABLE(cleanup,
 AC_ARG_ENABLE(pip,
 	AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support]))
+AM_CONDITIONAL(ENABLE_PIP, test "$enable_pip" = "yes")
+
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse)
+		AC_ARG_ENABLE(quadpip,
+			AS_HELP_STRING([--enable-quadpip], [enable quad picture in picture support @<:@default=no@:>@]),
+			AC_DEFINE(ENABLE_QUADPIP, 1, [enable quad picture in picture support]))
+
+		AS_IF(test "$enable_quadpip" = "yes" -a "$enable_pip" != "yes",
+			AC_MSG_ERROR([--enable-quadpip depends on --enable-pip]))
+	;;
+esac
+AM_CONDITIONAL(ENABLE_QUADPIP, test "$enable_quadpip" = "yes")
+
+AC_ARG_ENABLE(dynamicdemux,
+	AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]),
+	AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux]))

 AC_ARG_ENABLE(testing,
 	AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]),
@@ -242,8 +568,52 @@ AC_ARG_ENABLE(fribidi,
 	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]))
 AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")

+# default theme
+AC_ARG_WITH(default-theme,
+	AS_HELP_STRING([--with-default-theme=THEMENAME], [default theme for gui @<:@default is empty@:>@]),
+	[default_theme="$withval"],
+	[default_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [default theme for gui])
+
+# default oled theme
+AC_ARG_WITH(default-oled-theme,
+	AS_HELP_STRING([--with-default-oled-theme=THEMENAME], [default theme for oled @<:@default is empty@:>@]),
+	[default_oled_theme="$withval"],
+	[default_oled_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [default theme for oled])
+
+AC_ARG_ENABLE(change-osd-resolution,
+	AS_HELP_STRING([--enable-change-osd-resolution], [enable to change osd resolution @<:@default=yes@:>@]]),
+	[enable_change_osd_resolution="$enableval"],
+	[enable_change_osd_resolution="yes"])
+
+# BOXMODELs that *not* allows to change osd resolution
+case "$BOXMODEL" in
+	hd1)
+		if test "$enable_change_osd_resolution" = "yes"; then
+			AC_MSG_WARN([--enable-change-osd-resolution=yes is not allowed for boxmodel $BOXMODEL])
+			enable_change_osd_resolution="no"
+		fi
+	;;
+esac
+
+if test "$enable_change_osd_resolution" = "yes"; then
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
+fi
+AM_CONDITIONAL(ENABLE_CHANGE_OSD_RESOLUTION, test "$enable_change_osd_resolution" = "yes")
+
+# webif content
+AC_ARG_WITH(webif,
+	AS_HELP_STRING([--without-webif], [disable installation of webif content within defined public httpd path provided by yWeb @<:@default it is enabled@:>@]),
+	[ENABLE_WEBIF="$withval"],
+	[ENABLE_WEBIF="yes"])
+AM_CONDITIONAL(ENABLE_WEBIF,test "$ENABLE_WEBIF" = "yes")
+if test "$ENABLE_WEBIF" = "yes"; then
+	AC_DEFINE(ENABLE_WEBIF, 1, [Enable installation of webif content within defined public httpd path provided by yWeb.])
+fi
+
 AC_ARG_WITH(stb-hal-includes,
-	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]),
+	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path to libstb-hal includes [[NONE]]]),
 	[STB_HAL_INC="$withval"],
 	[STB_HAL_INC=""])

@@ -252,24 +622,39 @@ AC_ARG_WITH(stb-hal-build,
 	[STB_HAL_LIB="-L$withval"],
 	[STB_HAL_LIB=""])

-if test "$BOXTYPE" != coolstream; then
-	AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal])
+AC_ARG_WITH(libcoolstream-static-dir,
+	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path to static libcoolstream [[NONE]]]),
+	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
+	[LIBCOOLSTREAM_STATIC_DIR=""])
+
+AC_ARG_ENABLE(libcoolstream-static,
+	AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
+AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
+
+# BOXTYPEs that use libstb-hal
+case "$BOXTYPE" in
+	coolstream)
+		libstb_hal=no
+	;;
+	*)
+		libstb_hal=yes
+		AC_DEFINE(HAVE_LIBSTB_HAL, 1, [use libstb-hal])
+	;;
+esac
+AM_CONDITIONAL(HAVE_LIBSTB_HAL, test "$libstb_hal" = "yes")
+
+if test "$libstb_hal" = "yes"; then
 	if test "$STB_HAL_INC" = ""; then
 		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
 	fi
 	HWLIB_CFLAGS="-I$STB_HAL_INC"
-fi
-AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
-
-if test "$BOXTYPE" = "coolstream"; then
+else
 	if test "$BOXMODEL" = "hd1"; then
 		if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
 			AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the <nevis_ir.h> header file.])
 		fi
 		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream'
-	fi
-
-	if test "$BOXMODEL" = "hd2"; then
+	elif test "$BOXMODEL" = "hd2"; then
 		if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then
 			AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the <cs_ir_generic.h> header file.])
 		fi
@@ -278,11 +663,12 @@ if test "$BOXTYPE" = "coolstream"; then
 		fi
 		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
 	fi
-
-	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi

+# uclibc
+AM_CONDITIONAL(HAVE_UCLIBC, $CC --version | grep -q "uclibc")
+
 # hack, so that framebuffer.h does not need to be included everywhere...
 AC_DEFINE(fb_pixel_t, uint32_t, [hack, so that framebuffer.h does not need to be included everywhere...])

@@ -305,16 +691,21 @@ AC_SUBST(STB_HAL_LIB)
 AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIBS)
 AC_SUBST(BLURAY_LIBS)
+AC_SUBST(LIBCOOLSTREAM_STATIC_DIR)

-AC_OUTPUT([
+# Makefiles
+AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/config/Makefile
+data/control/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/icons/buttons/Makefile
 data/icons/filetypes/Makefile
 data/icons/headers/Makefile
 data/icons/hints/Makefile
+data/icons/hourglass/Makefile
 data/icons/locale/Makefile
 data/icons/movieplayer/Makefile
 data/icons/radar/Makefile
@@ -325,21 +716,36 @@ data/icons/status/channel/Makefile
 data/icons/status/markers/Makefile
 data/icons/status/various/Makefile
 data/icons/various/Makefile
+data/icons/weather/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
 data/lcd/Makefile
 data/lcd/clock/Makefile
 data/lcd/icons/Makefile
+data/lcd4l/Makefile
 data/license/Makefile
 data/locale/Makefile
-data/neutrino-scripts/Makefile
+data/luaplugins/Makefile
+data/oled/Makefile
+data/oled/fonts/Makefile
+data/oled/icons/Makefile
+data/oled/icons/clock/Makefile
+data/oled/icons/weather/Makefile
+data/oled/themes/Makefile
+data/oled/themes/220x176/Makefile
+data/oled/themes/400x240/Makefile
+data/oled/themes/480x320/Makefile
+data/oled/themes/800x480/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
 data/policy/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/themes/Grey-3.0/Makefile
+data/themes/Grey-3.0/icons/Makefile
+data/themes/Grey-3.0/icons/buttons/Makefile
 data/themes/Grey-Blue/Makefile
 data/themes/Grey-Blue/icons/Makefile
 data/themes/Grey-Blue/icons/buttons/Makefile
@@ -349,16 +755,21 @@ data/themes/Neutrino-3.0/icons/buttons/Makefile
 data/themes/Olive-3.0/Makefile
 data/themes/Olive-3.0/icons/Makefile
 data/themes/Olive-3.0/icons/buttons/Makefile
+data/weather/Makefile
+data/webradio/Makefile
+data/webtv/Makefile
 data/y-web/Makefile
 data/y-web/images/Makefile
 data/y-web/languages/Makefile
 data/y-web/scripts/Makefile
 data/y-web/styles/Makefile
+data/zapit/Makefile
 lib/Makefile
 lib/connection/Makefile
 lib/hardware/coolstream/Makefile
 lib/jsoncpp/Makefile
 lib/libconfigfile/Makefile
+lib/liblcddisplay/Makefile
 lib/libdvbsub/Makefile
 lib/libeventserver/Makefile
 lib/libiw/Makefile
@@ -374,18 +785,18 @@ src/Makefile
 src/daemonc/Makefile
 src/driver/Makefile
 src/driver/audiodec/Makefile
+src/driver/glcd/Makefile
 src/driver/pictureviewer/Makefile
 src/eitd/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
 src/gui/components/Makefile
 src/gui/lua/Makefile
+src/gui/moviedb/Makefile
 src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
 src/gui/widget/yaft/Makefile
-src/lcddisplay/Makefile
 src/nhttpd/Makefile
-src/nhttpd/nhttpd.conf
 src/nhttpd/tuxboxapi/Makefile
 src/nhttpd/yhttpd_core/Makefile
 src/nhttpd/yhttpd_mods/Makefile
@@ -394,7 +805,56 @@ src/system/mtdutils/Makefile
 src/system/mtdutils/lib/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
-src/zapit/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
 ])
+
+# Webserver config
+AC_CONFIG_FILES([
+src/nhttpd/nhttpd.conf
+])
+
+## Migration script
+#AC_CONFIG_FILES([
+#data/control/migration.sh
+#])
+
+# Backup scripts
+AC_CONFIG_FILES([
+data/scripts/backup.sh
+data/scripts/restore.sh
+data/scripts/backup_flash.sh
+data/scripts/restore_flash.sh
+])
+
+if test "$BOXTYPE" = "generic"; then
+	AC_CONFIG_FILES([
+	data/scripts/neutrino.sh
+	])
+fi
+
+# Backup configs
+AC_CONFIG_FILES([
+data/config/settingsupdate.conf
+data/config/tobackup.conf
+])
+
+# Themes
+#AC_CONFIG_FILES([
+#data/themes/Material_Blue-Grey.theme
+#])
+
+# Oled themes
+AC_CONFIG_FILES([
+data/oled/themes/220x176/Default.otheme
+data/oled/themes/400x240/Default.otheme
+data/oled/themes/480x320/Default.otheme
+data/oled/themes/480x320/Advanced.otheme
+data/oled/themes/480x320/Easy.otheme
+data/oled/themes/480x320/Medium.otheme
+data/oled/themes/480x320/Simple.otheme
+data/oled/themes/480x320/Weather.otheme
+data/oled/themes/800x480/Default.otheme
+])
+
+AC_OUTPUT
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,6 @@
 SUBDIRS = \
+	config \
+	control \
 	fonts \
 	icons \
 	inetradio \
@@ -6,31 +8,31 @@ SUBDIRS = \
 	iso-codes \
 	license \
 	locale \
-	neutrino-scripts \
 	pictures \
 	policy \
 	scripts \
 	themes \
-	y-web
+	weather \
+	webradio \
+	webtv \
+	zapit

-if BOXTYPE_TRIPLE
-SUBDIRS += lcd
+if ENABLE_LUA
+SUBDIRS += \
+	luaplugins
 endif

-configdir = $(CONFIGDIR)
+if ENABLE_LCD4LINUX
+SUBDIRS += \
+	lcd4l
+endif

-config_DATA = \
-	bad_package_pattern.list.sample \
-	cables.xml \
-	encoding.conf \
-	epglanguages.conf \
-	myservices.xml \
-	providermap.xml \
-	satellites.xml \
-	settingsupdate.conf \
-	terrestrial.xml \
-	tobackup.conf \
-	webradio_usr.xml \
-	webtv_usr.xml
-install-data-hook:
-	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
+if ENABLE_GRAPHLCD
+SUBDIRS += \
+	oled
+endif
+
+if ENABLE_WEBIF
+SUBDIRS += \
+	y-web
+endif
--- a/data/config/Makefile.am
+++ b/data/config/Makefile.am
@@ -0,0 +1,22 @@
+EXTRA_DIST = \
+	tobackup.conf tobackup.conf.in
+
+installdir = $(CONFIGDIR)
+
+install_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	providermap.xml \
+	satellites.xml \
+	terrestrial.xml \
+	tobackup.conf
+
+if ENABLE_EXTUPDATE
+EXTRA_DIST += \
+	settingsupdate.conf settingsupdate.conf.in
+
+install_DATA += \
+	settingsupdate.conf
+endif
--- a/data/config/bad_package_pattern.list.sample
+++ b/data/config/bad_package_pattern.list.sample
@@ -1,95 +1,111 @@
 ^locale-base-
 ^perl-module-
-acl-
+acl
+alsa-utils-
+attr
 attr-
+autoconf
 autofs-
+alsa-server
+avahi
+base-files
 base-passwd-
 bash-
+bluez5-
+boost-
+bsd
 busybox-
+catchsegv
+coreutils-
 -charmap-
+cups
 db-
 -dbg$
 -dev$
 -doc$
+dvb-
 e2fsprogs-
+elfutils
+enca
 fbset-
-fftwf-
-fftwl-
+fftw
 firmware-
-flex-
+flex
+fontconfig
 -gconv-
-gettext-
+gdb
+gettext
 git-
 gitweb
 glibc-
+gstreamer1.0-
 initscripts-
+icu
+iproute2-
+iptables-
+jpeg-tools
 kbd-
-kernel-
+kernel
 kmod-
-krb5-
-libaio-
-libao-
-libasn-
-libavahi-
-libbluray-
-libc6-
-libcairo-
-libcli-
-libdbus-
-libdcerpc-
-libdrm-
-liberation-fonts
-libexpat-
-libfftwf
-libfif-
-libfribidi-
-libgdbm-
-libgdk-
-libglib-
-libgnutls-
-libharfbuzz-
-libinput-
-libldap-
-libndr-
-libnl-
-libnss-
-libsal2-
-libsmb$
-libstb-
-libtiff-
-libx264-
-libxml2-
-libxslt-
+kodi-
+krb5
+ldd
+lib
 -locale-
 -localedata-
+lttng
 lua-
+m4
 mc-
-mtd-utils-
-ncurses-
+mdadm
+mtd-utils
+ncurses
 nfs-utils-
+nscd
+nss
 ntfs-3g-
 ntp-
 openssh-
 openssl-
 opkg-
+os
 pam-
+pango
+pci
+pcr
 pcsc-lite-
 perl-
+pps
 -ptest$
+pulseaudio-
 python-
 python3-
+qemu
+qt
+rsvg
 samba-
 -samba4
 shadow-
 shared-mime-info-
+sln
+sntp
+sqlite
+-src
 -staticdev$
+sysfs
 systemd-
+tar-rmt
+tcp-wrappers
 tzdata-
+tzcode
 udev-
 usbutils-
 util-linux-
+util-macros
 wayland-
 webmin-
 weston-
+wiper
 wpa-supplicant-
+xz
 zsh-
--- a/data/config/cables.xml
+++ b/data/config/cables.xml
@@ -184,41 +184,6 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="TeleColumbus Berlin" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-	</cable>
 	<cable name="Unitymedia" satfeed="true" flags="9">
 		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -266,64 +231,6 @@
 		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="Primacom Sat Einspeisung" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="842000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Primacom Glasfasernetz" satfeed="true" flags="9">
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-	</cable>
 	<cable name="NetCologne MultiKabel" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -395,14 +302,15 @@
 		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="WTC SN" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+	<cable name="PYUR" satfeed="true" flags="9">
+		<transponder frequency="262000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="270000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="278000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="294000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -424,7 +332,6 @@
 		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -433,11 +340,10 @@
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Göltzschtalbrücke" satfeed="true" flags="9">
 		<transponder frequency="218000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1388,14 +1294,27 @@
 		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="OstTelCom GmbH" satfeed="true" flags="9">
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1405,24 +1324,6 @@
 		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1435,38 +1336,34 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-	</cable>
-	<cable name="CST Berlin" satfeed="true" flags="9">
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="850000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="858000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Ziggo Groningen" satfeed="true" flags="9" nid="9700">
 		<transponder frequency="369000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="Ziggo noord-holland" satfeed="true" flags="9" nid="8888">
+	<cable name="Ziggo Noord-Holland" satfeed="true" flags="9" nid="8888">
 		<transponder frequency="514000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="Ziggo Zuid-holland" satfeed="true" flags="9" nid="5555">
+	<cable name="Ziggo Zuid-Holland" satfeed="true" flags="9" nid="5555">
 		<transponder frequency="372000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="Upc Brabant" satfeed="true" flags="9" nid="43144">
--- a/data/config/encoding.conf
+++ b/data/config/encoding.conf
@@ -0,0 +1,102 @@
+#
+# Fallback encoding when dvb-text doesn't provide an encoding table.
+# See CountryCodeDefaultMapping in edvbstring code.
+#
+# Format:
+#Countrycode ISO8859-X
+#
+#chn ISO3166-2
+#
+# -----------------------------------------------------------------------------
+#
+# Table of transponder using two byte char mappings.
+# See TransponderUseTwoCharMapping in edvbstring code.
+#
+# Format:
+#TSID ONID
+#
+# plustelka DVB-T/T2
+0x0101 0x22bf #DVBT SK Mux1
+0x0102 0x22bf #DVBT SK Mux2
+0x0103 0x22bf #DVBT SK Mux3
+0x0104 0x22bf #DVBT SK Mux4
+# skylink 23.5°E
+0x0c82 0x0003 #ASTRA 11739.00 V Cartoonito
+0x0c89 0x0003 #ASTRA 11875.50 H
+0x0c8c 0x0003 #ASTRA 11934.00 V
+0x0c8d 0x0003 #ASTRA 11953.50 H
+0x0c8e 0x0003 #ASTRA 11973.00 V
+0x0c90 0x0003 #ASTRA 12012.00 V
+0x0c91 0x0003 #ASTRA 12031.50 H
+0x0c93 0x0003 #ASTRA 12070.50 H
+0x0c94 0x0003 #ASTRA 12090.00 V
+0x0c95 0x0003 #ASTRA 12109.50 H
+0x0ca1 0x0003 #ASTRA 12343.50 H
+0x0ca2 0x0003 #ASTRA 12363.00 V
+# DirectOne 0.8°W
+0x0003 0x0001 #freesat 12130.00 H Dikh TV,Film 4,Galaxy 4,Match 4
+0x0004 0x0001 #freesat 12187.00 V OzoneNetwork
+0x0005 0x0001 #freesat 11785.00 H Spektrum Home
+0x0005 0x1111 #freesat 11747.00 H Filmbox Basic
+0x000b 0x1111 #freesat 12092.00 H AXN Black,AXN CE,AXN CZ,AXN White,Nat Geo HD,Viasat 2,Viasat 3.,Viasat 6.,Viasat Film
+0x000c 0x0001 #freesat 11900.00 H HBO 3 HU,M4 Sport
+0x000d 0x0001 #freesat 11823.00 H M1 HD,MATCH4 HD
+0x001b 0x02c0 #freesat 12226.00 V Comedy Central Family Hungary,Comedy Central Hungary,MTV Europe,Nickelodeon,Paramount Network
+0x0029 0x0046 #freesat 12015.00 H BBC Earth HD
+0x004c 0x0046 #freesat 12149.00 V History
+0x02bd 0x0600 #freesat 11727.48 V
+0x02be 0x0600 #freesat 11765.84 V
+0x02bf 0x0600 #freesat 11803.90 V
+0x02c0 0x0600 #freesat 11996.00 V
+0x02c1 0x0600 #freesat 12034.36 V
+0x02c2 0x0600 #freesat 12073.72 V
+0x02c3 0x0600 #freesat 11938.46 H
+0x02c5 0x0600 #freesat 12264.52 V
+0x02c6 0x0600 #freesat 11842.56 V
+0x02c7 0x0600 #freesat 11919.28 V
+0x02c8 0x0600 #freesat 11958.00 V
+0x02c9 0x0600 #freesat 12207.00 H
+0x02ca 0x0600 #freesat 12284.00 H
+0x0af7 0x00bb #freesat 12563.00 H Epic Drama HD,JOJ 24,Nova Cinema HD
+0x0af8 0x00bb #freesat 12527.00 H Film+ SK,Spektrum SK HD,Minimax SK
+0x0afa 0x00bb #freesat 12563.00 V RTVS Sport HD,TV Barrandov
+#
+# -----------------------------------------------------------------------------
+#
+# Fallback encoding table for following transponders.
+# See TransponderDefaultMapping in edvbstring code.
+#
+# Format:
+#TSID ONID ISO8859-X
+#
+# Digiturk 42°E
+0x0001 0x002a ISO8859-9 #Digiturk 11977 H CARTOON NETWORK,SHOW RADYO,RADYO VIVA
+0x0003 0x002a ISO8859-9 #Digiturk 12034 V SUPER FM,JOY TURK FM,JOY FM RADYO,TELE 1 HD
+0x0007 0x002a ISO8859-9 #Digiturk 12245 H KANAL D HD,CNN TURK HD,LIDER HABER HD,TEVE 2 HD
+0x003d 0x002a ISO8859-9 #Digiturk 11096 H TRT AVAZ HD,TRT AL ARABIA HD
+0x4e85 0x002a ISO8859-9 #Digiturk 11675 V
+0x76c1 0x002a ISO8859-9 #Digiturk 12729 V TV100 HD
+0x78b5 0x002a ISO8859-9 #Digiturk 11265 V
+0x7919 0x002a ISO8859-9 #Digiturk 11054 V TRT HABER HD,TRT KURDI HD,TRT TUTK HD,TRT WORLD
+0x7b0e 0x002a ISO8859-9 #Digiturk 12685 H HABER GLOBAL HD,TGRT HABER HD
+0x7bd6 0x002a ISO8859-9 #Digiturk 12685 V HALK TV HD,
+0x7d6b 0x002a ISO8859-9 #Digiturk 11012 H AL QUARAN HD,AL SUNNAH HD
+0x9c40 0x002a ISO8859-9 #Digiturk 11676 _ 0x042f,0x13cf
+0x9ca5 0x002a ISO8859-9 #Digiturk 11916 V KAFA RADYO
+0x9d6d 0x002a ISO8859-9 #Digiturk 11958 V TRT 3 SPOR HD,TRT 2 HD,TRT SPOR YILDIZ HD
+0x9e38 0x002a ISO8859-9 #Digiturk 11999 V A PARA HD,A2 HD,VAV TV HD
+0x9e99 0x002a ISO8859-9 #Digiturk 12015 H STAR TV HD,NTV HD,KRAL POP,DMAX HD,TLC HD,KRAL FM
+0x9f61 0x002a ISO8859-9 #Digiturk 12054 H MINIKA GO,ATV HD,A HABER HD,A SPORT HD
+0x9fc5 0x002a ISO8859-9 #Digiturk 12073 V
+0xa02b 0x002a ISO8859-9 #Digiturk 12103 H KANAL 7 HD,ULKE TV HD
+0xa02d 0x002a ISO8859-9 #Digiturk 12084 H TRT EBA
+0xa1b9 0x002a ISO8859-9 #Digiturk 12209 H BLOOMBERH HT HD,SHOW TV HD,HABERTURK HD
+0xa2e6 0x002a ISO8859-9 #Digiturk 12298 V ALEM FM
+0xa2e7 0x002a ISO8859-9 #Digiturk 12310 V 24 HD,360 TV HD
+0xa3ae 0x002a ISO8859-9 #Digiturk 12380 V DIYANET TV HD,BEYAZ TV HD
+0xa411 0x002a ISO8859-9 #Digiturk 12379 H DISCOVERY CHANNEL HD,beIN SPORTS HABER,BABY TV
+0xa415 0x002a ISO8859-9 #Digiturk 12356 H TV8 HD
+0xa861 0x002a ISO8859-9 #Digiturk 11794 V TRT COCUK HD,TRT SPOR HD,TRT BELGESEL HD,TRT MUZIK HD,TRT1 HD
+0xa925 0x002a ISO8859-9 #Digiturk 11837 V EKOTURK HD,SOZCU TV
+0xa929 0x002a ISO8859-9 #Digiturk 11305 V
+0xc5a8 0x002a ISO8859-9 #Digiturk 11180 H
--- a/data/config/epglanguages.conf
+++ b/data/config/epglanguages.conf
--- a/data/config/good_package_pattern.list.sample
+++ b/data/config/good_package_pattern.list.sample
@@ -0,0 +1,77 @@
+autofs$
+bash$
+bluez5$
+busybox$
+bzip2$
+ca-certificates$
+cifs-utils$
+curl$
+dosfstools$
+dvb-femon$
+e2fsprogs$
+e2fsprogs-resize2fs$
+etckeeper$
+exfat-utils$
+f2fs-tools$
+fbset$
+findutils$
+firmware$
+flash-script$
+fuse-exfat$
+glibc4
+gptfdisk$
+grep$
+gzip$
+hdparm$
+htop$
+ifupdown$
+image-config$
+imagemagick$
+kernel-module$
+kernel-modules$
+libswscale$
+libusb1$
+links$
+localedef$
+minidlna$
+nano$
+neutrino-lua-plugins$
+neutrino-mp$
+neutrino-plugins$
+nfs-utils$
+nfs-utils-client$
+ntfs-3g$
+ntfsprogs$
+ntpdate$
+ofgwrite$
+oh-my-zsh$
+openssh$
+openssl$
+opkg$
+parted$
+procps$
+proftpd$
+pulseaudio$
+pv$
+rpcbind$
+rsync$
+rt8188eu$
+rtl8192cu$
+rtl8192eu$
+samba$
+samsunglcd4linux$
+sed$
+systemd$
+tar$
+themes$
+tzdata$
+tzdata-europe$
+udev-extraconf$
+udpxy$
+usbutils$
+util-linux$
+webmin$
+wpa-supplicant$
+xupnpd$
+zip$
+zsh$
--- a/data/config/mk_terrestrial_xml.pl
+++ b/data/config/mk_terrestrial_xml.pl
--- a/data/config/providermap.xml
+++ b/data/config/providermap.xml
--- a/data/config/satellites.xml
+++ b/data/config/satellites.xml
--- a/data/config/settingsupdate.conf.in
+++ b/data/config/settingsupdate.conf.in
@@ -25,30 +25,63 @@
 ## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
 ## gekennzeichnet durch ein vorangestelltes ~
 # z.B.
-# ~/share/tuxbox/neutrino/themes/Classic.theme
+# ~@THEMESDIR@/Classic.theme
 #---------------------------------------------------------------------------


 #-------------
 ## Sicherungen
 #-------------
+@CONFIGDIR@/tobackup.conf
+@CONFIGDIR@/settingsupdate.conf
+
+@CONFIGDIR@/cables.xml
+#
+#
+#@CONFIGDIR@/FritzCallMonitor.cfg
+@CONFIGDIR@/radio-favorites.xml
+@CONFIGDIR@/radio-stations.xml
+@CONFIGDIR@/timerd.conf
+@CONFIGDIR@/satellites.xml
+@CONFIGDIR@/tuxcal/
+@CONFIGDIR@/tuxmail/
+#
+#
+@CONFIGDIR@/scan.conf
+@CONFIGDIR@/srv.conf
+@CONFIGDIR@/flex/flex_eigene_scripte.conf
+
+@ZAPITDIR@/
+
+@FLAGDIR@/
+
+#/var/bin/
+#
+#/var/log/
+#/var/root/
+#/var/xupnpd/
+
+/etc/exports
 /etc/hostname
 /etc/hosts
-/etc/network
+/etc/network/interfaces
+/etc/passwd
+/etc/profile.local
 /etc/resolv.conf
+/etc/samba/smb.conf
 /etc/wpa_supplicant.conf
-/var/etc
-/var/tuxbox/config
+
+## Persönliche Sicherungen


 #----------------------------------------------------------------------------------------
 ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
 #----------------------------------------------------------------------------------------
-/var/etc/update.urls
-/var/tuxbox/config/cables.xml
-/var/tuxbox/config/encoding.conf
-/var/tuxbox/config/providermap.xml
-/var/tuxbox/config/radio-stations.xml
-/var/tuxbox/config/satellites.xml
-/var/tuxbox/config/settingsupdate.conf
-/var/tuxbox/config/tobackup.conf
+#-/var/etc/update.urls
+#-@CONFIGDIR@/cables.xml
+#-@CONFIGDIR@/encoding.conf
+#-@CONFIGDIR@/providermap.xml
+#-@CONFIGDIR@/radio-stations.xml
+#-@CONFIGDIR@/satellites.xml
+#-@CONFIGDIR@/settingsupdate.conf
+#-@CONFIGDIR@/tobackup.conf
--- a/data/config/terrestrial.xml
+++ b/data/config/terrestrial.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- useable flags are
+	1 - Network Scan
+	2 - use BAT
+	4 - use ONIT
+	8 - skip NITs of known networks
+	and combinations of this -->
+
+<!-- this file is autogenerated by mk_terrestrial_xml.pl
+     WARNING! It is probably unsuitable for enigma! -->
+<!-- Parameters are (unfortunately, the neutrino parser does not allow default settings,
+     the default is always "0"):
+	* bandwidth:
+		"0"-8MHz "1"-7MHz "2"-6MHz "3"-AUTO 
+	* constellation:
+		"0"-QPSK "1"-QAM16 "2"-QAM32 "3"-QAM64 "4"-QAM128 "5"-QAM256 "6"-AUTO 
+	* transmission_mode:
+		"0"-2k "1"-8k "2"-AUTO 
+	* code_rate_[HL]P:
+		"0"-NONE "1"-1/2 "2"-2/3 "3"-3/4 "4"-4/5 "5"-5/6 "6"-6/7 "7"-7/8 "8"-8/9 "9"-AUTO 
+	* guard_interval:
+		"0"-1/32 "1"-1/16 "2"-1/8 "3"-1/4 "4"-AUTO 
+	* hierarchy:
+		"0"-NONE "1"-1 "2"-2 "3"-4 "4"-AUTO 	-->
+
+<locations>
+	<terrestrial name="DVB-T/T2-Auto" flags="5">
+		<transponder frequency="177500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 05 -->
+		<transponder frequency="184500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 06 -->
+		<transponder frequency="191500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 07 -->
+		<transponder frequency="198500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 08 -->
+		<transponder frequency="205500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 09 -->
+		<transponder frequency="212500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 10 -->
+		<transponder frequency="219500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 11 -->
+		<transponder frequency="226500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 12 -->
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 -->
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 -->
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 -->
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 -->
+		<transponder frequency="562000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 32 -->
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 33 -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 -->
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 37 -->
+		<transponder frequency="610000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 38 -->
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 39 -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 -->
+		<transponder frequency="634000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 41 -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 -->
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 45 -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 -->
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 49 -->
+		<transponder frequency="706000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 50 -->
+		<transponder frequency="714000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 51 -->
+		<transponder frequency="722000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 52 -->
+		<transponder frequency="730000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 53 -->
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 54 -->
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 55 -->
+		<transponder frequency="754000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 56 -->
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 57 -->
+		<transponder frequency="770000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 58 -->
+		<transponder frequency="778000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 59 -->
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 60 -->
+		<transponder frequency="794000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 61 -->
+		<transponder frequency="802000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 62 -->
+		<transponder frequency="810000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 63 -->
+		<transponder frequency="818000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 64 -->
+		<transponder frequency="826000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 65 -->
+		<transponder frequency="834000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 66 -->
+		<transponder frequency="842000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 67 -->
+		<transponder frequency="850000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 68 -->
+		<transponder frequency="858000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 69 -->
+	</terrestrial>
+	<terrestrial name="Berlin/Brandenburg (DVB-T2)" flags="5">
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 RBB1 Cottbus -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 RBB1 Berlin Frankfurt/Oder -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 freenet TV 1 Berlin -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 freenet TV 2 Berlin -->
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 33 ZDF Berlin Frankfurt/Oder -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF Cottbus -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 RBB2 Berlin Frankfurt/Oder -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 freenet TV 3 Berlin -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 RBB2 Cottbus -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 -->
+	</terrestrial>
+	<terrestrial name="Braunschweig (Broitzem+Kraftwerk) (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 freenet TV 2 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 ARD -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 ARD/Dritte -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 freenet TV 1 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Bremen-Walle/Bremerhaven (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 freenet TV 3 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 ARD/NDR -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 ZDF -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 freenet TV 1 -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 RB -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 freenet TV 2 -->
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 55 NDR/NDS -->
+	</terrestrial>
+	<terrestrial name="Duesseldorf/Ruhrgebiet (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="818000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="826000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="834000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Essen (DVB-T2)" flags="5">
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="722000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Gera (Roschuetz) (DVB-T2)" flags="5">
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 ARD -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 ARD/Dritte -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 ZDF -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 freenet TV 1 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 freenet TV 2 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Halle (Stadt) (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 ARD -->
+		<transponder frequency="610000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 38 ARD/Dritte -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 ZDF -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 freenet TV 1 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 freenet TV 2 -->
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Hamburg/Luebeck (DVB-T2)" flags="5">
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="634000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Hanau (DVB-T2)" flags="5">
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Hannover/Braunschweig (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 freenet TV 2 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 ARD/NDR -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 NDR/NDS -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 freenet TV 1 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Heidelberg/BadenBaden/Donnersberg/Pforzheim (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Kiel (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Koeln/Bonn (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />		<!-- CH 26 WDR1-Sued -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" plp_id="0"/>	<!-- CH 29 ZDF -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" plp_id="1"/>	<!-- CH 29 freenet Connect -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />		<!-- CH 35 WDR2 -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />		<!-- CH 36 freenet TV 3 -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />		<!-- CH 40 freenet TV 1 -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />		<!-- CH 40 freenet TV 2 -->
+	</terrestrial>
+	<terrestrial name="Landshut, Passau, Pfarrkirchen (DVB-T2)" flags="5">
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 ARD -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 ARD/Dritte -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 ZDF -->
+	</terrestrial>
+	<terrestrial name="Leipzig (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Muenchen/Suedbayern (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 freenet TV 2 -->
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 ARD/Dritte -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 freenet TV 1 -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Muenster/NRW (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 freenet TV 1 -->
+		<transponder frequency="562000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 32 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ARD/Dritte -->
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 39 freenet TV 3 -->
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 45 ZDF -->
+		<transponder frequency="754000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 56 freenet TV 2 -->
+	</terrestrial>
+	<terrestrial name="Nuernberg (Fernmeldeturm) (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 freenet TV 2 -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 freenet TV 3 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 ARD/Dritte -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 freenet TV 1 -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 ARD -->
+	</terrestrial>
+	<terrestrial name="Rhein-Main (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="778000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Stuttgart-Frauenkopf (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Untersberg bei Salzburg (DVB-T2)" flags="5">
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 ARD/Dritte -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+	</terrestrial>
+</locations>
--- a/data/config/tobackup.conf.in
+++ b/data/config/tobackup.conf.in
--- a/data/control/Makefile.am
+++ b/data/control/Makefile.am
@@ -0,0 +1,25 @@
+#EXTRA_DIST = \
+#	migration.sh migration.sh.in
+
+installdir = $(CONTROLDIR)
+
+install_SCRIPTS = \
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	flash.start \
+	inactivity.on \
+	\
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off
--- a/data/control/audioplayer.end
+++ b/data/control/audioplayer.end
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/audioplayer.start
+++ b/data/control/audioplayer.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/deepstandby.off
+++ b/data/control/deepstandby.off
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/deepstandby.on
+++ b/data/control/deepstandby.on
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/neutrino-scripts/flash.start
+++ b/data/neutrino-scripts/flash.start
--- a/data/control/inactivity.on
+++ b/data/control/inactivity.on
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/migration.sh.in
+++ b/data/control/migration.sh.in
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+cd @CONFIGDIR@
+if [ -e neutrino.conf ]; then
+	# remove NG leftovers
+	sed -i 's|ng_netfs_\(.*\)|netfs_\1|' neutrino.conf
+
+	# webradio_usr.xml was moved
+	sed -i "s|@CONFIGDIR@/webradio_usr.xml|@WEBRADIODIR_VAR@/webradio_usr.xml|" neutrino.conf
+	mkdir -p @WEBRADIODIR_VAR@/
+	if [ -e @CONFIGDIR@/webradio_usr.xml ]; then
+		mv @CONFIGDIR@/webradio_usr.xml @WEBRADIODIR_VAR@/
+	fi
+
+	# webtv_usr.xml was moved
+	sed -i "s|@CONFIGDIR@/webtv_usr.xml|@WEBTVDIR_VAR@/webtv_usr.xml|" neutrino.conf
+	mkdir -p @WEBTVDIR_VAR@/
+	if [ -e @CONFIGDIR@/webtv_usr.xml ]; then
+		mv @CONFIGDIR@/webtv_usr.xml @WEBTVDIR_VAR@/
+	fi
+
+	# remove all old glcd_ keywords; neutrino will add the new ones
+	if ! grep -q glcd_foreground_color neutrino.conf ; then
+		sed -i "/^glcd_/d" neutrino.conf
+	fi
+
+	sort neutrino.conf > neutrino.sort
+	mv neutrino.sort neutrino.conf
+fi
+
+if [ -e zapit/frontend.conf ]; then
+	# uni_qrg was renamed to uni_freq
+	sed -i "s|_uni_qrg=|_uni_freq=|g" @ZAPITDIR@/frontend.conf
+fi
+
+controlscripts="\
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	inactivity.on \
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off \
+"
+
+mkdir -p @CONTROLDIR_VAR@/
+for controlscript in $controlscripts; do
+	if [ -e $controlscript ]; then
+		mv $controlscript @CONTROLDIR_VAR@/
+	fi
+done
+
+# these control scripts hasn't counterparts in @CONTROLDIR_VAR@
+rm -f migration.sh
+rm -f flash.start
--- a/data/control/movieplayer.end
+++ b/data/control/movieplayer.end
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/movieplayer.start
+++ b/data/control/movieplayer.start
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/control/neutrino.start
+++ b/data/control/neutrino.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/pictureviewer.end
+++ b/data/control/pictureviewer.end
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/pictureviewer.start
+++ b/data/control/pictureviewer.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/recording.end
+++ b/data/control/recording.end
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/recording.start
+++ b/data/control/recording.start
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/control/recording.timer
+++ b/data/control/recording.timer
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/scan.start
+++ b/data/control/scan.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/scan.stop
+++ b/data/control/scan.stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/standby.off
+++ b/data/control/standby.off
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/standby.on
+++ b/data/control/standby.on
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail pause
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal pause
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -1,128 +0,0 @@
-#Fallback encoding when in dvb-text no encoding table is given
-#Countycode ISO8859-X
-tur ISO8859-9
-gre ISO8859-7
-pol ISO8859-2
-rus ISO8859-5
-bul ISO8859-5
-cn ISO3166-2
-#Table of transponder using two byte char mappings (VideoTexSuppl)
-#TSID ONID
-0x441 0x1 ISO6937 # RTL
-0x443 0x1 ISO6937 # Eurosport / RTL Austria 
-#
-#0x447 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x427 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x44b 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x4ff 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x407 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x436 0x1 #ASTRA 19.2<EFBFBD> MTV Euro - MTV Networks
-#0x42a 0x1 #ASTRA 19.2<EFBFBD> VH1 Classic - MTV Networks
-#
-#0xc23 0x3 #ASTRA 23.5<EFBFBD> CzechLink 10803H
-#0xbc7 0x3 #ASTRA 23.5<EFBFBD> CzechLink 12565H
-#0xc8b 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11914H
-#0xc8f 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11992H
-0xbc6 0x3 #ASTRA 23.5<EFBFBD> 12525V skylink
-0xc85 0x3 #ASTRA 23.5<EFBFBD> 11797H skylink
-0xc87 0x3 #ASTRA 23.5<EFBFBD> 11836H skylink*
-0xc88 0x3 #ASTRA 23.5<EFBFBD> 11856V skylink*
-0xc89 0x3 #ASTRA 23.5<EFBFBD> 11876H skylink
-0xc8a 0x3 #ASTRA 23.5<EFBFBD> 11895V skylink
-0xc8c 0x3 #ASTRA 23.5<EFBFBD> 11934V skylink*
-0xc8e 0x3 #ASTRA 23.5<EFBFBD> 11973V skylink*
-0xc93 0x3 #ASTRA 23.5<EFBFBD> 12070H skylink
-0xc95 0x3 #ASTRA 23.5<EFBFBD> 12109H skylink
-0xc98 0x3 #ASTRA 23.5<EFBFBD> 12168V skylink*
-0xc9a 0x3 #ASTRA 23.5<EFBFBD> 12207V skylink*
-0xc8b 0x3 ISO6397 # skylink 23.5<EFBFBD>E 11914 H 
-#TSID ONID
-0x1 0x601 #UPC Cable Hungary
-0x2 0x601 #UPC Cable Hungary
-0x3 0x601 #UPC Cable Hungary
-0x4 0x601 #UPC Cable Hungary
-0x5 0x601 #UPC Cable Hungary
-0x6 0x601 #UPC Cable Hungary
-0x7 0x601 #UPC Cable Hungary
-0x8 0x601 #UPC Cable Hungary
-0x9 0x601 #UPC Cable Hungary
-0xa 0x601 #UPC Cable Hungary
-0xb 0x601 #UPC Cable Hungary
-0xc 0x601 #UPC Cable Hungary
-0xd 0x601 #UPC Cable Hungary
-0xe 0x601 #UPC Cable Hungary
-0xf 0x601 #UPC Cable Hungary
-# freesat
-0x2bd 0x600 # freesat 0.8<EFBFBD>W 11727 V
-0x2be 0x600 # freesat 0.8<EFBFBD>W 11766 V
-0x2bf 0x600 # freesat 0.8<EFBFBD>W 11804 V
-0x2c0 0x600 # freesat 0.8<EFBFBD>W 11996 V
-0x2c1 0x600 # freesat 0.8<EFBFBD>W 12034 V
-0x2c2 0x600 # freesat 0.8<EFBFBD>W 12073 V
-0x2c3 0x600 # freesat 0.8<EFBFBD>W 11938 H
-0x2c4 0x600 # freesat 0.8<EFBFBD>W 12188 V
-0x2c5 0x600 # freesat 0.8<EFBFBD>W 12265 V
-0x2c6 0x600 # freesat 0.8<EFBFBD>W 11843 V
-0x2c8 0x600 # freesat 0.8<EFBFBD>W 12111 V
-0x26 0x46 # freesat 0.8<EFBFBD>W 11785 H
-0x29 0x46 # freesat 0.8<EFBFBD>W 12015 H
-0x1b 0x2c0 # freesat 0.8<EFBFBD>W 12226 V
-0x5 0x1111 # freesat 0.8<EFBFBD>W 11747 H
-0x7 0x1111 # freesat 0.8<EFBFBD>W 11976 H
-0x65 0x1771 # freesat 0.8<EFBFBD>W 12380 V
-# DigiTV
-0x1 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 H
-0x2 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12723 H
-0x3 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 H
-0x4 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12527 H
-0x5 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 H
-0x6 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 V
-0x7 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 H
-0x8 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 V
-0x9 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 V
-0xa 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 V
-0xb 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12718 V
-0xc 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 11900 H
-# Cyfra+
-200 318 #Hotbird Eutelsat (Eurosport)
-300 318 #Hotbird Eutelsat (Eurosport, Animal Pl.HD)
-400 318 #Hotbird 13.0 Cyfra+
-1000 318 #Hotbird 13.0 Grupa ITI
-1500 318 #Hotbird 13.0 Cyfra+
-1600 318 #Hotbird 13.0 Cyfra+
-2800 318 #Hotbird 13.0 MTV Networks (Comedy Central)
-7400 113 #Hotbird 13.0 Cyfrowy Polsat
-7800 113 #Hotbird 13.0 Cyfrowy Polsat
-7900 113 #Hotbird 13.0 Cyfrowy Polsat
-8100 113 #Hotbird 13.0 Universal (Cyfra+)
-8100 318 #Hotbird 13.0 Eutelsat (Universal)
-11000 318 #Hotbird 13.0 Cyfra+
-11400 318 #Hotbird 13.0 Cyfra+
-11600 318 #Hotbird 13.0 BBC HD, ITI
-11700 318 #Hotbird 13.0 Eurosport2
-11900 318 #Hotbird 13.0 Cyfra+
-12200 318 #Hotbird 13.0 Disney Channel Polska and other
-12800 318 #Hotbird 13.0 Viacom ... MTV / VH1 Polska
-13000 318 #Hotbird 13.0 BBC Polska and other
-13100 318 #Hotbird 13.0 Crime and Investigation
-13200 113 #Hotbird 13.0 Cyfrowy Polsat
-#Fallback encoding table for following transponders
-#TSID ONID ISO8859-X
-0x4fb0 0x7e ISO8859-9 # Digiturk 7<>E 10762 V
-0x5014 0x7e ISO8859-9 # Digiturk 7<>E 10803 H
-0x5078 0x7e ISO8859-9 # Digiturk 7<>E 10804 V
-0x5140 0x7e ISO8859-9 # Digiturk 7<>E 10845 V
-0x51a4 0x7e ISO8859-9 # Digiturk 7<>E 10886 H
-0x5208 0x7e ISO8859-9 # Digiturk 7<>E 10928 H
-0x526c 0x7e ISO8859-9 # Digiturk 7<>E 10887 V
-0x52d0 0x7e ISO8859-9 # Digiturk 7<>E 10928 V
-0xa0f0 0x7e ISO8859-9 # Digiturk 7<>E 11455 V
-0xc3b4 0x7e ISO8859-9 # Digiturk 7<>E 11471 H
-0xc418 0x7e ISO8859-9 # Digiturk 7<>E 11492 V
-0xc47c 0x7e ISO8859-9 # Digiturk 7<>E 11637 H
-0xc4e0 0x7e ISO8859-9 # Digiturk 7<>E 11534 V
-0xc5a8 0x7e ISO8859-9 # Digiturk 7<>E 11575 V and 42<34>E 11729 V
-0xc60c 0x7e ISO8859-9 # Digiturk 7<>E 11595 H
-0xc670 0x7e ISO8859-9 # Digiturk 7<>E 11679 H
-0xc6d4 0x7e ISO8859-9 # Digiturk 7<>E 11513 H
-0xc738 0x7e ISO8859-9 # Digiturk 7<>E 11617 V
--- a/data/epgmap.xml
+++ b/data/epgmap.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<zapit>
-	<filter channel_id="b85a1450013e0d49" new_epg_id="ac423070013e213f"/> --rai1
-	<filter channel_id="b12003ee00011072" new_epg_id="ac423070013e213f"/> --rai1
-
-	<filter channel_id="ac9630d4013e4530" new_epg_id="ac423070013e2140"/> --rai2
-	<filter channel_id="b12003ee00011073" new_epg_id="ac423070013e2140"/> --rai2
-
-	<filter channel_id="b12003ee00011074" new_epg_id="ac423070013e2141"/> --rai3
-	<filter channel_id="ac9630d4013e4531" new_epg_id="ac423070013e2141"/> --rai3
-
-	<filter channel_id="ac9630d4013e4534" new_epg_id="ac423070013e2142"/> --rai4
-
-	<filter channel_id="ac9630d4013e4533" new_epg_id="ac421518013e0ce9"/> --raisport1
-	<filter channel_id="b12003ee00011078" new_epg_id="ac423070013e2144"/> --rainews24
-
-	<filter channel_id="b4d6070800c80e26" new_epg_id="b45803fb0001283d"/> --Das Erste
-
-	<filter channel_id="aa0004210001ef10" >RTL.de</filter> --RTL HD
-	<filter channel_id="b6ba3db8013e4224" >RedlightHD.ero</filter> --Redlight HD
-</zapit>
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,10 +1,6 @@
 installdir = $(FONTDIR)

-# NOTE:
-#	pakenham.ttf is not used by neutrino.
-#	It's the default- respectively fallback-font for some classic plugins.
-#
-#	tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf).
+# NOTE: tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf)
 #	Variables neutrino_ttf and tuxtxt_ttf describe aliases for neutrino.ttf and tuxtxt.ttf.

 neutrino_ttf = neutrino.ttf
@@ -18,16 +14,27 @@ install_DATA = \
 	micron_bold.ttf \
 	micron_italic.ttf \
 	micron.ttf \
-	pakenham.ttf \
 	tuxtxt.otb


-if BOXMODEL_CS_HD2
+if BOXMODEL_CST_HD2
 install_DATA += UnDotum.ttf
 endif

+if ! BOXMODEL_CST_HD1
+# icon font
+install_DATA += \
+	fa-solid-900.ttf
+endif
+
 install-data-hook:
 	cd $(DESTDIR)$(FONTDIR); \
 		mv $(neutrino_ttf) neutrino.ttf; \
 		mv $(tuxtxt_ttf) tuxtxt.ttf; \
 		ln -sf tuxtxt.ttf shell.ttf
+
+uninstall-hook:
+	cd $(DESTDIR)$(FONTDIR); \
+		rm -f neutrino.ttf; \
+		rm -f tuxtxt.ttf; \
+		rm -f shell.ttf
--- a/data/fonts/fa-solid-900.LICENSE
+++ b/data/fonts/fa-solid-900.LICENSE
@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**
--- a/data/fonts/fa-solid-900.ttf
+++ b/data/fonts/fa-solid-900.ttf
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,12 +3,14 @@ SUBDIRS = \
 	filetypes \
 	headers \
 	hints \
+	hourglass \
 	locale \
 	movieplayer \
 	radar \
 	slider \
 	status \
-	various
+	various \
+	weather

 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo
--- a/data/icons/buttons/0.png
+++ b/data/icons/buttons/0.png
--- a/data/icons/buttons/1.png
+++ b/data/icons/buttons/1.png
--- a/data/icons/buttons/2.png
+++ b/data/icons/buttons/2.png
--- a/data/icons/buttons/3.png
+++ b/data/icons/buttons/3.png
--- a/data/icons/buttons/4.png
+++ b/data/icons/buttons/4.png
--- a/data/icons/buttons/5.png
+++ b/data/icons/buttons/5.png
--- a/data/icons/buttons/6.png
+++ b/data/icons/buttons/6.png
--- a/data/icons/buttons/7.png
+++ b/data/icons/buttons/7.png
--- a/data/icons/buttons/8.png
+++ b/data/icons/buttons/8.png
--- a/data/icons/buttons/9.png
+++ b/data/icons/buttons/9.png
--- a/data/icons/buttons/Makefile.am
+++ b/data/icons/buttons/Makefile.am
@@ -11,9 +11,11 @@ install_DATA = \
 	7.png \
 	8.png \
 	9.png \
-	blau.png \
 	btn_backward.png \
+	btn_blue.png \
+	btn_checked.png \
 	btn_forward.png \
+	btn_green.png \
 	btn_option_off_active.png \
 	btn_option_off_inactive.png \
 	btn_option_on_active.png \
@@ -22,13 +24,15 @@ install_DATA = \
 	btn_play.png \
 	btn_record_active.png \
 	btn_record_inactive.png \
+	btn_red.png \
 	btn_stop.png \
 	btn_timer.png \
+	btn_yellow.png \
 	down.png \
 	dummy.png \
 	dummy_small.png \
-	gelb.png \
-	gruen.png \
+	epg.png \
+	epg_small.png \
 	help.png \
 	help_small.png \
 	home.png \
@@ -45,5 +49,4 @@ install_DATA = \
 	ok.png \
 	power.png \
 	right.png \
-	rot.png \
 	up.png
--- a/data/icons/buttons/blau.png
+++ b/data/icons/buttons/blau.png
--- a/data/icons/buttons/btn_backward.png
+++ b/data/icons/buttons/btn_backward.png
--- a/data/icons/buttons/btn_blue.png
+++ b/data/icons/buttons/btn_blue.png
--- a/data/icons/buttons/btn_checked.png
+++ b/data/icons/buttons/btn_checked.png
--- a/data/icons/buttons/btn_forward.png
+++ b/data/icons/buttons/btn_forward.png
--- a/data/icons/buttons/btn_green.png
+++ b/data/icons/buttons/btn_green.png
--- a/data/icons/buttons/btn_option_off_active.png
+++ b/data/icons/buttons/btn_option_off_active.png
--- a/data/icons/buttons/btn_option_off_inactive.png
+++ b/data/icons/buttons/btn_option_off_inactive.png
--- a/data/icons/buttons/btn_option_on_active.png
+++ b/data/icons/buttons/btn_option_on_active.png
--- a/data/icons/buttons/btn_option_on_inactive.png
+++ b/data/icons/buttons/btn_option_on_inactive.png
--- a/data/icons/buttons/btn_pause.png
+++ b/data/icons/buttons/btn_pause.png
--- a/data/icons/buttons/btn_play.png
+++ b/data/icons/buttons/btn_play.png
--- a/data/icons/buttons/btn_record_active.png
+++ b/data/icons/buttons/btn_record_active.png
--- a/data/icons/buttons/btn_record_inactive.png
+++ b/data/icons/buttons/btn_record_inactive.png
--- a/data/icons/buttons/btn_red.png
+++ b/data/icons/buttons/btn_red.png
--- a/data/icons/buttons/btn_stop.png
+++ b/data/icons/buttons/btn_stop.png
--- a/data/icons/buttons/btn_timer.png
+++ b/data/icons/buttons/btn_timer.png
--- a/data/icons/buttons/btn_yellow.png
+++ b/data/icons/buttons/btn_yellow.png
--- a/data/icons/buttons/down.png
+++ b/data/icons/buttons/down.png
--- a/data/icons/buttons/dummy.png
+++ b/data/icons/buttons/dummy.png
--- a/data/icons/buttons/dummy_small.png
+++ b/data/icons/buttons/dummy_small.png
--- a/data/icons/buttons/epg.png
+++ b/data/icons/buttons/epg.png
--- a/data/icons/buttons/epg_small.png
+++ b/data/icons/buttons/epg_small.png
--- a/data/icons/buttons/gelb.png
+++ b/data/icons/buttons/gelb.png
--- a/data/icons/buttons/gruen.png
+++ b/data/icons/buttons/gruen.png
--- a/data/icons/buttons/help.png
+++ b/data/icons/buttons/help.png
--- a/data/icons/buttons/help_small.png
+++ b/data/icons/buttons/help_small.png
--- a/data/icons/buttons/home.png
+++ b/data/icons/buttons/home.png
--- a/data/icons/buttons/info.png
+++ b/data/icons/buttons/info.png
--- a/data/icons/buttons/info_small.png
+++ b/data/icons/buttons/info_small.png
--- a/data/icons/buttons/left.png
+++ b/data/icons/buttons/left.png
--- a/data/icons/buttons/menu.png
+++ b/data/icons/buttons/menu.png
--- a/data/icons/buttons/menu_small.png
+++ b/data/icons/buttons/menu_small.png
--- a/data/icons/buttons/mute_small.png
+++ b/data/icons/buttons/mute_small.png
--- a/data/icons/buttons/mute_zap_gray.png
+++ b/data/icons/buttons/mute_zap_gray.png
--- a/data/icons/buttons/mute_zap_green.png
+++ b/data/icons/buttons/mute_zap_green.png
--- a/data/icons/buttons/ok.png
+++ b/data/icons/buttons/ok.png
--- a/data/icons/buttons/power.png
+++ b/data/icons/buttons/power.png
--- a/data/icons/buttons/right.png
+++ b/data/icons/buttons/right.png
--- a/data/icons/buttons/rot.png
+++ b/data/icons/buttons/rot.png
--- a/data/icons/buttons/up.png
+++ b/data/icons/buttons/up.png
--- a/data/icons/headers/Makefile.am
+++ b/data/icons/headers/Makefile.am
@@ -3,26 +3,31 @@ installdir = $(ICONSDIR)
 install_DATA = \
 	audio.png \
 	bookmarkmanager.png \
+	boxinfo.png \
 	colors.png \
+	edit.png \
+	edit_find.png \
 	error.png \
 	features.png \
 	games.png \
+	icon_blue.png \
 	icon_green.png \
-	icon_movieplayer.png \
 	icon_red.png \
 	icon_yellow.png \
-	icon_ytplay.png \
 	information.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
 	lock.png \
 	mainmenue.png \
+	movieplayer.png \
+	mp3.png \
 	multimedia.png \
 	network.png \
 	personalize.png \
 	pictureviewer.png \
 	question.png \
+	radiotext.png \
 	recording.png \
 	settings.png \
 	shell.png \
--- a/Show More
+++ b/Show More