Index: ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py
===================================================================
--- ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py	(revision 4869)
+++ ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py	(revision 4871)
@@ -55,5 +55,5 @@
 # py_compile.compile("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py")
 
-version = "2.09"
+version = "2.12"
 serverurl = ""
 activenam = ""
@@ -72,4 +72,5 @@
 
 activesource = "http://kati910.aaf-board.info/dbase"
+#activesource = "http://97.74.32.10/dbase/ufs-e2"
 activenam = "Addons-Server"
 serverurl = activesource + "/E2/"
@@ -495,5 +496,5 @@
 		fd=open("/etc/motd","r")
 		for line in fd:
-			if line.find("wElc0me to AAF") > -1:
+			if line.find("wElc0me to") > -1:
 				aafpointer = aafpointer +1
 		fd.close
@@ -508,6 +509,4 @@
 			aafpointer = aafpointer +1
 		if url.find("addons.aaf-board.net") > -1:
-			aafpointer = aafpointer +1
-		if url.find("ke2.aaf-board.info") > -1:
 			aafpointer = aafpointer +1
 
Index: ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py
===================================================================
--- ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py	(revision 4869)
+++ ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py	(revision 4871)
@@ -52,6 +52,6 @@
 
 global version
-# Version 'version' read from import downloader.py
-#AAF_Panel_Version = 'Addon Manager'
+global menu
+
 AAF_Panel_Version = 'Addon Manager ' + version
 
@@ -71,10 +71,5 @@
 
 def Plugins(**kwargs):
-	return [
-
-	#// show Addonpanel in Main Menu
-	#PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 23/02/2009", where = PluginDescriptor.WHERE_MENU, fnc = Addonpanel),
-	#// show Addonpanel in EXTENSIONS Menu
-	PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 07/11/2010", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main) ]
+	return [ PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 07/11/2010", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main) ]
 
 font = "Regular;18"
@@ -90,4 +85,11 @@
 
 # -------------------------------------------------------------------
+class CenterList(MenuList):
+	def __init__(self):
+			MenuList.__init__(self, [], True, eListboxPythonMultiContent)
+			self.l.setItemHeight(25)
+			self.l.setFont(0, gFont('Regular', 20))
+
+
 class PanelList(MenuList):
 	def __init__(self, list, font0 = 24, font1 = 16, itemHeight = 50, enableWrapAround = True):
@@ -115,15 +117,10 @@
 class Addonpanel(Screen):
 	skin = """
-	<screen name="Aafpanel" flags="wfNoBorder" position="{screen.pos}" size="438,320" title="Addonpanel" backgroundColor="#251e1f20">
-		<ePixmap position="0,0" zPosition="-1" size="438,320" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/aaf_menu.png" alphatest="off"/>
-		<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/red_smal.png" position="120,40" size="75,33" alphatest="on" />
-		<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/green_smal.png" position="195,40" size="75,33" alphatest="on" />
-		<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/yellow_smal.png" position="270,40" size="75,33" alphatest="on" />
-		<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/blue_smal.png" position="345,40" size="75,33" alphatest="on" />
-		<widget name="key_red" position="120,40" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-		<widget name="key_green" position="195,40" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="key_yellow" position="270,40" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-		<widget name="key_blue" position="345,40" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-		<widget name="Mlist" position="130,85" size="250,175" zPosition="1" scrollbarMode="showOnDemand" backgroundColor="#251e1f20" transparent="1" />
+	<screen name="Addonpanel" position="center,center" size="550, 370" title="Addonpanel">
+		<widget name="Mlist" position="10,10" size="530, 350" scrollbarMode="showOnDemand" enableWrapAround="1" transparent="1" />
+		<widget name="key_red" position="120,5" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+		<widget name="key_green" position="195,5" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="key_yellow" position="270,5" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+		<widget name="key_blue" position="345,5" zPosition="1" size="75,33" font="Regular;12" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 		<widget name="label1" position="121,287" size="200,20" font="Regular;20" transparent="1" foregroundColor="#f2e000" halign="center" />
 	</screen>"""
@@ -168,5 +165,4 @@
 
 		Screen.__init__(self, session)
-		self["label1"] = Label(AAF_Panel_Version)
 		self.Mlist = []
 
@@ -177,9 +173,10 @@
 		self.Mlist.append(MenuEntryItem((AafEntryComponent('Update Addon-Manager'), _("Update Addon-Manager"), 'Update Addon-Manager')))
 		#self.Mlist.append(MenuEntryItem((AafEntryComponent('BA-Image Manager'), _("BA-Image Manager"), 'BA-Image Manager')))
-		self.onChangedEntry = []
 		if (getDesktop(0).size().width() == 1280):
+				self["Mlist"] = PanelList([], font0 = 24, font1 = 15, itemHeight = 50)
+		else:
 				self["Mlist"] = PanelList([])
-		else:
-				self["Mlist"] = PanelList([], font0=24, font1=15, itemHeight=50)
+				self["Mlist"] = PanelList([], font0 = 24, font1 = 15, itemHeight = 50)
+
 		self["Mlist"].l.setList(self.Mlist)
 		menu = 0
@@ -190,10 +187,10 @@
 		if box <> "dm8000":
 				evfd.getInstance().vfd_write_string( self['Mlist'].l.getCurrentSelection()[0][1] )
-# -------------------------------------------------------------------
 
 		self["key_green"] = Label(" ")
 		self["key_red"] = Label(" ")
 		self["key_yellow"] = Label(" ")
-		self["key_blue"] = Label("update")
+		self["key_blue"] = Label(" ")
+		self["label1"] = Label(" ")
 
 		global menu
@@ -473,9 +470,4 @@
 				self.fullfile = self.currDir + self.filename
 				ipkpack = self.filename.split(".")
-
-				#ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/UninstallPlugin/aa.txt", "w")
-				#ffile.write(self.fullfile)
-				#ffile.close()
-
 
 				#Check for reboot