More control file clean-up...mostly done, except for task-opie-*

188 files changed, 230 insertions, 254 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index b599ed0..64f250b 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -3,5 +3,5 @@ Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
 Section: opie/applets
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 92b01e7..79d9fdd 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -3,5 +3,5 @@ Files: plugins/applets/libclockapplet.so*
 Priority: optional
 Section: opie/applets
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 509ca66..bcc6603 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -6,5 +6,5 @@ Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Depends: task-opie-minimal, libopieobex1
-Description: Irda Applet
+Description: IrDA Applet
  An IrDA taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/restartapplet/opie-restartapplet.control b/core/applets/restartapplet/opie-restartapplet.control
index 1c18a92..eba61ac 100644
--- a/core/applets/restartapplet/opie-restartapplet.control
+++ b/core/applets/restartapplet/opie-restartapplet.control
@@ -8,3 +8,3 @@ Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Restart Applet
- A simple taskbar applet to restart the  Opie environment
+ A simple taskbar applet to restart the Opie environment
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 1d8bc34..d9dcb78 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: Restart Applet
- A simple opie menu applet to restart the  Opie environment
+ A simple opie menu applet to restart the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control
index b902ce3..3bd6884 100644
--- a/core/apps/calibrate/opie-calibrate.control
+++ b/core/apps/calibrate/opie-calibrate.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Architecture: arm
-Maintainer: ?
+Maintainer: Opie Team <opie@handhelds.org>
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index bada284..9d96de2 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -3,5 +3,5 @@ Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Arch: iPAQ
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index 4dfda85..8de5976 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -8,4 +8,4 @@ Depends: task-opie-minimal
 Description: MP3 file plugin using libmad
  Plugin to play MP3 files with the mediaplayer in the Opie environment.
- It also hast streaming support (Shoutcast/Icecast).
+ It also has streaming support (Shoutcast/Icecast).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 2b59ceb..91f7366 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -9,4 +9,3 @@ Provides: libopieobex1
 Replaces: libopieobex1
 Description: Irda obex lib
-
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index 7b13ece..3d6bdff 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -6,5 +6,5 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-security
-Description: Multiuser login for OPIE
- A xdm/kdm equivalent for OPIE.
+Description: Multiuser login for Opie
+ A xdm/kdm equivalent for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index 3718a42..5182623 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -7,6 +7,6 @@ Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Description: A wakeup system for OPIE events.
- Tiny, OPIE specific replacement for ipaqalarm,
+Description: A wakeup system for Opie events.
+ Tiny, Opie specific replacement for ipaqalarm,
  uschedule and qpe2uschedule
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index f456b66..ac0bdfe 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -8,10 +8,7 @@ Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 License: GPL
-Description: today screen
- This today screen app gives an overview of appointments
- and todos.
+Description: Today screen application
+ This app gives an overview of appointments and todos.
  It also shows incoming and outgoing mails from opiemail.
  When using Opie (opie.handhelds.org) today can be autostarted
- on resume.
- It is highly configurable.
-
+ on resume.  It is highly configurable.
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 56eeba4..d40691a 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -6,4 +6,5 @@ Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Addressbook plugin for today shows Birthdays and Anniversaries
+Description: Addressbook plugin for Today
+ Displays upcoming Birthdays and Anniversaries
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 4b288cc..3921b11 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -6,4 +6,5 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Datebook plugin for today
+Description: Datebook plugin for Today
+ Displays today's appointments
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index cef3b8e..20652fa 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today, opie-mailapplet
-Description: Mail plugin for today
\ No newline at end of file
+Description: Mail plugin for Today
\ No newline at end of file
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 63727e0..001e91c 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -6,4 +6,5 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Todolist plugin for today
+Description: Todo list plugin for Today
+ Displays todo list items.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index c142e97..1df02bd 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -7,6 +7,6 @@ Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
 License: GPL
