Index: /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postinst
===================================================================
--- /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postinst	(revision 20672)
+++ /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postinst	(revision 20673)
@@ -12,6 +12,3 @@
 fi
 
-rm -rf /var/etc/titan/rcmap.default
-rm -rf /mnt/config/rcmap
-
 exit 0
Index: /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titankeymaps_neutrino/CONTROL/postrm	(revision 20673)
@@ -11,3 +11,8 @@
 	sync
 fi
+
+rm -f /var/etc/titan/rcmap.default
+rm -f /mnt/config/rcmap
+touch /var/etc/titan/rcmap
+
 exit 0
Index: /ipk/source.sh4/titankeymaps_neutrino/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titankeymaps_neutrino/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titankeymaps_neutrino/CONTROL/preinst	(revision 20673)
@@ -43,5 +43,9 @@
 	exit 1 	 	 
 fi
-   
+
+rm -rf /var/etc/titan/rcmap.default
+rm -rf /var/etc/titan/rcmap
+rm -rf /mnt/config/rcmap
+
 echo "installiere keymap ..."
 
Index: /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/postrm	(revision 20673)
@@ -3,15 +3,17 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_default_matze70_sat_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,17 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-
-rm -rf /mnt/settings
+rm -r /var/etc/titan/bouquets.cfg.default
+rm -r /var/etc/titan/bouquets.cfg
+rm -r /var/etc/titan/channel.default
+rm -r /var/etc/titan/channel
+rm -r /var/etc/titan/provider.default
+rm -r /var/etc/titan/provider
+rm -r /var/etc/titan/transponder.default
+rm -r /var/etc/titan/transponder
+rm -r /var/etc/titan/satellites.default
+rm -r /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -r /mnt/settings
 
 exit 0
Index: /ipk/source.sh4/titansettings_default_sat_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_default_sat_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_default_sat_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,17 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 exit 0
Index: /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/postrm	(revision 20673)
@@ -3,15 +3,17 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_matze70neueDesign_sat19_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,19 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
-rm -rf /mnt/settings
+
 
 exit 0
Index: /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/postrm	(revision 20673)
@@ -3,15 +3,17 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_old_default_sat_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,17 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 exit 0
Index: /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/postrm	(revision 20673)
@@ -3,15 +3,17 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_sofa_cableBW_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,17 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 exit 0
Index: /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/postrm	(revision 20673)
@@ -3,15 +3,17 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_uljanow_2sat_1_0/CONTROL/preinst	(revision 20673)
@@ -38,16 +38,17 @@
 fi
 
-rm -rf /var/etc/titan/bouquets.cfg.default
-rm -rf /var/etc/titan/bouquets.cfg
-rm -rf /var/etc/titan/channel.default
-rm -rf /var/etc/titan/channel
-rm -rf /var/etc/titan/provider.default
-rm -rf /var/etc/titan/provider
-rm -rf /var/etc/titan/transponder.default
-rm -rf /var/etc/titan/transponder
-rm -rf /var/etc/titan/satellites.default
-rm -rf /var/etc/titan/satellites
-
-rm -rf /mnt/settings
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 exit 0
Index: /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postinst
===================================================================
--- /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postinst	(revision 20673)
@@ -1,19 +1,3 @@
 #!/bin/sh
-
-#del old bouquet entrys
-oldbouquets=`cat /tmp/bouquets.cfg`
-oldifs=$IFS
-IFS='
-'
-for line in $oldbouquets; do
-	file=`echo "$line" | cut -d "#" -f3`
-	grep "#$file" /var/etc/titan/bouquets.cfg > /dev/null
-	if [ $? -ne 0 ]; then
-		rm "$file"
-	fi
-done
-IFS=$oldifs
-rm /tmp/bouquets.cfg
-
 TMP=/tmp/.set
 echo "successfully installed"
Index: /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postrm	(revision 20672)
+++ /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/postrm	(revision 20673)
@@ -3,13 +3,15 @@
 
 echo "remove /var/etc/titan/bouquets.*"
-rm -rf /var/etc/titan/bouquets.* > /dev/null 2>&1
-echo "remove /var/etc/titan/channel"
-rm -rf /var/etc/titan/channel > /dev/null 2>&1
-echo "remove /var/etc/titan/provider"
-rm -rf /var/etc/titan/provider > /dev/null 2>&1
-echo "remove /var/etc/titan/satellites"
-rm -rf /var/etc/titan/satellites > /dev/null 2>&1
-echo "remove /var/etc/titan/transponder"
-rm -rf /var/etc/titan/transponder > /dev/null 2>&1
+rm -rf /var/etc/titan/bouquets.cfg.default
+rm -rf /var/etc/titan/bouquets.cfg
+rm -rf /var/etc/titan/channel.default
+rm -rf /var/etc/titan/channel
+rm -rf /var/etc/titan/provider.default
+rm -rf /var/etc/titan/provider
+rm -rf /var/etc/titan/transponder.default
+rm -rf /var/etc/titan/transponder
+rm -rf /var/etc/titan/satellites.default
+rm -rf /var/etc/titan/satellites
+rm -rf /mnt/settings
 
 echo "successfully removed"
Index: /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/preinst	(revision 20672)
+++ /ipk/source.sh4/titansettings_unitymedia_cable_1_0/CONTROL/preinst	(revision 20673)
@@ -2,17 +2,4 @@
 #
 TMP=/tmp/.set
-
-model=`cat /etc/model`
-echo""
-echo "Checking your Boxtype...."
-echo "Some Plugins will not work correctly on your $model!"
-echo ""
-if [ "$model" = "" ]; then
-	echo "Sorry! This Plugin is not available for your $model because it will not work correctly!!!"
-	echo "Aborting installation..."
-	exit 1
-else
-	echo "Boxtype: $model OK"
-fi
 
 echo "installing settings ..."
@@ -31,5 +18,5 @@
 	SPACE=`df | grep /dev/mtdblock | grep var | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
 	FREE=`expr $SPACE - 100`
-	SIZE=508
+	SIZE=30
 	echo "checking freespace"
 	echo packege size $SIZE kb
@@ -51,15 +38,17 @@
 fi
 
-#echo "remove /var/etc/titan/bouquets.*"
-#rm -rf /var/etc/titan/bouquets.* > /dev/null 2>&1
-#echo "remove /var/etc/titan/channel"
-#rm -rf /var/etc/titan/channel > /dev/null 2>&1
-#echo "remove /var/etc/titan/provider"
-#rm -rf /var/etc/titan/provider > /dev/null 2>&1
-#echo "remove /var/etc/titan/satellites"
-#rm -rf /var/etc/titan/satellites > /dev/null 2>&1
-#echo "remove /var/etc/titan/transponder"
-#rm -rf /var/etc/titan/transponder > /dev/null 2>&1
-cp /var/etc/titan/bouquets.cfg /tmp/bouquets.cfg
+rm -f /var/etc/titan/bouquets.cfg.default
+rm -f /var/etc/titan/bouquets.cfg
+rm -f /var/etc/titan/channel.default
+rm -f /var/etc/titan/channel
+rm -f /var/etc/titan/provider.default
+rm -f /var/etc/titan/provider
+rm -f /var/etc/titan/transponder.default
+rm -f /var/etc/titan/transponder
+rm -f /var/etc/titan/satellites.default
+rm -f /var/etc/titan/satellites
+rm -f /var/etc/titan/epgchannel.default
+rm -f /var/etc/titan/epgchannel
+rm -f /mnt/settings
 
 exit 0