-Description: Task for basic today setup
- includes datebook, todolist and mail plugin
+Description: Task for basic Today app setup
+ Includes datebook and todolist plugins.
 
 Files:
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index a2ca4a6..8ad50b2 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -6,5 +6,5 @@ Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
-Description: TODO-list manager
- A Todo-list manager for the Opie environment.
+Description: Todo list manager
+ A Todo list manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index d0ded32..625f7be 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -3,8 +3,7 @@ Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.d
 Priority: optional
 Section: opie/settings
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Security settings dialog
- For the Opie environment.
+Description: Security settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/etc/opie-keytabs.control b/etc/opie-keytabs.control
index 29a0337..456d780 100644
--- a/etc/opie-keytabs.control
+++ b/etc/opie-keytabs.control
@@ -3,8 +3,7 @@ Files: etc/keytabs/*
 Priority: optional
 Section: opie/applications
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
 License: GPL
 Description: Opie keytabs for terminal applications
- 
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
index 8519ec4..0d3c83b 100644
--- a/freetype/opie-freetype.control
+++ b/freetype/opie-freetype.control
@@ -3,5 +3,5 @@ Files: plugins/fontfactories/libfreetypefactory*
 Priority: optional
 Section: libs
-Maintainer: Opie <opie@llornkcor.com>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index bafec72..3e19208 100644
--- a/help/en/html/opie-advancedfm-help-en.control
+++ b/help/en/html/opie-advancedfm-help-en.control
@@ -7,5 +7,4 @@ Architecture: arm
 Depends: opie-advancedfm
 License: GPL
-Description: Opie Advanced file manager help files (english)
-
+Description: Opie Advanced file manager help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-appearance-help-en.control b/help/en/html/opie-appearance-help-en.control
index ae02811..02703b1 100644
--- a/help/en/html/opie-appearance-help-en.control
+++ b/help/en/html/opie-appearance-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-appearance
 License: GPL
-Description: appearance help files (en)
+Description: Appearance help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-aqpkg-help-en.control b/help/en/html/opie-aqpkg-help-en.control
index 190dcfb..8d7cbd1 100644
--- a/help/en/html/opie-aqpkg-help-en.control
+++ b/help/en/html/opie-aqpkg-help-en.control
@@ -7,5 +7,4 @@ Architecture: arm
 Depends: opie-aqpkg
 License: GPL
-Description: AQPkg Opie package manager help files (english)
-
+Description: AQPkg Opie package manager help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-backgammon-help-en.control b/help/en/html/opie-backgammon-help-en.control
index fa435e4..45c6a6f 100644
--- a/help/en/html/opie-backgammon-help-en.control
+++ b/help/en/html/opie-backgammon-help-en.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: opie-backgammon
 License: GPL
-Description: backgammon help files (en)
+Description: backgammon help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-backup-help-en.control b/help/en/html/opie-backup-help-en.control
index d3ec55e..7ac1b97 100644
--- a/help/en/html/opie-backup-help-en.control
+++ b/help/en/html/opie-backup-help-en.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: opie-backup
 License: GPL
-Description: backup help files (en)
+Description: backup help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-bluetooth-manager-help-en.control b/help/en/html/opie-bluetooth-manager-help-en.control
index a8c2afb..9c324a4 100644
--- a/help/en/html/opie-bluetooth-manager-help-en.control
+++ b/help/en/html/opie-bluetooth-manager-help-en.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: opie-bluetooth-manager
 License: GPL
-Description: bluetooth-manager help files (en)
+Description: Bluetooth-manager help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-bounce-help-en.control b/help/en/html/opie-bounce-help-en.control
index 47fa605..150c4b9 100644
--- a/help/en/html/opie-bounce-help-en.control
+++ b/help/en/html/opie-bounce-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-bounce
 License: GPL
-Description: bounce help files (en)
+Description: bounce help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-buttonsettings-help-en.control b/help/en/html/opie-buttonsettings-help-en.control
index 2e2e475..97010d0 100644
--- a/help/en/html/opie-buttonsettings-help-en.control
+++ b/help/en/html/opie-buttonsettings-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buttonsettings
 License: GPL
-Description: buttonsettings help files (en)
+Description: buttonsettings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-buzzword-help-en.control b/help/en/html/opie-buzzword-help-en.control
index 67f7fb1..c5b89eb 100644
--- a/help/en/html/opie-buzzword-help-en.control
+++ b/help/en/html/opie-buzzword-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buzzword
 License: GPL
-Description: buzzword help files (en)
+Description: buzzword help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-calculator-help-en.control b/help/en/html/opie-calculator-help-en.control
index 1b05f3c..ac2439d 100644
--- a/help/en/html/opie-calculator-help-en.control
+++ b/help/en/html/opie-calculator-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calculator
 License: GPL
-Description: calculator help files (en)
+Description: Calculator help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-calibrate-help-en.control b/help/en/html/opie-calibrate-help-en.control
index 9741bce..31d5934 100644
--- a/help/en/html/opie-calibrate-help-en.control
+++ b/help/en/html/opie-calibrate-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calibrate
 License: GPL
-Description: calibrate help files (en)
+Description: Calibrate help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-checkbook-help-en.control b/help/en/html/opie-checkbook-help-en.control
index fed7c61..a25fda5 100644
--- a/help/en/html/opie-checkbook-help-en.control
+++ b/help/en/html/opie-checkbook-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-checkbook
 License: GPL
-Description: checkbook help files (en)
+Description: Checkbook help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-citytime-help-en.control b/help/en/html/opie-citytime-help-en.control
index a2f66c4..93b3ba9 100644
--- a/help/en/html/opie-citytime-help-en.control
+++ b/help/en/html/opie-citytime-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-citytime
 License: GPL
-Description: citytime help files (en)
+Description: Citytime help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-clock-help-en.control b/help/en/html/opie-clock-help-en.control
index 7a9a648..10a97bf 100644
--- a/help/en/html/opie-clock-help-en.control
+++ b/help/en/html/opie-clock-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-clock
 License: GPL
-Description: clock help files (en)
+Description: Clock help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-confedit-help-en.control b/help/en/html/opie-confedit-help-en.control
index 04d20fc..057696c 100644
--- a/help/en/html/opie-confedit-help-en.control
+++ b/help/en/html/opie-confedit-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-confedit
 License: GPL
-Description: confedit help files (en)
+Description: Confedit help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-console-help-en.control b/help/en/html/opie-console-help-en.control
index 7004ce5..794570f 100644
--- a/help/en/html/opie-console-help-en.control
+++ b/help/en/html/opie-console-help-en.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: opie-console
 License: GPL
-Description: Opie terminal app help files (english)
+Description: Opie terminal app help files (English)
 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-embeddedkonsole-help-en.control b/help/en/html/opie-embeddedkonsole-help-en.control
index 5da9e57..c7b156a 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-embeddedkonsole
 License: GPL
-Description: embeddedkonsole help files (en)
+Description: Embeddedkonsole help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-euroconv-help-en.control b/help/en/html/opie-euroconv-help-en.control
index 876d617..a4e4b78 100644
--- a/help/en/html/opie-euroconv-help-en.control
+++ b/help/en/html/opie-euroconv-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-euroconv
 License: GPL
-Description: euroconv help files (en)
+Description: Euroconv help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-fifteen-help-en.control b/help/en/html/opie-fifteen-help-en.control
index 1e1d8e4..4f40882 100644
--- a/help/en/html/opie-fifteen-help-en.control
+++ b/help/en/html/opie-fifteen-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-fifteen
 License: GPL
-Description: fifteen help files (en)
+Description: Fifteen help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-formatter-help-en.control b/help/en/html/opie-formatter-help-en.control
index 2a298cb..5706203 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-formatter
 License: GPL
-Description: formatter help files (en)
+Description: Formatter help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-go-help-en.control b/help/en/html/opie-go-help-en.control
index 5e40369..8e91998 100644
--- a/help/en/html/opie-go-help-en.control
+++ b/help/en/html/opie-go-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-go
 License: GPL
-Description: go help files (en)
+Description: Go help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-gsmtool-help-en.control b/help/en/html/opie-gsmtool-help-en.control
index 9671ab3..c7e5125 100644
--- a/help/en/html/opie-gsmtool-help-en.control
+++ b/help/en/html/opie-gsmtool-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-gsmtool
 License: GPL
-Description: gsmtool help files (en)
+Description: Gsmtool help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-irc-help-en.control b/help/en/html/opie-irc-help-en.control
index 8b980c4..b67fa0d 100644
--- a/help/en/html/opie-irc-help-en.control
+++ b/help/en/html/opie-irc-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-irc
 License: GPL
-Description: opieirc help files (en)
+Description: Opie IRC help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kbill-help-en.control b/help/en/html/opie-kbill-help-en.control
index f53636e..086b9e5 100644
--- a/help/en/html/opie-kbill-help-en.control
+++ b/help/en/html/opie-kbill-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kbill
 License: GPL
-Description: kbill help files (en)
+Description: KBill help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kcheckers-help-en.control b/help/en/html/opie-kcheckers-help-en.control
index 9b3a373..f7ebb87 100644
--- a/help/en/html/opie-kcheckers-help-en.control
+++ b/help/en/html/opie-kcheckers-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kcheckers
 License: GPL
-Description: kcheckers help files (en)
+Description: KCheckers help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-keypebble-help-en.control b/help/en/html/opie-keypebble-help-en.control
index 0d2f4b7..f5ae75f 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-keypebble
 License: GPL
-Description: keypebble help files (en)
+Description: Keypebble help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kpacman-help-en.control b/help/en/html/opie-kpacman-help-en.control
index 51220ce..1a4f429 100644
--- a/help/en/html/opie-kpacman-help-en.control
+++ b/help/en/html/opie-kpacman-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kpacman
 License: GPL
-Description: kpacman help files (en)
+Description: KPacman help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-language-help-en.control b/help/en/html/opie-language-help-en.control
index fd92e86..2889c58 100644
--- a/help/en/html/opie-language-help-en.control
+++ b/help/en/html/opie-language-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-language
 License: GPL
-Description: language help files (en)
+Description: Language settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-launchersettings-help-en.control b/help/en/html/opie-launchersettings-help-en.control
index 9696845..d00eec6 100644
--- a/help/en/html/opie-launchersettings-help-en.control
+++ b/help/en/html/opie-launchersettings-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-launchersettings
 License: GPL
-Description: launchersettings help files (en)
+Description: Launcher settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-light-and-power-help-en.control b/help/en/html/opie-light-and-power-help-en.control
index 765eb94..6a00c08 100644
--- a/help/en/html/opie-light-and-power-help-en.control
+++ b/help/en/html/opie-light-and-power-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-light-and-power
 License: GPL
-Description: light-and-power help files (en)
+Description: Light and Power settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mediummount-help-en.control b/help/en/html/opie-mediummount-help-en.control
index ea39b1c..e9df6d3 100644
--- a/help/en/html/opie-mediummount-help-en.control
+++ b/help/en/html/opie-mediummount-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mediummount
 License: GPL
-Description: mediummount help files (en)
+Description: Mediummount help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mindbreaker-help-en.control b/help/en/html/opie-mindbreaker-help-en.control
index cc5fb25..595f87a 100644
--- a/help/en/html/opie-mindbreaker-help-en.control
+++ b/help/en/html/opie-mindbreaker-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mindbreaker
 License: GPL
-Description: mindbreaker help files (en)
+Description: Mindbreaker help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-minesweep-help-en.control b/help/en/html/opie-minesweep-help-en.control
index 95f9fdf..aae20af 100644
--- a/help/en/html/opie-minesweep-help-en.control
+++ b/help/en/html/opie-minesweep-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-minesweep
 License: GPL
-Description: minesweep help files (en)
+Description: Minesweep help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mobilemsg-help-en.control b/help/en/html/opie-mobilemsg-help-en.control
index 0e18231..e6081e2 100644
--- a/help/en/html/opie-mobilemsg-help-en.control
+++ b/help/en/html/opie-mobilemsg-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mobilemsg
 License: GPL
-Description: mobilemsg help files (en)
+Description: MobileMsg help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-networksettings-help-en.control b/help/en/html/opie-networksettings-help-en.control
index 7b0eb8e..c2a0ea3 100644
--- a/help/en/html/opie-networksettings-help-en.control
+++ b/help/en/html/opie-networksettings-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-networksettings
 License: GPL
-Description: networksettings help files (en)
+Description: Network settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-odict-help-en.control b/help/en/html/opie-odict-help-en.control
index 1972b2f..70bfda9 100644
--- a/help/en/html/opie-odict-help-en.control
+++ b/help/en/html/opie-odict-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-odict
 License: GPL
-Description: odict help files (en)
+Description: ODict help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opie-write-help-en.control b/help/en/html/opie-opie-write-help-en.control
index ad6ed9e..b27b777 100644
--- a/help/en/html/opie-opie-write-help-en.control
+++ b/help/en/html/opie-opie-write-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opie-write
 License: GPL
-Description: opie-write help files (en)
+Description: Opie-write help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieftp-help-en.control b/help/en/html/opie-opieftp-help-en.control
index 157a6d9..f9d3064 100644
--- a/help/en/html/opie-opieftp-help-en.control
+++ b/help/en/html/opie-opieftp-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieftp
 License: GPL
-Description: opieftp help files (en)
+Description: OpieFTP help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieirc-help-en.control b/help/en/html/opie-opieirc-help-en.control
index 706f143..5d1b7df 100644
--- a/help/en/html/opie-opieirc-help-en.control
+++ b/help/en/html/opie-opieirc-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieirc
 License: GPL
-Description: opieirc help files (en)
+Description: Opie IRC help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieplayer-help-en.control b/help/en/html/opie-opieplayer-help-en.control
index a45abac..9f91281 100644
--- a/help/en/html/opie-opieplayer-help-en.control
+++ b/help/en/html/opie-opieplayer-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieplayer
 License: GPL
-Description: opieplayer help files (en)
+Description: Opieplayer help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opierec-help-en.control b/help/en/html/opie-opierec-help-en.control
index 778de2d..cdeef8e 100644
--- a/help/en/html/opie-opierec-help-en.control
+++ b/help/en/html/opie-opierec-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opierec
 License: GPL
-Description: opierec help files (en)
+Description: Opierec help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-oxygen-help-en.control b/help/en/html/opie-oxygen-help-en.control
index f6cb618..835e04c 100644
--- a/help/en/html/opie-oxygen-help-en.control
+++ b/help/en/html/opie-oxygen-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-oxygen
 License: GPL
-Description: oxygen help files (en)
+Description: Oxygen help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-parashoot-help-en.control b/help/en/html/opie-parashoot-help-en.control
index 9d0cfd6..48c1c83 100644
--- a/help/en/html/opie-parashoot-help-en.control
+++ b/help/en/html/opie-parashoot-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-parashoot
 License: GPL
-Description: parashoot help files (en)
+Description: Parashoot help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-patience-help-en.control b/help/en/html/opie-patience-help-en.control
index 0214e4a..03b8b67 100644
--- a/help/en/html/opie-patience-help-en.control
+++ b/help/en/html/opie-patience-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-patience
 License: GPL
-Description: patience help files (en)
+Description: Patience help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-qasteroids-help-en.control b/help/en/html/opie-qasteroids-help-en.control
index 52fe011..31814bc 100644
--- a/help/en/html/opie-qasteroids-help-en.control
+++ b/help/en/html/opie-qasteroids-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qasteroids
 License: GPL
-Description: qasteroids help files (en)
+Description: QAsteroids help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-qpdf-help-en.control b/help/en/html/opie-qpdf-help-en.control
index 77b624a..01cb96b 100644
--- a/help/en/html/opie-qpdf-help-en.control
+++ b/help/en/html/opie-qpdf-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qpdf
 License: GPL
-Description: qpdf help files (en)
+Description: QPdf help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-reader-help-en.control b/help/en/html/opie-reader-help-en.control
index b72da02..5745845 100644
--- a/help/en/html/opie-reader-help-en.control
+++ b/help/en/html/opie-reader-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-reader
 License: GPL
-Description: reader help files (en)
+Description: Opie reader help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-remote-help-en.control b/help/en/html/opie-remote-help-en.control
index 17127de..be1be92 100644
--- a/help/en/html/opie-remote-help-en.control
+++ b/help/en/html/opie-remote-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-remote
 License: GPL
-Description: remote help files (en)
+Description: Remote help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-rotation-help-en.control b/help/en/html/opie-rotation-help-en.control
index 79c4135..754d068 100644
--- a/help/en/html/opie-rotation-help-en.control
+++ b/help/en/html/opie-rotation-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-rotation
 License: GPL
-Description: rotation help files (en)
+Description: Rotation settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-security-help-en.control b/help/en/html/opie-security-help-en.control
index 1fad1d0..cbe26a3 100644
--- a/help/en/html/opie-security-help-en.control
+++ b/help/en/html/opie-security-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-security
 License: GPL
-Description: security help files (en)
+Description: Security settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sfcave-help-en.control b/help/en/html/opie-sfcave-help-en.control
index 4b75586..fe2b58b 100644
--- a/help/en/html/opie-sfcave-help-en.control
+++ b/help/en/html/opie-sfcave-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sfcave
 License: GPL
-Description: sfcave help files (en)
+Description: SFCave help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sheetqt-help-en.control b/help/en/html/opie-sheetqt-help-en.control
index 2465180..a6ee7a3 100644
--- a/help/en/html/opie-sheetqt-help-en.control
+++ b/help/en/html/opie-sheetqt-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sheetqt
 License: GPL
-Description: sheetqt help files (en)
+Description: SheetQT help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-showimg-help-en.control b/help/en/html/opie-showimg-help-en.control
index c8245b6..6b5ad94 100644
--- a/help/en/html/opie-showimg-help-en.control
+++ b/help/en/html/opie-showimg-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-showimg
 License: GPL
-Description: showimg help files (en)
+Description: Showimg help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-shutdown-help-en.control b/help/en/html/opie-shutdown-help-en.control
index 2a290f4..9bfd813 100644
--- a/help/en/html/opie-shutdown-help-en.control
+++ b/help/en/html/opie-shutdown-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-shutdown
 License: GPL
-Description: shutdown help files (en)
+Description: Shutdown help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-snake-help-en.control b/help/en/html/opie-snake-help-en.control
index 74c42e9..c55cc69 100644
--- a/help/en/html/opie-snake-help-en.control
+++ b/help/en/html/opie-snake-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-snake
 License: GPL
-Description: snake help files (en)
+Description: Snake help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sound-help-en.control b/help/en/html/opie-sound-help-en.control
index f870a37..73600ea 100644
--- a/help/en/html/opie-sound-help-en.control
+++ b/help/en/html/opie-sound-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sound
 License: GPL
-Description: sound help files (en)
+Description: Sound settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sshkeys-help-en.control b/help/en/html/opie-sshkeys-help-en.control
index 43b8f0c..aa02bd2 100644
--- a/help/en/html/opie-sshkeys-help-en.control
+++ b/help/en/html/opie-sshkeys-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sshkeys
 License: GPL
-Description: sshkeys help files (en)
+Description: SSHKeys help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sysinfo-help-en.control b/help/en/html/opie-sysinfo-help-en.control
index d901990..8261a26 100644
--- a/help/en/html/opie-sysinfo-help-en.control
+++ b/help/en/html/opie-sysinfo-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sysinfo
 License: GPL
-Description: sysinfo help files (en)
+Description: System info help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-systemtime-help-en.control b/help/en/html/opie-systemtime-help-en.control
index ab02a4f..2793186 100644
--- a/help/en/html/opie-systemtime-help-en.control
+++ b/help/en/html/opie-systemtime-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-systemtime
 License: GPL
-Description: systemtime help files (en)
+Description: System time settings help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tableviewer-help-en.control b/help/en/html/opie-tableviewer-help-en.control
index aa6f959..7569c9c 100644
--- a/help/en/html/opie-tableviewer-help-en.control
+++ b/help/en/html/opie-tableviewer-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tableviewer
 License: GPL
-Description: tableviewer help files (en)
+Description: Tableviewer help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tetrix-help-en.control b/help/en/html/opie-tetrix-help-en.control
index c006a4b..dcc6d76 100644
--- a/help/en/html/opie-tetrix-help-en.control
+++ b/help/en/html/opie-tetrix-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tetrix
 License: GPL
-Description: tetrix help files (en)
+Description: Tetrix help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tictac-help-en.control b/help/en/html/opie-tictac-help-en.control
index e0b715e..2b94f1f 100644
--- a/help/en/html/opie-tictac-help-en.control
+++ b/help/en/html/opie-tictac-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tictac
 License: GPL
-Description: tictac help files (en)
+Description: Tictac help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tinykate-help-en.control b/help/en/html/opie-tinykate-help-en.control
index fe228f0..b70d170 100644
--- a/help/en/html/opie-tinykate-help-en.control
+++ b/help/en/html/opie-tinykate-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tinykate
 License: GPL
-Description: tinykate help files (en)
+Description: Tinykate help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-ubrowser-help-en.control b/help/en/html/opie-ubrowser-help-en.control
index 0798b44..d1427ab 100644
--- a/help/en/html/opie-ubrowser-help-en.control
+++ b/help/en/html/opie-ubrowser-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-ubrowser
 License: GPL
-Description: ubrowser help files (en)
+Description: ubrowser help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-usermanager-help-en.control b/help/en/html/opie-usermanager-help-en.control
index fd16672..dac538e 100644
--- a/help/en/html/opie-usermanager-help-en.control
+++ b/help/en/html/opie-usermanager-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-usermanager
 License: GPL
-Description: usermanager help files (en)
+Description: User manager help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-vmemo-help-en.control b/help/en/html/opie-vmemo-help-en.control
index c379f8c..9691648 100644
--- a/help/en/html/opie-vmemo-help-en.control
+++ b/help/en/html/opie-vmemo-help-en.control
@@ -7,5 +7,4 @@ Architecture: arm
 Depends: opie-vmemo
 License: GPL
-Description: Opie Vmemo voice recording help files (english)
-
+Description: Opie Vmemo voice recording help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wellenreiter-help-en.control b/help/en/html/opie-wellenreiter-help-en.control
index b93f097..de50b5b 100644
--- a/help/en/html/opie-wellenreiter-help-en.control
+++ b/help/en/html/opie-wellenreiter-help-en.control
@@ -7,5 +7,4 @@ Architecture: arm
 Depends: opie-wellenreiter
 License: GPL
-Description: Opie Wellenreiter help files (english)
-
+Description: Opie Wellenreiter help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wlansetup-help-en.control b/help/en/html/opie-wlansetup-help-en.control
index 4cabb21..98414fb 100644
--- a/help/en/html/opie-wlansetup-help-en.control
+++ b/help/en/html/opie-wlansetup-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wlansetup
 License: GPL
-Description: wlansetup help files (en)
+Description: Wlan setup help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wordgame-help-en.control b/help/en/html/opie-wordgame-help-en.control
index 79e6ffe..36e4d83 100644
--- a/help/en/html/opie-wordgame-help-en.control
+++ b/help/en/html/opie-wordgame-help-en.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wordgame
 License: GPL
-Description: wordgame help files (en)
+Description: Wordgame help files (English)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-da.control b/i18n/opie-i18n-da.control
index 064b1cd..9ff111e 100644
--- a/i18n/opie-i18n-da.control
+++ b/i18n/opie-i18n-da.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal, opie-language
 Description: i18n: Danish
- Danish UI texts for OPIE environment.
+ Danish UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-de.control b/i18n/opie-i18n-de.control
index fb8f964..fd901d4 100644
--- a/i18n/opie-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal, opie-language
 Description: i18n: Deutsch
- German UI texts and dictionary for OPIE environment.
+ German UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-en.control b/i18n/opie-i18n-en.control
index 5a039f6..2cde1dc 100644
--- a/i18n/opie-i18n-en.control
+++ b/i18n/opie-i18n-en.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal, opie-language
 Description: i18n: English
- English dictionary for OPIE environment.
+ English UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-es.control b/i18n/opie-i18n-es.control
index cc94dae..3df36e8 100644
--- a/i18n/opie-i18n-es.control
+++ b/i18n/opie-i18n-es.control
@@ -6,5 +6,5 @@ Maintainer: Jose Luis Fernandez Barros <fbarros@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Spanish
- Spanish UI texts and dictionary for OPIE environment.
+Description: Spanish
+ Spanish UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-fr.control b/i18n/opie-i18n-fr.control
index 959c2f6..32a53b2 100644
--- a/i18n/opie-i18n-fr.control
+++ b/i18n/opie-i18n-fr.control
@@ -6,5 +6,5 @@ Maintainer: Amrein-Marie Christophe <christophe@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: French
- French UI texts and dictionary for OPIE environment.
+Description: French
+ French UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-hu.control b/i18n/opie-i18n-hu.control
index d1193d4..e79fb26 100644
--- a/i18n/opie-i18n-hu.control
+++ b/i18n/opie-i18n-hu.control
@@ -7,5 +7,5 @@ Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal, opie-language
-Description: i18n: Magyar
- Hungarian UI texts and dictionary for OPIE environment.
+Description: Magyar
+ Hungarian UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index de45196..817ad81 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -6,5 +6,5 @@ Maintainer: Daniele Foci <sunscan@sunscan.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Italian
- Italian UI texts for OPIE environment.
+Description: Italian
+ Italian UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-mk.control b/i18n/opie-i18n-mk.control
index 4e85b08..9b1a401 100644
--- a/i18n/opie-i18n-mk.control
+++ b/i18n/opie-i18n-mk.control
@@ -6,5 +6,5 @@ Maintainer: Darko Nikolovski <arkon@macedonia.homelinux.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Makedonian
- Makedonian UI texts and dictionary for OPIE environment.
+Description: Makedonian
+ Makedonian UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-nl.control b/i18n/opie-i18n-nl.control
index 8921aed..522a051 100644
--- a/i18n/opie-i18n-nl.control
+++ b/i18n/opie-i18n-nl.control
@@ -6,5 +6,5 @@ Maintainer: Ruben Lubbes <sikko@theendofinter.net>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Dutch
- Dutch UI texts and dictionary for OPIE environment.
+Description: Dutch
+ Dutch UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-pl.control b/i18n/opie-i18n-pl.control
index 7001250..8adc1ae 100644
--- a/i18n/opie-i18n-pl.control
+++ b/i18n/opie-i18n-pl.control
@@ -6,5 +6,5 @@ Maintainer: Daniel Grabowski <daniel@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Polish
- Polish UI texts and dictionary for OPIE environment.
+Description: Polish
+ Polish UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-pt.control b/i18n/opie-i18n-pt.control
index 5181923..cffeba4 100644
--- a/i18n/opie-i18n-pt.control
+++ b/i18n/opie-i18n-pt.control
@@ -6,5 +6,5 @@ Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Portuguese
- Portuguese UI texts and dictionary for OPIE environment.
+Description: Portuguese
+ Portuguese UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-ptbr.control b/i18n/opie-i18n-ptbr.control
index e8c892f..039aeca 100644
--- a/i18n/opie-i18n-ptbr.control
+++ b/i18n/opie-i18n-ptbr.control
@@ -6,5 +6,5 @@ Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Brasilian 
- Brasilian Portuguese UI texts and dictionary for OPIE environment.
+Description: Brasilian
+ Brasilian Portuguese UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-ru.control b/i18n/opie-i18n-ru.control
index cc644e4..45bb765 100644
--- a/i18n/opie-i18n-ru.control
+++ b/i18n/opie-i18n-ru.control
@@ -1,4 +1,4 @@
 Package: opie-i18n-ru
-Files: i18n/ru/.directory i18n/ru/*.qm 
+Files: i18n/ru/.directory i18n/ru/*.qm
 Priority: optional
 Section: opie/i18n
@@ -6,5 +6,5 @@ Maintainer: Sergei Klink <sklink@yandex.ru>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Russian
- Russian UI texts for OPIE environment.
+Description: Russian
+ Russian UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index 814fabd..a48660d 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -7,5 +7,5 @@ Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
-Description: i18n: Slovenian
- Slovenian UI texts for OPIE environment and dictionary.
+Description: Slovenian
+ Slovenian UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-xx.control b/i18n/opie-i18n-xx.control
index b23ebce..c1f394d 100644
--- a/i18n/opie-i18n-xx.control
+++ b/i18n/opie-i18n-xx.control
@@ -1,4 +1,4 @@
 Package: opie-i18n-xx
-Files: i18n/xx/.directory i18n/xx/*.qm 
+Files: i18n/xx/.directory i18n/xx/*.qm
 Priority: optional
 Section: opie/i18n
@@ -6,5 +6,5 @@ Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, opie-language
-Description: i18n: Testlanguage
- This is for testing the i18n-abilities of a OPIE-app
+Description: Testlanguage
+ This is for testing the i18n-abilities of Opie
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-zh-tw.control b/i18n/opie-i18n-zh-tw.control
index c47aa7a..6a7bdce 100644
--- a/i18n/opie-i18n-zh-tw.control
+++ b/i18n/opie-i18n-zh-tw.control
@@ -7,5 +7,5 @@ Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
-Description: i18n: Chinese (TW)
- Chinese UI texts for OPIE environment.
+Description: Chinese (TW)
+ Chinese UI texts and dictionary for Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index 11e06cb..4ed7b2b 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal, opie-pickboard
 Description: Multiple language keyboard
- Keyboard for inputing multiple languages in the OPIE environment.
+ Keyboard for inputing multiple languages in the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/pickboard/opie-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index 05869a8..8eb392d 100644
--- a/inputmethods/pickboard/opie-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -3,5 +3,5 @@ Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
 Section: opie/inputmethods
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/inputmethods/unikeyboard/opie-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index dac7609..073e631 100644
--- a/inputmethods/unikeyboard/opie-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -3,5 +3,5 @@ Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
 Section: opie/inputmethods
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control
index f54efd8..1e9eddb 100644
--- a/libopie2/libopie2.control
+++ b/libopie2/libopie2.control
@@ -9,3 +9,2 @@ Depends: libopiecore2 (1.8.2), libopiedb2 (1.8.2), libopiemm2 (1.8.2), libopiene
 Provides: libopie2
 Description: Opie library 2.0
-
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control
index 9c6e6d0..86e5559 100644
--- a/libopie2/opiecore/libopiecore2.control
+++ b/libopie2/opiecore/libopiecore2.control
@@ -9,3 +9,2 @@ Depends: libqpe1
 Provides: libopiecore2
 Description: Opie library 2.0 CORE
-
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control
index eb54872..933346d 100644
--- a/libopie2/opiedb/libopiedb2.control
+++ b/libopie2/opiedb/libopiedb2.control
@@ -9,3 +9,2 @@ Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiedb2
 Description: Opie library 2.0 DB
-
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control
index bcb239e..d0f34a8 100644
--- a/libopie2/opiemm/libopiemm2.control
+++ b/libopie2/opiemm/libopiemm2.control
@@ -9,3 +9,2 @@ Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiemm2
 Description: Opie library 2.0 MM
-
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control
index a4fdc83..bfa325c 100644
--- a/libopie2/opienet/libopienet2.control
+++ b/libopie2/opienet/libopienet2.control
@@ -9,3 +9,2 @@ Depends: libopiecore2 (1.8.3)
 Provides: libopienet2
 Description: Opie library 2.0 NET
-
diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control
index add39a5..1b419ad 100644
--- a/libopie2/opiepim/libopiepim2.control
+++ b/libopie2/opiepim/libopiepim2.control
@@ -9,3 +9,2 @@ Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiepim2
 Description: Opie library 2.0 PIM
-
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 0116e9b..07dafb9 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -9,3 +9,2 @@ Depends: libqpe1, libopiecore2 (1.8.5)
 Provides: libopieui2
 Description: Opie library 2.0 UI
-
diff --git a/noncore/apps/confedit/opie-confeditor.control b/noncore/apps/confedit/opie-confeditor.control
index ca35edb..12ae6a9 100644
--- a/noncore/apps/confedit/opie-confeditor.control
+++ b/noncore/apps/confedit/opie-confeditor.control
@@ -8,3 +8,2 @@ Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: An enditor for the ~/Settings/*.conf files
-
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index b36a84d..b5cf931 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -6,5 +6,5 @@ Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Dictionarylookupprogram
+Description: Dictionary look-up program
  Look up words :)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 504de85..5548baf 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,7 +1,7 @@
 Package: opie-console
-Files:  bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
+Files:  bin/opie-console apps/Applications/opie-console.desktop pics/console/*
 Priority: optional
 Section: opie/applications
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
@@ -9,3 +9,2 @@ Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
 Description: Opie terminal app
- 
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index be0cea1..805781e 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -3,7 +3,7 @@ Files: plugins/application/libtableviewer.so* bin/tableviewer apps/Applications/
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Arch: iPAQ
+Arch: arm
 Depends: task-opie-minimal
 Description: XML database browsers
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
index dd5e24b..828be03 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
index c47acc0..25571a2 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for document oriented languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
index 0e80518..8eb76b1 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for  misc languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
index 3f7ea0d..b8b5c32 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
index ea4e026..7218f33 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
@@ -1,8 +1,8 @@
 Package: opie-tinykate-syntax-unix
-Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml 
+Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
index 8f9c71a..53f07d3 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
@@ -4,5 +4,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control
index 712933c..ac8e68e 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax.control
@@ -3,5 +3,5 @@ Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web
 Description: Syntax Highlighting Patterns virtual package, which installs all available syntax patterns.
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 5de7abb..66e17ad 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Kate for opie
+Description: Kate for Opie
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
index 89915a4..1e285d0 100644
--- a/noncore/decorations/flat/opie-deco-flat.control
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Flat window decoration style for OPIE.
+ Flat window decoration style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/liquid/opie-deco-liquid.control b/noncore/decorations/liquid/opie-deco-liquid.control
index cdc1764..2165633 100644
--- a/noncore/decorations/liquid/opie-deco-liquid.control
+++ b/noncore/decorations/liquid/opie-deco-liquid.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Liquid (KDE3) window decoration style for OPIE.
+ Liquid (KDE3) window decoration style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/polished/opie-deco-polished.control b/noncore/decorations/polished/opie-deco-polished.control
index 306973e..1b4bc6b 100644
--- a/noncore/decorations/polished/opie-deco-polished.control
+++ b/noncore/decorations/polished/opie-deco-polished.control
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Blended window decoration style for OPIE.
+ Blended window decoration style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control
index b1422d4..3299b93 100644
--- a/noncore/games/kbill/opie-kbill.control
+++ b/noncore/games/kbill/opie-kbill.control
@@ -8,6 +8,6 @@ Version: 0.8-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: the famous hit Bill game
+Description: The famous hit Bill game
  Hit Bill as hard as you can before he
- infects your network with a wannabe 
+ infects your network with a wannabe
  OS.
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
index 86dac97..41996fa 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
@@ -4,5 +4,4 @@ Priority: optional
 Section: opie/playerskins
 Maintainer: ljp <llornkcor@handhelds.org>
-Description: Opie Mediaplayer's skin.
-
+Description: Opie mediaplayers skin.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
index 90d1469..f3714e8 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
@@ -6,4 +6,4 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Landscape skin for opie mediaplayer's
+Description: Landscape skin for Opie mediaplayers
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
index 7f4ac38..e9781f9 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
@@ -6,4 +6,4 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Default skin for opie mediaplayer's
+Description: Default skin for Opie mediaplayers
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
index e9f2f15..d27c0a2 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
@@ -4,5 +4,4 @@ Priority: optional
 Section: opie/playerskins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
-Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia
-
+Description: Techno Opie mediaplayers skin. Adapted from Qtopia
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index dc59c01..1e54383 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -3,9 +3,9 @@ Files: plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
- Whichever formats are compiled into Qt/Embedded (eg. PNG).
+ all graphics formats are compiled into Qt/Embedded (eg. PNG).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
index 5ca7ddb..84adc7b 100644
--- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control
+++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
@@ -7,4 +7,4 @@ Architecture: arm
 Version: 0.4-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-mail
-Description: A Biff-Like mailchecker
+Description: A Biff-like mailchecker
 License: LGPL
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control
index 89a4746..7147975 100644
--- a/noncore/net/opietooth/blue-pin/opie-bluepin.control
+++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control
@@ -9,3 +9,2 @@ Depends: task-opie-minimal
 License: GPL
 Description: Bluetooth pin application
-
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index cc7485f..4fe1e06 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -9,3 +9,2 @@ Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
 Description: Bluetooth Manager application
-
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
index 07021ec..cf96888 100644
--- a/noncore/net/ubrowser/opie-ubrowser.control
+++ b/noncore/net/ubrowser/opie-ubrowser.control
@@ -8,3 +8,3 @@ Version: 0.1-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: a very small web browser
+Description: A very small web browser
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index 724276e..b398862 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -3,8 +3,7 @@ Files: plugins/application/libappearance.so* bin/appearance apps/Settings/Appear
 Priority: optional
 Section: opie/settings
-Maintainer: Dan Williams <wiliamsdr@acm.org>
+Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
-Description: Appearance settings dialog
- For the Opie environment.
+Description: Appearance settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/doctab/opie-doctab.control b/noncore/settings/doctab/opie-doctab.control
index 9951561..4c5c7d0 100644
--- a/noncore/settings/doctab/opie-doctab.control
+++ b/noncore/settings/doctab/opie-doctab.control
@@ -6,5 +6,4 @@ Maintainer: The Opie Team <opie-devel@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: DocTab settings dialog
- For the Opie environment.
+Description: DocTab settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index 9e9fbeb..722a749 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -3,5 +3,5 @@ Files: plugins/application/liblanguage.so* bin/language apps/Settings/Language.d
 Priority: optional
 Section: opie/settings
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 772b9a6..b039f24 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: task-opie-minimal
 License: GPL
-Description: Configure app for the medium mounter
- Configure app for the medium mounter
+Description: Medium mount configuration
+ Configuration application for the medium mounter.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index 50f3eaf..1ebc1da 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -7,5 +7,6 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.o
 Architecture: arm
 Depends: task-opie-minimal, ntpdate, libopie1
-Description: ntp (Network  Time  Protocol) gui
- This utility syncs system time with a atomic timerserver via internet
+Description: System time
+ This utility allows the system time to be set manually
+ or synced with a timerserver via Internet.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index afab3ce..cad2cdd 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -8,3 +8,3 @@ Architecture: arm
 Maintainer: Dan Williams (drw@handhelds.org)
 Description: Opie package management client
-Version: 0.3.0
+Version: 0.3.0$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index f251aa7..9b56b36 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -3,8 +3,7 @@ Files: plugins/application/libsysinfo.so* bin/sysinfo apps/Settings/sysinfo.desk
 Priority: optional
 Section: opie/settings
-Maintainer: Dan Williams <williamsdr@acm.org>
+Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
-Description: System Information dialog
- For the Opie environment.
+Description: System Information dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/flat/opie-style-flat.control b/noncore/styles/flat/opie-style-flat.control
index 1021493..09487b1 100644
--- a/noncore/styles/flat/opie-style-flat.control
+++ b/noncore/styles/flat/opie-style-flat.control
@@ -6,5 +6,5 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: OPIE widget style
- Simple, flat widget style for OPIE.
+Description: Opie widget style
+ Simple, flat widget style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/fresh/opie-style-fresh.control b/noncore/styles/fresh/opie-style-fresh.control
index 4ccbcfe..0305301 100644
--- a/noncore/styles/fresh/opie-style-fresh.control
+++ b/noncore/styles/fresh/opie-style-fresh.control
@@ -6,5 +6,5 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: OPIE widget style
- Simple widget style for OPIE.
+Description: Opie widget style
+ Simple widget style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 250f308..ad625ad 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -8,4 +8,4 @@ Depends: task-opie-minimal
 Description: Liquid style by Mosfet.
  Mosfet's well known Liquid GUI style from KDE,
- ported to OPIE.
+ ported to Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/metal/opie-metal.control b/noncore/styles/metal/opie-metal.control
index 653e126..7be25a3 100644
--- a/noncore/styles/metal/opie-metal.control
+++ b/noncore/styles/metal/opie-metal.control
@@ -1,4 +1,4 @@
 Package: opie-metal
-Files: plugins/styles/libmetal.so* 
+Files: plugins/styles/libmetal.so*
 Priority: optional
 Section: opie/system
@@ -7,4 +7,4 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: Metal style by Trolltech.
- Metal style ported to OPIE.
+ Metal style ported to Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/theme/opie-theme-luna.control b/noncore/styles/theme/opie-theme-luna.control
index d53de77..6ae59c5 100644
--- a/noncore/styles/theme/opie-theme-luna.control
+++ b/noncore/styles/theme/opie-theme-luna.control
@@ -6,6 +6,6 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: opie-theme
-Description: Luna theme for OPIE.
+Description: Luna theme for Opie.
  This is the KDE2 theme Luna from Aronnax repackaged
- for OPIE.
+ for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
index e465fb4..48ddab1 100644
--- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
+++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
@@ -6,4 +6,4 @@ Maintainer: Chris Larson <kergoth@handhelds.org>
 Architecture: arm
 Depends: opie-today, fortune (<=9708-0.1) | fortune-mod
-Description: 'fortune' plugin for today
+Description: 'fortune' plugin for Today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 645dbe7..3e3bad1 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -6,4 +6,4 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: stockticker plugin for today
+Description: Stock ticker plugin for Today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index 0861b5a..80b7d2b 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -6,4 +6,5 @@ Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Current weather plugin for today.
+Description: Weather plugin for Today
+ Displays current weather conditions.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index e2dbdf8..f5a03ad 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -3,5 +3,5 @@ Files: plugins/application/libcalculator.so* bin/calculator apps/Applications/ca
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index 75f1440..37991a1 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -3,5 +3,5 @@ Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.deskto
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 47c6528..11fe57a 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -6,6 +6,4 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Formatter
- The filesystem formatting and mountpoint app for the Opie environment.
-ronment.
+Description: The filesystem formatting and mountpoint app for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index 43b760d..106a183 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -8,4 +8,4 @@ Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: a QDialog shell frontend
+Description: A QDialog shell frontend
  A program to let you use various dialogs from the console (or a shell script)
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
index df1b9d9..0892146 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to df (show space left on mountpoints)
+Description: Frontend to df (show space left on mountpoints)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
index 79f5b2e..2800a84 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to mount/unmount filesystems
+Description: Frontend to mount/unmount filesystems
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
index 2d3e073..c0b2b6c 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: generate list of hosts which are up/down using ping
+Description: Generate list of hosts which are up/down using ping
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
index ef835c1..2d12e66 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to kill process
+Description: Frontend to kill process
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
index a9bc66c..7e3a645 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: refresh the launcher so that new installed applications appear
+Description: Refresh the launcher so that new installed applications appear
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
index 6df1489..9000dd2 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to viewing logfiles
+Description: Frontend to viewing logfiles
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
index 50470f1..4de8ecb 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to rsync
+Description: Frontend to rsync
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
index b0cba7d..d107ec6 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop init scripts
+Description: Frontend to start/stop init scripts
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
index 37ac25b..1a47d1a 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
@@ -6,5 +6,5 @@ Priority: optional
 Section: opie/sh
 Maintainer: David Woodhouse <dwmw2@infradead.org>
-Architecture: arm
+Architecture: all
 License: GPL
 Description: Popup dialog box for OpenSSH to ask for user input
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
index 824a767..49f6ec1 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: spiralman <spiralman@softhome.net
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop Stowaway keyboard
+Description: Frontend to start/stop Stowaway keyboard
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
index 22f0b4d..8443c92 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
@@ -6,6 +6,6 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop usbnet
+Description: Frontend to start/stop usbnet
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
index aa0a38d..3c3463f 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
@@ -7,5 +7,5 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to choose wavelan config
+Description: Frontend to choose wavelan config
diff --git a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
index 02d5fdf..14bcc4b 100644
--- a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
+++ b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
@@ -6,5 +6,5 @@ Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
 Description: Opie shell apps
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control
index d29bb06..201d929 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -8,4 +8,4 @@ Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, lirc
 License: GPL
-Description: a remote control
+Description: A remote control
  A remote control using irda. A frontend to lirc.
diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index a9751f9..d40bd8a 100644
--- a/noncore/unsupported/filebrowser/opie-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -3,5 +3,5 @@ Files: bin/filebrowser apps/Applications/filebrowser.desktop pics/filebrowser/
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
diff --git a/pics/opie-pics.control b/pics/opie-pics.control
index e3d6925..6228241 100644
--- a/pics/opie-pics.control
+++ b/pics/opie-pics.control
@@ -4,6 +4,6 @@ Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
-Description: Including unassigned and pim pics (TodoList, Addressbook, Datebook).
+Architecture: all
+Description: Including unassigned and PIM pics (TodoList, Addressbook, Datebook).
  These icons are available to all Opie applications.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/qt/control/libqte2.control b/qt/control/libqte2.control
index 901c001..bcc916b 100644
--- a/qt/control/libqte2.control
+++ b/qt/control/libqte2.control
@@ -11,3 +11,2 @@ Replaces: qt-embedded, libqt2-emb
 Description: Qt/Embedded environment
  A complete windowing system and GUI toolkit for handhelds.
- See "QPE" for applications.
diff --git a/qt/control/qpf-cyberbit-120-50-t10.control b/qt/control/qpf-cyberbit-120-50-t10.control
index fbacbef..836d4b7 100644
--- a/qt/control/qpf-cyberbit-120-50-t10.control
+++ b/qt/control/qpf-cyberbit-120-50-t10.control
@@ -3,6 +3,6 @@ Files: $QTDIR/lib/fonts/cyberbit_120_50_t10.qpf
 Priority: required
 Section: opie/system
-Maintainer: Opie Project <opie@handhelds.org>
-Architecture: arm
+Maintainer: Opie Team <opie@handhelds.org>
+Architecture: all
 Version: 2.3.0-6
 Depends: qte-fonts-common
diff --git a/qt/control/qpf-fixed.control b/qt/control/qpf-fixed.control
index ac72e90..fe2325c 100644
--- a/qt/control/qpf-fixed.control
+++ b/qt/control/qpf-fixed.control
@@ -4,5 +4,5 @@ Priority: required
 Section: opie/system
 Maintainer: Chris Larson <kergoth@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: qte-fonts-common
 Version: 1:$QTE_VERSION-$QTE_REVISION
diff --git a/qt/control/qpf-helvetica.control b/qt/control/qpf-helvetica.control
index 8b20ad3..0e28793 100644
--- a/qt/control/qpf-helvetica.control
+++ b/qt/control/qpf-helvetica.control
@@ -5,5 +5,5 @@ Section: opie/system
 Maintainer: Chris Larson <kergoth@handhelds.org>
 Depends: qte-fonts-common
-Architecture: arm
+Architecture: all
 Version: 1:$QTE_VERSION-$QTE_REVISION
 Description: Helvetica font - precompiled QPFs
diff --git a/qt/control/qpf-micro.control b/qt/control/qpf-micro.control
index f993386..2595024 100644
--- a/qt/control/qpf-micro.control
+++ b/qt/control/qpf-micro.control
@@ -4,5 +4,5 @@ Priority: required
 Section: opie/system
 Maintainer: Chris Larson <kergoth@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: qte-fonts-common
 Version: 1:$QTE_VERSION-$QTE_REVISION
diff --git a/qt/control/qpf-smallsmooth.control b/qt/control/qpf-smallsmooth.control
index 279f7bd..de1ec6a 100644
--- a/qt/control/qpf-smallsmooth.control
+++ b/qt/control/qpf-smallsmooth.control
@@ -4,5 +4,5 @@ Priority: required
 Section: opie/system
 Maintainer: Chris Larson <kergoth@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: qte-fonts-common
 Version: 1:$QTE_VERSION-$QTE_REVISION
diff --git a/qt/control/qpf-smoothtimes.control b/qt/control/qpf-smoothtimes.control
index 6576ea7..223e97d 100644
--- a/qt/control/qpf-smoothtimes.control
+++ b/qt/control/qpf-smoothtimes.control
@@ -4,5 +4,5 @@ Priority: required
 Section: opie/system
 Maintainer: Chris Larson <kergoth@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: qte-fonts-common
 Version: 1:$QTE_VERSION-$QTE_REVISION
diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control
index 0827f9b..20a022a 100644
--- a/qt/control/qte-fonts.control
+++ b/qt/control/qte-fonts.control
@@ -4,5 +4,5 @@ Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: qte-fonts-common, qpf-fixed, qpf-micro
 Provides: libqt2-emb-fonts
diff --git a/root/ptydevs.control b/root/ptydevs.control
index 50f24e6..50393d8 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -3,5 +3,5 @@ Files: root/dev
 Priority: optional
 Section: opie/system
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Version: 1.0.0-5
 Architecture: arm
diff --git a/root/timezones-america.control b/root/timezones-america.control
index 6c98601..4acecab 100644
--- a/root/timezones-america.control
+++ b/root/timezones-america.control
@@ -3,5 +3,5 @@ Files: root/usr/share/zoneinfo/America
 Priority: optional
 Section: base
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: timezones-common
 Provides: timezones
diff --git a/root/timezones.control b/root/timezones.control
index 856c4cc..26173b3 100644
--- a/root/timezones.control
+++ b/root/timezones.control
@@ -3,5 +3,5 @@ Files: root/usr/share/zoneinfo
 Priority: optional
 Section: base
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Version: 1.0.0-6
 Architecture: arm
diff --git a/sounds/opie-sounds.control b/sounds/opie-sounds.control
index 50fe774..ae79d0a 100644
--- a/sounds/opie-sounds.control
+++ b/sounds/opie-sounds.control
@@ -3,6 +3,6 @@ Files: sounds/*.wav
 Priority: required
 Section: opie/system
-Maintainer: Opie Project <opie@handhelds.org>
-Architecture: arm
+Maintainer: Opie Team <opie@handhelds.org>
+Architecture: all
 Description: Basic sounds for Opie environment
  These sounds are available to all Opie applications.