From 56156f6c4392510cdbe0eb4f2ccefc23b43e2672 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 8 Feb 2009 01:29:28 +0000
Subject: [PATCH] HTML->XHTML preparation (still *A LOT* to convert

---
 inc/databases.php                             |   2 +-
 inc/db/lib-mysql3.php                         |   2 +-
 inc/extensions/ext-active.php                 |   4 +-
 inc/extensions/ext-admins.php                 |  14 +-
 inc/extensions/ext-autopurge.php              |  22 +-
 inc/extensions/ext-beg.php                    |  12 +-
 inc/extensions/ext-birthday.php               |  12 +-
 inc/extensions/ext-bonus.php                  |  40 ++--
 inc/extensions/ext-cache.php                  |   8 +-
 inc/extensions/ext-demo.php                   |   2 +-
 inc/extensions/ext-doubler.php                |   6 +-
 inc/extensions/ext-holiday.php                |  10 +-
 inc/extensions/ext-html_mail.php              |   6 +-
 inc/extensions/ext-iso3166.php                |   2 +-
 inc/extensions/ext-mailid.php                 |  20 +-
 inc/extensions/ext-maintenance.php            |   2 +-
 inc/extensions/ext-mediadata.php              |   6 +-
 inc/extensions/ext-mods.php                   |   2 +-
 inc/extensions/ext-mydata.php                 |  10 +-
 inc/extensions/ext-newsletter.php             |  14 +-
 inc/extensions/ext-nickname.php               |   4 +-
 inc/extensions/ext-online.php                 |   4 +-
 inc/extensions/ext-optimize.php               |   2 +-
 inc/extensions/ext-order.php                  |  38 ++--
 inc/extensions/ext-other.php                  |  18 +-
 inc/extensions/ext-payout.php                 |   8 +-
 inc/extensions/ext-profile.php                |   6 +-
 inc/extensions/ext-rallye.php                 |  34 +--
 inc/extensions/ext-register.php               |  32 +--
 inc/extensions/ext-repair.php                 |   2 +-
 inc/extensions/ext-rewrite.php                |   2 +-
 inc/extensions/ext-sql_patches.php            |  28 +--
 inc/extensions/ext-support.php                |   6 +-
 inc/extensions/ext-task.php                   |  28 +--
 inc/extensions/ext-theme.php                  |   2 +-
 inc/extensions/ext-top10.php                  |   4 +-
 inc/extensions/ext-transfer.php               |  16 +-
 inc/extensions/ext-user.php                   |  12 +-
 inc/functions.php                             | 140 ++++++------
 inc/gen_sql_patches.php                       |   2 +-
 inc/install-inc.php                           | 124 +++++------
 inc/language/active_de.php                    |   2 +-
 inc/language/admins_de.php                    |   4 +-
 inc/language/bank_de.php                      |   4 +-
 inc/language/beg_de.php                       |   8 +-
 inc/language/birthday_de.php                  |   8 +-
 inc/language/bonus_de.php                     |  14 +-
 inc/language/cache_de.php                     |  28 +--
 inc/language/country_de.php                   |   8 +-
 inc/language/de.php                           | 107 +++++----
 inc/language/doubler_de.php                   |   6 +-
 inc/language/en.ph                            | 185 ++++++++--------
 inc/language/en.php                           |  52 ++---
 inc/language/holiday_de.php                   |   8 +-
 inc/language/html_mail_de.php                 |   2 +-
 inc/language/install_de.php                   |   4 +-
 inc/language/mediadata_de.php                 |   8 +-
 inc/language/nickname_de.php                  |   2 +-
 inc/language/order_de.php                     |   6 +-
 inc/language/payout_de.php                    |   6 +-
 inc/language/primera_de.php                   |  10 +-
 inc/language/rallye_de.php                    |  12 +-
 inc/language/register_de.php                  |   2 +-
 inc/language/repair_de.php                    |   4 +-
 inc/language/rewrite_de.php                   |   2 +-
 inc/language/sponsor_de.php                   |  96 ++++----
 inc/language/support_de.php                   |   4 +-
 inc/language/task_de.php                      |   4 +-
 inc/language/theme_de.php                     |   4 +-
 inc/language/transfer_de.php                  |   6 +-
 inc/language/user_de.php                      |  10 +-
 inc/libs/active_functions.php                 |   2 +-
 inc/libs/bonus_functions.php                  |   2 +-
 inc/libs/html_mail_functions.php              |   4 +-
 inc/libs/order_functions.php                  |   2 +-
 inc/libs/payout_functions.php                 |  40 ++--
 inc/libs/rallye_functions.php                 |  34 +--
 inc/libs/register_functions.php               |  12 +-
 inc/libs/sponsor_functions.php                |   2 +-
 inc/libs/task_functions.php                   |  38 ++--
 inc/libs/theme_functions.php                  |   4 +-
 inc/libs/user_functions.php                   |  20 +-
 inc/modules/admin.php                         |   6 +-
 inc/modules/admin/admin-inc.php               |  54 ++---
 inc/modules/admin/overview-inc.php            |  30 +--
 inc/modules/admin/what-add_points.php         |   4 +-
 inc/modules/admin/what-admin_add.php          |  12 +-
 inc/modules/admin/what-adminedit.php          |   6 +-
 inc/modules/admin/what-admins_mails.php       |  18 +-
 inc/modules/admin/what-chk_regs.php           |   2 +-
 inc/modules/admin/what-config_admins.php      |   8 +-
 inc/modules/admin/what-config_bonus.php       |   8 +-
 inc/modules/admin/what-config_cats.php        |   4 +-
 inc/modules/admin/what-config_email.php       |   2 +-
 inc/modules/admin/what-config_home.php        |  17 +-
 inc/modules/admin/what-config_mediadata.php   |   2 +-
 inc/modules/admin/what-config_mods.php        |   2 +-
 inc/modules/admin/what-config_other.php       |  10 +-
 inc/modules/admin/what-config_payouts.php     |   8 +-
 inc/modules/admin/what-config_points.php      |   2 +-
 .../admin/what-config_rallye_prices.php       |   8 +-
 inc/modules/admin/what-del_email.php          |   2 +-
 inc/modules/admin/what-del_user.php           |   6 +-
 inc/modules/admin/what-edit_emails.php        |   4 +-
 inc/modules/admin/what-edit_sponsor.php       |   2 +-
 inc/modules/admin/what-edit_user.php          |   2 +-
 inc/modules/admin/what-email_archiv.php       |   2 +-
 inc/modules/admin/what-email_details.php      |   4 +-
 inc/modules/admin/what-extensions.php         |   2 +-
 inc/modules/admin/what-guest_add.php          |  12 +-
 inc/modules/admin/what-guestedit.php          |   6 +-
 inc/modules/admin/what-list_autopurge.php     |   2 +-
 inc/modules/admin/what-list_beg.php           |   6 +-
 inc/modules/admin/what-list_bonus.php         |   6 +-
 inc/modules/admin/what-list_cats.php          |   8 +-
 inc/modules/admin/what-list_doubler.php       |  12 +-
 inc/modules/admin/what-list_links.php         |   6 +-
 inc/modules/admin/what-list_notifications.php |   2 +-
 inc/modules/admin/what-list_payouts.php       |  10 +-
 inc/modules/admin/what-list_rallyes.php       |   6 +-
 inc/modules/admin/what-list_refs.php          |   6 +-
 inc/modules/admin/what-list_sponsor.php       |   2 +-
 inc/modules/admin/what-list_task.php          |   8 +-
 inc/modules/admin/what-list_unconfirmed.php   |   2 +-
 inc/modules/admin/what-list_user.php          |  18 +-
 inc/modules/admin/what-list_yoomedia_tm.php   |   2 +-
 inc/modules/admin/what-lock_sponsor.php       |   2 +-
 inc/modules/admin/what-lock_user.php          |   8 +-
 inc/modules/admin/what-mem_add.php            |  12 +-
 inc/modules/admin/what-memedit.php            |   6 +-
 inc/modules/admin/what-optimize.php           |   2 +-
 inc/modules/admin/what-payments.php           |   4 +-
 inc/modules/admin/what-refbanner.php          |   2 +-
 inc/modules/admin/what-repair_cats.php        |   4 +-
 inc/modules/admin/what-stats_mods.php         |   2 +-
 inc/modules/admin/what-sub_points.php         |  22 +-
 inc/modules/admin/what-theme_check.php        |   8 +-
 inc/modules/admin/what-theme_edit.php         |   4 +-
 inc/modules/admin/what-theme_import.php       |  10 +-
 inc/modules/admin/what-updates.php            |   2 +-
 inc/modules/admin/what-user_online.php        |  18 +-
 inc/modules/frametester.php                   |   2 +-
 inc/modules/guest/action-themes.php           |   2 +-
 inc/modules/guest/what-mediadata.php          |  16 +-
 inc/modules/guest/what-rallyes.php            |  10 +-
 inc/modules/guest/what-register.php           |  22 +-
 inc/modules/guest/what-sponsor_reg.php        |  10 +-
 inc/modules/guest/what-stats.php              |   6 +-
 inc/modules/guest/what-wernis_portal.php      |   4 +-
 inc/modules/index.php                         |   2 +-
 inc/modules/member/action-themes.php          |   2 +-
 inc/modules/member/what-mydata.php            |   6 +-
 inc/modules/member/what-nickname.php          |   2 +-
 inc/modules/member/what-order.php             |  14 +-
 inc/modules/member/what-payout.php            |   4 +-
 inc/modules/member/what-rallyes.php           |  10 +-
 inc/modules/member/what-reflinks.php          |  12 +-
 inc/modules/member/what-themes.php            |   4 +-
 inc/modules/member/what-transfer.php          | 208 +++++++-----------
 inc/mysql-connect.php                         |   7 +-
 inc/mysql-manager.php                         |  48 ++--
 inc/pool/pool-bonus.php                       |   4 +-
 inc/security.php                              |   8 +-
 mailid_top.php                                |  12 +-
 modules.php                                   |   2 +-
 .../de/html/admin/admin_add_bank_package.tpl  |  28 +--
 templates/de/html/admin/admin_add_banner.tpl  |  14 +-
 templates/de/html/admin/admin_add_cat.tpl     |  18 +-
 templates/de/html/admin/admin_add_country.tpl |  14 +-
 templates/de/html/admin/admin_add_max.tpl     |   6 +-
 templates/de/html/admin/admin_add_payment.tpl |   6 +-
 templates/de/html/admin/admin_add_points.tpl  |  12 +-
 .../de/html/admin/admin_add_points_all.tpl    |   8 +-
 templates/de/html/admin/admin_add_rallye.tpl  |  26 +--
 .../de/html/admin/admin_add_rallye_prices.tpl |   6 +-
 templates/de/html/admin/admin_add_reflvl.tpl  |   6 +-
 templates/de/html/admin/admin_add_sponsor.tpl |  52 ++---
 .../html/admin/admin_add_sponsor_already.tpl  |   6 +-
 .../html/admin/admin_add_sponsor_paytype.tpl  |  30 +--
 templates/de/html/admin/admin_admin_add.tpl   |  16 +-
 templates/de/html/admin/admin_admins_add.tpl  |   6 +-
 .../de/html/admin/admin_admins_add_acl.tpl    |  14 +-
 .../html/admin/admin_admins_contct_form.tpl   |  12 +-
 .../de/html/admin/admin_admins_mails_edit.tpl |  10 +-
 .../admin/admin_admins_mails_edit_form.tpl    |  12 +-
 .../de/html/admin/admin_admins_mails_list.tpl |  12 +-
 .../de/html/admin/admin_amenu_delete.tpl      |   6 +-
 templates/de/html/admin/admin_amenu_edit.tpl  |  14 +-
 .../de/html/admin/admin_amenu_edit_form.tpl   |   6 +-
 .../de/html/admin/admin_amenu_edit_row.tpl    |   4 +-
 templates/de/html/admin/admin_cache_stats.tpl |  10 +-
 .../de/html/admin/admin_config_active.tpl     |   6 +-
 .../de/html/admin/admin_config_admin.tpl      |   6 +-
 .../de/html/admin/admin_config_admins.tpl     |  16 +-
 .../de/html/admin/admin_config_admins_del.tpl |  16 +-
 .../admin/admin_config_admins_del_row.tpl     |   2 +-
 .../html/admin/admin_config_admins_edit.tpl   |  16 +-
 .../admin/admin_config_admins_edit_row.tpl    |  10 +-
 .../de/html/admin/admin_config_autopurge.tpl  |  10 +-
 templates/de/html/admin/admin_config_beg.tpl  |  38 ++--
 .../de/html/admin/admin_config_birthday.tpl   |  18 +-
 .../de/html/admin/admin_config_bonus.tpl      |  69 +++---
 .../de/html/admin/admin_config_cache.tpl      |   6 +-
 templates/de/html/admin/admin_config_cats.tpl |  14 +-
 .../de/html/admin/admin_config_doubler.tpl    |  32 +--
 .../de/html/admin/admin_config_email.tpl      |  12 +-
 .../de/html/admin/admin_config_email_del.tpl  |   6 +-
 .../html/admin/admin_config_email_del_row.tpl |   4 +-
 .../de/html/admin/admin_config_email_edit.tpl |   6 +-
 .../admin/admin_config_email_edit_row.tpl     |   4 +-
 .../de/html/admin/admin_config_extensions.tpl |   6 +-
 .../de/html/admin/admin_config_holiday.tpl    |  11 +-
 templates/de/html/admin/admin_config_home.tpl |  12 +-
 .../de/html/admin/admin_config_home_main.tpl  |  10 +-
 .../html/admin/admin_config_home_settings.tpl |  30 +--
 .../admin/admin_config_home_settings_pro.tpl  |  26 +--
 .../de/html/admin/admin_config_mediadata.tpl  |  12 +-
 .../de/html/admin/admin_config_newsletter.tpl |   6 +-
 .../de/html/admin/admin_config_nickname.tpl   |   6 +-
 .../de/html/admin/admin_config_order.tpl      |  44 ++--
 .../de/html/admin/admin_config_order_form.tpl |   8 +-
 .../de/html/admin/admin_config_other.tpl      |  91 ++++----
 .../de/html/admin/admin_config_payouts.tpl    |  16 +-
 .../html/admin/admin_config_payouts_del.tpl   |  14 +-
 .../html/admin/admin_config_payouts_edit.tpl  |  14 +-
 .../admin/admin_config_point_settings.tpl     |   8 +-
 .../de/html/admin/admin_config_points.tpl     |  12 +-
 .../de/html/admin/admin_config_primera.tpl    |   8 +-
 .../de/html/admin/admin_config_proxy.tpl      |   6 +-
 .../de/html/admin/admin_config_rallye_del.tpl |  14 +-
 .../html/admin/admin_config_rallye_edit.tpl   |  14 +-
 .../admin/admin_config_rallye_edit_row.tpl    |   4 +-
 .../html/admin/admin_config_rallye_prices.tpl |  14 +-
 .../de/html/admin/admin_config_refback.tpl    |   6 +-
 .../de/html/admin/admin_config_refid.tpl      |  22 +-
 .../de/html/admin/admin_config_reg_pro.tpl    |   6 +-
 .../de/html/admin/admin_config_register.tpl   |   6 +-
 .../de/html/admin/admin_config_register2.tpl  |   6 +-
 .../de/html/admin/admin_config_rewrite.tpl    |  14 +-
 .../de/html/admin/admin_config_secure.tpl     |  10 +-
 .../de/html/admin/admin_config_sponsor.tpl    |   6 +-
 .../de/html/admin/admin_config_stats.tpl      |  20 +-
 .../de/html/admin/admin_config_sub_points.tpl |   6 +-
 .../de/html/admin/admin_config_surfbar.tpl    |   6 +-
 .../de/html/admin/admin_config_title.tpl      |   8 +-
 .../de/html/admin/admin_config_top10.tpl      |   6 +-
 .../de/html/admin/admin_config_transfer.tpl   |  20 +-
 templates/de/html/admin/admin_config_user.tpl |   6 +-
 .../de/html/admin/admin_config_wernis.tpl     |   8 +-
 .../de/html/admin/admin_contct_user_form.tpl  |  12 +-
 templates/de/html/admin/admin_del_admins.tpl  |  16 +-
 .../de/html/admin/admin_del_bank_packages.tpl |  16 +-
 .../admin/admin_del_bank_packages_row.tpl     |   2 +-
 templates/de/html/admin/admin_del_cats.tpl    |   6 +-
 .../de/html/admin/admin_del_cats_row.tpl      |   4 +-
 .../de/html/admin/admin_del_email_bonus.tpl   |  14 +-
 .../de/html/admin/admin_del_email_normal.tpl  |  16 +-
 .../de/html/admin/admin_del_email_notify.tpl  |  16 +-
 .../de/html/admin/admin_del_payments.tpl      |   6 +-
 .../de/html/admin/admin_del_payments_row.tpl  |   4 +-
 templates/de/html/admin/admin_del_sponsor.tpl |  10 +-
 templates/de/html/admin/admin_del_user.tpl    |  24 +-
 templates/de/html/admin/admin_edit_admins.tpl |  24 +-
 .../de/html/admin/admin_edit_admins_row.tpl   |   8 +-
 .../html/admin/admin_edit_bank_packages.tpl   |   8 +-
 .../admin/admin_edit_bank_packages_row.tpl    |   4 +-
 templates/de/html/admin/admin_edit_cats.tpl   |   6 +-
 .../de/html/admin/admin_edit_cats_row.tpl     |   2 +-
 templates/de/html/admin/admin_edit_email.tpl  |  16 +-
 .../de/html/admin/admin_edit_email_select.tpl |   7 +-
 .../de/html/admin/admin_edit_payments.tpl     |   6 +-
 .../de/html/admin/admin_edit_payments_row.tpl |   2 +-
 .../de/html/admin/admin_edit_rallyes.tpl      |   6 +-
 .../de/html/admin/admin_edit_rallyes_row.tpl  |   8 +-
 .../admin/admin_edit_sponsor_add_points.tpl   |  10 +-
 .../de/html/admin/admin_edit_sponsor_edit.tpl |  34 +--
 .../admin/admin_edit_sponsor_sub_points.tpl   |  10 +-
 templates/de/html/admin/admin_edit_user.tpl   |  19 +-
 .../de/html/admin/admin_email_archiv.tpl      |   4 +-
 .../de/html/admin/admin_ext_reg_form.tpl      |   6 +-
 templates/de/html/admin/admin_extensions.tpl  |  16 +-
 .../de/html/admin/admin_extensions_404.tpl    |   8 +-
 .../de/html/admin/admin_extensions_delete.tpl |  12 +-
 .../admin/admin_extensions_delete_row.tpl     |   2 +-
 .../de/html/admin/admin_extensions_edit.tpl   |  14 +-
 .../html/admin/admin_extensions_edit_row.tpl  |   2 +-
 .../html/admin/admin_extensions_installed.tpl |   2 +-
 .../de/html/admin/admin_extensions_list.tpl   |   6 +-
 .../de/html/admin/admin_gmenu_delete.tpl      |   6 +-
 templates/de/html/admin/admin_gmenu_edit.tpl  |  14 +-
 .../de/html/admin/admin_gmenu_edit_form.tpl   |   6 +-
 .../de/html/admin/admin_gmenu_status.tpl      |   8 +-
 templates/de/html/admin/admin_guest_add.tpl   |  28 +--
 templates/de/html/admin/admin_list_admins.tpl |  16 +-
 .../de/html/admin/admin_list_admins_row.tpl   |   4 +-
 .../de/html/admin/admin_list_autopurge.tpl    |  16 +-
 .../de/html/admin/admin_list_bank_package.tpl |  20 +-
 .../admin/admin_list_bank_package_row.tpl     |   2 +-
 templates/de/html/admin/admin_list_beg.tpl    |  24 +-
 .../de/html/admin/admin_list_beg_form.tpl     |   6 +-
 .../de/html/admin/admin_list_beg_rows.tpl     |   8 +-
 templates/de/html/admin/admin_list_bonus.tpl  |  24 +-
 .../de/html/admin/admin_list_bonus_emails.tpl |   6 +-
 .../de/html/admin/admin_list_bonus_form.tpl   |   6 +-
 .../de/html/admin/admin_list_bonus_rows.tpl   |   2 +-
 templates/de/html/admin/admin_list_cats.tpl   |   6 +-
 .../de/html/admin/admin_list_cats_404.tpl     |   6 +-
 .../de/html/admin/admin_list_country.tpl      |  14 +-
 .../html/admin/admin_list_country_del_row.tpl |   2 +-
 .../admin/admin_list_country_edit_row.tpl     |   6 +-
 .../de/html/admin/admin_list_country_form.tpl |  14 +-
 .../html/admin/admin_list_country_no_row.tpl  |   3 +-
 .../html/admin/admin_list_doubler_already.tpl |  10 +-
 .../admin/admin_list_doubler_overview.tpl     |  18 +-
 .../html/admin/admin_list_doubler_waiting.tpl |  14 +-
 templates/de/html/admin/admin_list_emails.tpl |   6 +-
 .../de/html/admin/admin_list_emails_row.tpl   |  26 +--
 .../de/html/admin/admin_list_extensions.tpl   |   6 +-
 .../html/admin/admin_list_extensions_row.tpl  |   4 +-
 .../de/html/admin/admin_list_holiday.tpl      |  18 +-
 .../de/html/admin/admin_list_holiday_row.tpl  |   2 +-
 templates/de/html/admin/admin_list_links.tpl  |   6 +-
 .../html/admin/admin_list_links_problem.tpl   |   2 +-
 .../de/html/admin/admin_list_payments.tpl     |  16 +-
 .../de/html/admin/admin_list_payouts.tpl      |  22 +-
 .../html/admin/admin_list_payouts_banner.tpl  |  16 +-
 .../de/html/admin/admin_list_payouts_txt.tpl  |  12 +-
 .../de/html/admin/admin_list_primera_main.tpl |  16 +-
 .../html/admin/admin_list_rallye_noselect.tpl |   2 +-
 .../html/admin/admin_list_rallye_prices.tpl   |  20 +-
 .../admin/admin_list_rallye_prices_row.tpl    |   8 +-
 .../de/html/admin/admin_list_rallye_usr.tpl   |  12 +-
 .../html/admin/admin_list_rallye_usr_row.tpl  |   4 +-
 .../de/html/admin/admin_list_rallyes.tpl      |  14 +-
 .../de/html/admin/admin_list_rallyes_row.tpl  |  48 ++--
 .../de/html/admin/admin_list_rallyes_row2.tpl |   4 +-
 templates/de/html/admin/admin_list_refs.tpl   |  16 +-
 templates/de/html/admin/admin_list_refs2.tpl  |   4 +-
 .../de/html/admin/admin_list_refs_level.tpl   |  14 +-
 .../de/html/admin/admin_list_refs_norefs.tpl  |   2 +-
 .../de/html/admin/admin_list_sponsor.tpl      |   8 +-
 .../html/admin/admin_list_sponsor_details.tpl |  56 ++---
 .../de/html/admin/admin_list_sponsor_pay.tpl  |  16 +-
 .../html/admin/admin_list_sponsor_pay_404.tpl |   2 +-
 .../html/admin/admin_list_sponsor_pay_del.tpl |  20 +-
 .../admin/admin_list_sponsor_pay_edit.tpl     |  20 +-
 .../admin/admin_list_sponsor_pay_edit_row.tpl |   2 +-
 .../de/html/admin/admin_list_sponsor_row.tpl  |  22 +-
 .../html/admin/admin_list_task_ext_rows.tpl   |   2 +-
 .../de/html/admin/admin_list_transfer.tpl     |  18 +-
 .../de/html/admin/admin_list_transfer_row.tpl |   2 +-
 .../de/html/admin/admin_list_unconfirmed.tpl  |  27 ++-
 .../admin/admin_list_unconfirmed_header.tpl   |   8 +-
 .../html/admin/admin_list_unconfirmed_row.tpl |   4 +-
 templates/de/html/admin/admin_list_user.tpl   |   2 +-
 .../de/html/admin/admin_list_user_row.tpl     |  40 ++--
 .../de/html/admin/admin_list_user_sort.tpl    |   2 +-
 .../html/admin/admin_list_user_sort_form.tpl  |   4 +-
 .../de/html/admin/admin_list_wernis_main.tpl  |  16 +-
 .../de/html/admin/admin_lock_sponsor.tpl      |   8 +-
 templates/de/html/admin/admin_lock_user.tpl   |  16 +-
 templates/de/html/admin/admin_login_form.tpl  |  28 +--
 templates/de/html/admin/admin_login_msg.tpl   |   2 +-
 templates/de/html/admin/admin_logout.tpl      |  16 +-
 templates/de/html/admin/admin_logout_form.tpl |   6 +-
 .../admin_logout_sql_patches_install.tpl      |  14 +-
 .../admin/admin_logout_sql_patches_remove.tpl |  10 +-
 .../de/html/admin/admin_maintenance_form.tpl  |   4 +-
 templates/de/html/admin/admin_member_add.tpl  |  28 +--
 .../html/admin/admin_member_selection_box.tpl |   8 +-
 .../de/html/admin/admin_menu_404_row.tpl      |   2 +-
 templates/de/html/admin/admin_menu_failed.tpl |   8 +-
 templates/de/html/admin/admin_menu_hints.tpl  |   4 +-
 .../de/html/admin/admin_menu_hints_row.tpl    |   2 +-
 .../de/html/admin/admin_menu_overview_row.tpl |   2 +-
 .../de/html/admin/admin_menu_unknown_okay.tpl |   2 +-
 templates/de/html/admin/admin_mini_online.tpl |  15 +-
 .../de/html/admin/admin_mmenu_delete.tpl      |   6 +-
 templates/de/html/admin/admin_mmenu_edit.tpl  |   6 +-
 .../de/html/admin/admin_mmenu_overview.tpl    |  14 +-
 .../de/html/admin/admin_mmenu_status.tpl      |   8 +-
 templates/de/html/admin/admin_mods_edit.tpl   |  16 +-
 templates/de/html/admin/admin_mods_list.tpl   |  22 +-
 templates/de/html/admin/admin_mods_stats.tpl  |   7 +-
 templates/de/html/admin/admin_mods_stats2.tpl |   4 +-
 templates/de/html/admin/admin_newsletter.tpl  |  12 +-
 .../de/html/admin/admin_newsletter_nohtml.tpl |  12 +-
 .../de/html/admin/admin_newsletter_tsk.tpl    |   4 +-
 .../de/html/admin/admin_online_header.tpl     |  18 +-
 templates/de/html/admin/admin_optimize.tpl    |  28 +--
 .../de/html/admin/admin_overview_footer.tpl   |   4 +-
 .../html/admin/admin_overview_footer_task.tpl |   8 +-
 .../de/html/admin/admin_overview_header.tpl   |  18 +-
 .../html/admin/admin_overview_header_task.tpl |  30 +--
 .../de/html/admin/admin_overview_list.tpl     |   4 +-
 .../admin/admin_overview_list_ext_rows.tpl    |   2 +-
 .../de/html/admin/admin_overview_row.tpl      |  22 +-
 .../de/html/admin/admin_overview_task.tpl     |  38 ++--
 .../html/admin/admin_overview_task_extras.tpl |   2 +-
 .../html/admin/admin_overview_task_rows.tpl   |   2 +-
 templates/de/html/admin/admin_patches.tpl     |  14 +-
 templates/de/html/admin/admin_patches_row.tpl |   6 +-
 .../html/admin/admin_payout_accept_form.tpl   |  12 +-
 .../de/html/admin/admin_payout_add_new.tpl    |  34 +--
 .../admin/admin_payout_failed_transfer.tpl    |   4 +-
 .../html/admin/admin_payout_overview_form.tpl |  10 +-
 .../html/admin/admin_payout_reject_form.tpl   |  12 +-
 templates/de/html/admin/admin_points.tpl      |  16 +-
 templates/de/html/admin/admin_points_del.tpl  |   6 +-
 .../de/html/admin/admin_points_del_row.tpl    |  11 +-
 templates/de/html/admin/admin_points_edit.tpl |   6 +-
 .../de/html/admin/admin_points_edit_row.tpl   |   4 +-
 templates/de/html/admin/admin_refbanner.tpl   |  18 +-
 .../de/html/admin/admin_refbanner_edit.tpl    |   6 +-
 templates/de/html/admin/admin_reg.tpl         |   2 +-
 templates/de/html/admin/admin_reg_form.tpl    |  14 +-
 templates/de/html/admin/admin_reg_row.tpl     |   4 +-
 .../de/html/admin/admin_reset_pass_done.tpl   |   6 +-
 .../de/html/admin/admin_reset_password.tpl    |  11 +-
 .../html/admin/admin_reset_password_form.tpl  |  15 +-
 .../de/html/admin/admin_send_bonus_form.tpl   |  16 +-
 .../de/html/admin/admin_send_bonus_select.tpl |  18 +-
 .../de/html/admin/admin_send_reset_link.tpl   |  11 +-
 .../de/html/admin/admin_settings_saved.tpl    |  15 +-
 .../de/html/admin/admin_sponsor_paytypes.tpl  |   8 +-
 templates/de/html/admin/admin_sub_points.tpl  |  12 +-
 .../de/html/admin/admin_sub_points_all.tpl    |   8 +-
 .../de/html/admin/admin_task_holiday.tpl      |   4 +-
 templates/de/html/admin/admin_theme_404.tpl   |   8 +-
 templates/de/html/admin/admin_theme_edit.tpl  |   6 +-
 .../de/html/admin/admin_theme_edit_row.tpl    |   2 +-
 .../de/html/admin/admin_theme_import.tpl      |   2 +-
 .../de/html/admin/admin_theme_installed.tpl   |   2 +-
 templates/de/html/admin/admin_theme_list.tpl  |   6 +-
 .../de/html/admin/admin_unlock_emails.tpl     |  22 +-
 .../html/admin/admin_unlock_emails_redir.tpl  |   6 +-
 .../de/html/admin/admin_unlock_emails_row.tpl |   6 +-
 .../de/html/admin/admin_unlock_sponsor.tpl    |  20 +-
 .../html/admin/admin_unlock_sponsor_row.tpl   |   2 +-
 .../html/admin/admin_unlock_surfbar_urls.tpl  |  16 +-
 .../de/html/admin/admin_update_download.tpl   |  12 +-
 .../admin/admin_validate_reset_hash_form.tpl  |  11 +-
 templates/de/html/admin/admin_welcome.tpl     |  20 +-
 .../de/html/admin/admin_welcome_admins.tpl    |  23 +-
 .../de/html/admin/admin_yoomedia_error.tpl    |   2 +-
 templates/de/html/agb.tpl                     |   2 +-
 templates/de/html/beg/beg_banner.tpl          |   2 +-
 templates/de/html/beg/beg_done.tpl            |   4 +-
 templates/de/html/beg/beg_failed.tpl          |   4 +-
 templates/de/html/beg/beg_link.tpl            |   9 +-
 templates/de/html/beg/beg_login.tpl           |   4 +-
 .../de/html/birthday/birthday_footer.tpl      |   2 +-
 .../de/html/birthday/birthday_header.tpl      |   2 +-
 templates/de/html/birthday/birthday_msg.tpl   |   6 +-
 templates/de/html/doubler/doubler_footer.tpl  |   2 +-
 templates/de/html/doubler/doubler_header.tpl  |   2 +-
 templates/de/html/doubler/doubler_index.tpl   |  48 ++--
 templates/de/html/doubler/doubler_reflink.tpl |   2 +-
 templates/de/html/ext/ext_active.tpl          |   8 +-
 templates/de/html/ext/ext_cache.tpl           |   2 +-
 templates/de/html/ext/ext_primera.tpl         |  12 +-
 templates/de/html/ext/ext_rewrite.tpl         |   4 +-
 templates/de/html/ext/ext_task.tpl            |   2 +-
 templates/de/html/ext/ext_transfer.tpl        |   2 +-
 templates/de/html/ext/ext_wernis.tpl          |  12 +-
 templates/de/html/fatal_footer.tpl            |   4 +-
 templates/de/html/fatal_header.tpl            |   2 +-
 .../de/html/guest/guest_active_none_row.tpl   |   2 +-
 .../de/html/guest/guest_active_table.tpl      |  14 +-
 templates/de/html/guest/guest_beg.tpl         |  18 +-
 .../de/html/guest/guest_confirm_link.tpl      |   6 +-
 .../de/html/guest/guest_confirm_table.tpl     |   2 +-
 .../de/html/guest/guest_content_footer.tpl    |   4 +-
 templates/de/html/guest/guest_doubler.tpl     |  82 +++----
 .../de/html/guest/guest_doubler_list.tpl      |   6 +-
 templates/de/html/guest/guest_goto_top.tpl    |   4 +-
 templates/de/html/guest/guest_header.tpl      |  16 +-
 templates/de/html/guest/guest_login.tpl       |  46 ++--
 templates/de/html/guest/guest_menu_whats.tpl  |   2 +-
 .../de/html/guest/guest_nickname_login.tpl    |  46 ++--
 templates/de/html/guest/guest_no_rallyes.tpl  |  12 +-
 .../guest/guest_rallye_expired_footer.tpl     |   5 +-
 .../guest/guest_rallye_expired_header.tpl     |  10 +-
 .../de/html/guest/guest_rallye_footer.tpl     |  12 +-
 .../de/html/guest/guest_rallye_header.tpl     |   6 +-
 templates/de/html/guest/guest_rallye_show.tpl |  38 ++--
 .../de/html/guest/guest_receive_table.tpl     |   6 +-
 templates/de/html/guest/guest_register.tpl    |  22 +-
 .../html/guest/guest_register_refid_hide.tpl  |   2 +-
 .../de/html/guest/guest_sponsor_act_row.tpl   |   2 +-
 .../de/html/guest/guest_sponsor_activate.tpl  |  22 +-
 .../de/html/guest/guest_sponsor_infos.tpl     |   8 +-
 .../de/html/guest/guest_sponsor_login.tpl     |  18 +-
 .../de/html/guest/guest_sponsor_lost.tpl      |  22 +-
 .../de/html/guest/guest_sponsor_pay_row.tpl   |   6 +-
 templates/de/html/guest/guest_sponsor_reg.tpl |  62 +++---
 .../de/html/guest/guest_stats_member.tpl      |  10 +-
 templates/de/html/guest/guest_top10.tpl       |  52 ++---
 templates/de/html/impressum.tpl               |   8 +-
 templates/de/html/index.tpl                   |  26 +--
 .../de/html/install/install_fatal_row.tpl     |   4 +-
 .../de/html/install/install_fatal_table.tpl   |  10 +-
 .../de/html/install/install_finished.tpl      |   8 +-
 templates/de/html/install/install_footer.tpl  |   3 +-
 templates/de/html/install/install_header.tpl  |   6 +-
 templates/de/html/install/install_page1.tpl   |  10 +-
 templates/de/html/install/install_page2.tpl   |  10 +-
 templates/de/html/install/install_page3.tpl   |  10 +-
 templates/de/html/install/install_welcome.tpl |   8 +-
 templates/de/html/lead_code.tpl               |   6 +-
 templates/de/html/loader.tpl                  |   4 +-
 .../de/html/mailid/mailid_confirm_buttom.tpl  |   4 +-
 .../de/html/mailid/mailid_enter_code.tpl      |   4 +-
 .../de/html/mailid/mailid_points_done.tpl     |   8 +-
 .../de/html/mailid/mailid_points_done2.tpl    |  10 +-
 .../de/html/mailid/mailid_points_failed.tpl   |   4 +-
 .../de/html/mailid/mailid_points_locked.tpl   |   4 +-
 .../de/html/mailid/mailid_points_locked2.tpl  |   8 +-
 templates/de/html/mailid/mailid_timer.tpl     |   4 +-
 templates/de/html/mediadata.tpl               |   6 +-
 templates/de/html/member/member_beg.tpl       |  12 +-
 templates/de/html/member/member_bonus.tpl     |  30 +--
 .../de/html/member/member_cats_footer.tpl     |   2 +-
 .../de/html/member/member_cats_header.tpl     |   6 +-
 .../de/html/member/member_content_right.tpl   |   4 +-
 templates/de/html/member/member_doubler.tpl   |  80 +++----
 .../de/html/member/member_doubler_list.tpl    |   8 +-
 templates/de/html/member/member_goto_top.tpl  |   4 +-
 templates/de/html/member/member_header.tpl    |  14 +-
 .../html/member/member_holiday_deactivate.tpl |   8 +-
 .../de/html/member/member_holiday_form.tpl    |  12 +-
 .../html/member/member_html_mail_settings.tpl |   6 +-
 templates/de/html/member/member_list_beg.tpl  |  28 +--
 .../de/html/member/member_menu_whats.tpl      |   2 +-
 .../de/html/member/member_mydata_button.tpl   |   4 +-
 .../de/html/member/member_mydata_edit.tpl     |  20 +-
 .../de/html/member/member_mydata_overview.tpl |  24 +-
 .../de/html/member/member_newsletter.tpl      |  17 +-
 .../de/html/member/member_newsletter_note.tpl |   4 +-
 .../de/html/member/member_nickname_form.tpl   |   6 +-
 .../de/html/member/member_order-back.tpl      |   8 +-
 .../de/html/member/member_order-html_ext.tpl  |   2 +-
 .../html/member/member_order-html_intro.tpl   |   2 +-
 .../de/html/member/member_order-zip1.tpl      |  18 +-
 .../de/html/member/member_order-zip2.tpl      |   2 +-
 .../de/html/member/member_order_back.tpl      |   4 +-
 .../de/html/member/member_order_page1.tpl     |   4 +-
 .../de/html/member/member_order_page2.tpl     |  60 ++---
 .../de/html/member/member_order_points.tpl    |   8 +-
 templates/de/html/member/member_payout.tpl    |  12 +-
 .../de/html/member/member_payout_form.tpl     |  22 +-
 .../html/member/member_payout_form_banner.tpl |  12 +-
 templates/de/html/member/member_points.tpl    |  16 +-
 .../member/member_points_bonus_disabled.tpl   |   2 +-
 .../html/member/member_points_bonus_rows.tpl  |  10 +-
 .../de/html/member/member_points_upgrade.tpl  |   6 +-
 templates/de/html/member/member_pool_row.tpl  |  18 +-
 .../de/html/member/member_pool_table.tpl      |   2 +-
 templates/de/html/member/member_primera.tpl   |  10 +-
 .../de/html/member/member_primera_form.tpl    |  20 +-
 .../html/member/member_primera_mode_list.tpl  |  10 +-
 .../html/member/member_primera_mode_pay.tpl   |   8 +-
 .../de/html/member/member_receive_table.tpl   |   6 +-
 .../de/html/member/member_reflinks_row.tpl    |  12 +-
 .../de/html/member/member_reflinks_table.tpl  |   4 +-
 templates/de/html/member/member_stats_row.tpl |  18 +-
 .../de/html/member/member_stats_table.tpl     |   2 +-
 .../de/html/member/member_support_form.tpl    |  38 ++--
 .../member_surfbar_delete_action_form.tpl     |   2 +-
 templates/de/html/member/member_themes.tpl    |  10 +-
 .../de/html/member/member_transfer_list.tpl   |  18 +-
 .../de/html/member/member_transfer_new.tpl    |  16 +-
 .../html/member/member_transfer_overview.tpl  |  12 +-
 .../html/member/member_transfer_settings.tpl  |   4 +-
 .../de/html/member/member_unconfirmed_404.tpl |   2 +-
 .../member_unconfirmed_404_nopoints.tpl       |   2 +-
 .../de/html/member/member_welcome_header.tpl  |   4 +-
 templates/de/html/member/member_wernis.tpl    |  10 +-
 templates/de/html/online_now.tpl              |   9 +-
 templates/de/html/page_footer.tpl             |   3 +-
 templates/de/html/profile-update.tpl          |  12 +-
 templates/de/html/redirect_url.tpl            |   2 +-
 templates/de/html/register_header.tpl         |   2 +-
 templates/de/html/runtime_fatal_row.tpl       |   4 +-
 templates/de/html/runtime_fatal_table.tpl     |  10 +-
 templates/de/html/show_bonus_footer.tpl       |   2 +-
 templates/de/html/show_bonus_header.tpl       |   2 +-
 templates/de/html/show_bonus_msg.tpl          |  17 +-
 templates/de/html/show_bonus_yr.tpl           |   8 +-
 .../de/html/sponsor/sponsor_account_form.tpl  |  30 +--
 templates/de/html/sponsor/sponsor_action.tpl  |   2 +-
 .../de/html/sponsor/sponsor_fillup_form.tpl   |  10 +-
 templates/de/html/sponsor/sponsor_header.tpl  |   2 +-
 templates/de/html/sponsor/sponsor_main.tpl    |   4 +-
 .../de/html/sponsor/sponsor_settings_form.tpl |  28 +--
 templates/de/html/sponsor/sponsor_what.tpl    |   6 +-
 .../de/html/surfbar/surfbar_frame_start.tpl   |   2 +-
 templates/de/html/theme_one.tpl               |   2 +-
 templates/de/html/theme_select_form.tpl       |   8 +-
 templates/en/html/admin/admin_welcome.tpl     |   4 +-
 templates/en/html/impressum.tpl               |   2 +-
 templates/en/html/register_header.tpl         |   2 +-
 templates/en/html/welcome.tpl                 |   2 +-
 603 files changed, 3678 insertions(+), 3783 deletions(-)

diff --git a/inc/databases.php b/inc/databases.php
index 768f9b6264..ae2d16ee63 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -97,7 +97,7 @@ define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "716");
+define('CURR_SVN_REVISION', "717");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index b1104563e5..e889278f6b 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -67,7 +67,7 @@ Query string:<br />
 	incrementConfigEntry('sql_count');
 
 	// Debug output
-	//* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
+	//* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
 
 	if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
 		//
diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index eaeec47073..b9de7cb7a9 100644
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -95,12 +95,12 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
-		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<STRONG>Heute Online</STRONG> im Gastbereich) vornehmen.', 8)";
+		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<strong>Heute Online</strong> im Gastbereich) vornehmen.', 8)";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschr&auml;nkbar.";
diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index 9b334e5508..598516e96c 100644
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -110,7 +110,7 @@ PRIMARY KEY (id)
 ) TYPE=MyISAM";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Sogn. ACLs werden hinzugef&uuml;gt: <STRONG>A</STRONG>ccess <STRONG>C</STRONG>ontrol <STRONG>L</STRONG>ines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen k&ouml;nnen, was welcher Admin machen darf oder nicht.";
+		$UPDATE_NOTES = "Sogn. ACLs werden hinzugef&uuml;gt: <strong>A</strong>ccess <strong>C</strong>ontrol <strong>L</strong>ines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen k&ouml;nnen, was welcher Admin machen darf oder nicht.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
@@ -185,7 +185,7 @@ PRIMARY KEY (id)
 
 	case "0.5.3": // SQL queries for v0.5.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.5.4": // SQL queries for v0.5.4
@@ -202,12 +202,12 @@ PRIMARY KEY (id)
 		$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <STRONG>admins</STRONG> und (kommender) <STRONG>contact</STRONG>.";
+		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";
 		break;
 
 	case "0.5.7": // SQL queries for v0.5.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Links wegen <STRONG>what=admins_contct</STRONG> ge&auml;ndert.";
+		$UPDATE_NOTES = "Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.";
 		break;
 
 	case "0.5.8": // SQL queries for v0.5.8
@@ -256,19 +256,19 @@ PRIMARY KEY (id)
 		$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <STRONG>admins</STRONG> und (kommender) <STRONG>contact</STRONG>.";
+		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";
 		break;
 
 	case "0.6.7": // SQL queries for v0.6.7
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins ADD la_mode ENUM('global','OLD','NEW') NOT NULL DEFAULT 'global'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <STRONG>admins</STRONG> und (kommender) <STRONG>contact</STRONG>. Beseitigung eines Fehlers <STRONG>HTTP_POSR_VARS</STRONG> beim &Auml;ndern von Administratoren.";
+		$UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>. Beseitigung eines Fehlers <strong>HTTP_POSR_VARS</strong> beim &Auml;ndern von Administratoren.";
 		break;
 
 	case "0.6.8": // SQL queries for v0.6.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>set_session()</STRONG> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
+		$UPDATE_NOTES = "<strong>set_session()</strong> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
 		break;
 
 	case "0.6.9": // SQL queries for v0.6.9
diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index e842712573..3566621b66 100644
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -102,13 +102,13 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> behoben.";
+		$UPDATE_NOTES = "Fehler <div class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</div> behoben.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
 		// Update notes (these will be set as task text!)
 
-		$UPDATE_NOTES = "Anstelle von <STRONG>ref_depth</STRONG> wurde <STRONG>level</STRONG> programmiert.";
+		$UPDATE_NOTES = "Anstelle von <strong>ref_depth</strong> wurde <strong>level</strong> programmiert.";
 		break;
 
 	case "0.1.6": // SQL queries for v0.1.6
@@ -131,7 +131,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD ap_tasks_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*7)."'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
@@ -140,7 +140,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD ap_tasks_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
+		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
@@ -165,7 +165,7 @@ case "update": // Update an extension
 
 	case "0.2.5": // SQL queries for v0.2.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -175,12 +175,12 @@ case "update": // Update an extension
 
 	case "0.2.7": // SQL queries for v0.2.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.2.9": // SQL queries for v0.2.9
@@ -200,7 +200,7 @@ case "update": // Update an extension
 
 	case "0.3.2": // SQL queries for v0.3.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.3.3": // SQL queries for v0.3.3
@@ -214,12 +214,12 @@ case "update": // Update an extension
 
 	case "0.3.4": // SQL queries for v0.3.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler mit <STRONG>timestamp_send</STRONG> (Zeile 308) beseitigt.";
+		$UPDATE_NOTES = "Fehler mit <strong>timestamp_send</strong> (Zeile 308) beseitigt.";
 		break;
 
 	case "0.3.5": // SQL queries for v0.3.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler mit <STRONG>ap_del_emails</STRONG> (Einstellungen im Admin-Bereich) beseitigt.";
+		$UPDATE_NOTES = "Fehler mit <strong>ap_del_emails</strong> (Einstellungen im Admin-Bereich) beseitigt.";
 		break;
 
 	case "0.3.6": // SQL queries for v0.3.6
@@ -239,7 +239,7 @@ case "update": // Update an extension
 
 	case "0.3.9": // SQL queries for v0.3.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt. Unter <STRONG>Auto-L&ouml;schung</STRONG> finden Sie nun auch die Einstellungen zu Mailbest&auml;tigungs wieder. Zudem werden keine Urlauber (neue Urlaubsschaltung beachtet) mehr als inaktiv erkannt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt. Unter <strong>Auto-L&ouml;schung</strong> finden Sie nun auch die Einstellungen zu Mailbest&auml;tigungs wieder. Zudem werden keine Urlauber (neue Urlaubsschaltung beachtet) mehr als inaktiv erkannt.";
 		break;
 
 	case "0.4.0": // SQL queries for v0.4.0
diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 2a8013daf2..c070d2b991 100644
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -103,7 +103,7 @@ case "update": // Update an extension
 
 	case "0.0.2": // SQL queries for v0.0.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
@@ -115,7 +115,7 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "&Uuml;berlange Kommastellen bei Punktangaben aus Bettellink und Gastbereich entfernt und Admin-Templates repariert (&quot;Unbekannte Spalte <U>beg_points_ma</U>&quot;).";
+		$UPDATE_NOTES = "&Uuml;berlange Kommastellen bei Punktangaben aus Bettellink und Gastbereich entfernt und Admin-Templates repariert (&quot;Unbekannte Spalte <u>beg_points_ma</u>&quot;).";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
@@ -127,7 +127,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD beg_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ein Mitgliedsaccount (empfehlenswert ist Ihr eigenes!) kann zum Abbuchen der {!POINTS!} verwendet werden. Template <U>admin_config_beg.tpl</U> (und pro!) nicht vergessen, zu aktualisieren.";
+		$UPDATE_NOTES = "Ein Mitgliedsaccount (empfehlenswert ist Ihr eigenes!) kann zum Abbuchen der {!POINTS!} verwendet werden. Template <u>admin_config_beg.tpl</u> (und pro!) nicht vergessen, zu aktualisieren.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
@@ -175,7 +175,7 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Rechtlichen Hinweis im Mitgliedsbereich vergessen (<STRONG>member_list_beg.tpl</STRONG>); Template <STRONG>member_beg_404.tpl</STRONG> fehlte!";
+		$UPDATE_NOTES = "Rechtlichen Hinweis im Mitgliedsbereich vergessen (<strong>member_list_beg.tpl</strong>); Template <strong>member_beg_404.tpl</strong> fehlte!";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
@@ -201,7 +201,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD beg_ral_di_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Die Mitglieder k&ouml;nnen nun optional automatisch &uuml;ber eine aktivierte und/oder deaktivierte Bettel-Rallye informiert werden. Beide Benachrichtigungen k&ouml;nnen Sie unter <STRONG>Einstellungen --&gt; Bettel-Link/-rallye</STRONG> seperat ein- und ausschalten! Zudem ist eine Sperre gegen eingeloggte Mitglieder eingebaut, die das Klicken auf den eigenen Bettel-Link etwas erschweren soll.";
+		$UPDATE_NOTES = "Die Mitglieder k&ouml;nnen nun optional automatisch &uuml;ber eine aktivierte und/oder deaktivierte Bettel-Rallye informiert werden. Beide Benachrichtigungen k&ouml;nnen Sie unter <strong>Einstellungen --&gt; Bettel-Link/-rallye</strong> seperat ein- und ausschalten! Zudem ist eine Sperre gegen eingeloggte Mitglieder eingebaut, die das Klicken auf den eigenen Bettel-Link etwas erschweren soll.";
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
@@ -221,7 +221,7 @@ case "update": // Update an extension
 
 	case "0.2.1": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <STRONG>unknown column &#39;uid&#39;</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Fehler <strong>unknown column &#39;uid&#39;</strong> beseitigt.";
 		break;
 
 	case "0.2.2": // SQL queries for v0.2.2
diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 12a7393400..4338ca9c54 100644
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -117,7 +117,7 @@ PRIMARY KEY(id)
 
 	case "0.2.7": // SQL queries for v0.2.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Sicherheitsupdate am Script <U>birtday_confirm.php</U> durchgef&uuml;hrt.";
+		$UPDATE_NOTES = "Sicherheitsupdate am Script <u>birtday_confirm.php</u> durchgef&uuml;hrt.";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
@@ -127,17 +127,17 @@ PRIMARY KEY(id)
 
 	case "0.2.9": // SQL queries for v0.2.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.3.0": // SQL queries for v0.3.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <U>inc/footer.php</U> verlagert.";
+		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <u>inc/footer.php</u> verlagert.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Wort <STRONG>Punkte</STRONG> dynamisiert.";
+		$UPDATE_NOTES = "Wort <strong>Punkte</strong> dynamisiert.";
 		break;
 
 	case "0.3.2": // SQL queries for v0.3.2
@@ -170,12 +170,12 @@ PRIMARY KEY(id)
 
 	case "0.3.7": // SQL queries for v0.3.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Im Script <STRONG>inc/birthday_mails.php</STRONG> hat sich ein Zeichen mit dem Code 160 eingeschlichen, welches einen <STRONG>Parser Error</STRONG> verursachte, aber wie eine gew&ouml;hnliche Leerstelle aussah.";
+		$UPDATE_NOTES = "Im Script <strong>inc/birthday_mails.php</strong> hat sich ein Zeichen mit dem Code 160 eingeschlichen, welches einen <strong>Parser Error</strong> verursachte, aber wie eine gew&ouml;hnliche Leerstelle aussah.";
 		break;
 
 	case "0.3.8": // SQL queries for v0.3.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.3.9": // SQL queries for v0.3.9
diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index a770c62193..e5b7b0711f 100644
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -110,14 +110,14 @@ case "update": // Update an extension
 	{
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Paid-Links wurden verschoben in die Erweiterung <STRONG>paidlinks</STRONG>.";
+		$UPDATE_NOTES = "Paid-Links wurden verschoben in die Erweiterung <strong>paidlinks</strong>.";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
 		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_bonus SET target_send=mails_sent WHERE target_send='0' AND mails_sent>0 AND receivers != ''";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <A href=\"{!URL!}/modules.php?module=admin&amp;what=updates\">Updates pr&uuml;fen</A> herunter.";
+		$UPDATE_NOTES = "Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <a href=\"{!URL!}/modules.php?module=admin&amp;what=updates\">Updates pr&uuml;fen</a> herunter.";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
@@ -175,7 +175,7 @@ KEY userid (userid)
 		$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_bonus_customer";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Tabellen <U>"._MYSQL_PREFIX."_bonus_urls</U> und <U>"._MYSQL_PREFIX."_bonus_customer</U> entfernt, da dies bald von der Erweiterung <U>paidlinks</U> erledigt wird.";
+		$UPDATE_NOTES = "Tabellen <u>"._MYSQL_PREFIX."_bonus_urls</u> und <u>"._MYSQL_PREFIX."_bonus_customer</u> entfernt, da dies bald von der Erweiterung <u>paidlinks</u> erledigt wird.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -212,7 +212,7 @@ KEY userid (userid)
 
 	case "0.3.1": // SQL queries for v0.3.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Sicherheitsupdate am Script <U>show_bonus.php</U> durchgef&uuml;hrt.";
+		$UPDATE_NOTES = "Sicherheitsupdate am Script <u>show_bonus.php</u> durchgef&uuml;hrt.";
 		break;
 
 	case "0.3.2": // SQL queries for v0.3.2
@@ -222,14 +222,14 @@ KEY userid (userid)
 
 	case "0.3.3": // SQL queries for v0.3.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.3.4": // SQL queries for v0.3.4
 		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit m&ouml;glichen Gewinner an.', 10)";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link <U>Aktiv-Rallye-Teilnehmer</U> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";
+		$UPDATE_NOTES = "Link <u>Aktiv-Rallye-Teilnehmer</u> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";
 		break;
 
 	case "0.3.5": // SQL queries for v0.3.5
@@ -252,7 +252,7 @@ KEY userid (userid)
 
 	case "0.3.8": // SQL queries for v0.3.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <U>inc/footer.php</U> verlagert.";
+		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <u>inc/footer.php</u> verlagert.";
 		break;
 
 	case "0.3.9": // SQL queries for v0.3.9
@@ -275,7 +275,7 @@ KEY userid (userid)
 
 	case "0.4.2": // SQL queries for v0.4.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Admin-Bereich / Aktiv-Teilnehmer auflisten: Problem mit Konstante __AUTOPURGE_TIMEOUT und das Template <U>admin_list_bonus.tpl</U> korregiert.";
+		$UPDATE_NOTES = "Admin-Bereich / Aktiv-Teilnehmer auflisten: Problem mit Konstante __AUTOPURGE_TIMEOUT und das Template <u>admin_list_bonus.tpl</u> korregiert.";
 		break;
 
 	case "0.4.3": // SQL queries for v0.4.3
@@ -316,7 +316,7 @@ KEY userid (userid)
 
 	case "0.4.8": // SQL queries for v0.4.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "In <U>inc/monthly_bonus.php</U> fehlte ein Punkt; Fehler besseitigt.";
+		$UPDATE_NOTES = "In <u>inc/monthly_bonus.php</u> fehlte ein Punkt; Fehler besseitigt.";
 		break;
 
 	case "0.4.9": // SQL queries for v0.4.9
@@ -326,32 +326,32 @@ KEY userid (userid)
 
 	case "0.5.0": // SQL queries for v0.5.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Problem mit <STRONG>is_hundred</STRONG> beim t&auml;glichen Reset beseitigt.";
+		$UPDATE_NOTES = "Problem mit <strong>is_hundred</strong> beim t&auml;glichen Reset beseitigt.";
 		break;
 
 	case "0.5.1": // SQL queries for v0.5.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Problem mit <STRONG>bonus_stats / Zeile 31</STRONG> beim t&auml;glichen Reset beseitigt.";
+		$UPDATE_NOTES = "Problem mit <strong>bonus_stats / Zeile 31</strong> beim t&auml;glichen Reset beseitigt.";
 		break;
 
 	case "0.5.2": // SQL queries for v0.5.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.5.3": // SQL queries for v0.5.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Speichern der Aktiv-{!POINTS!} f&uuml;r Platz 2 bis <STRONG>x</STRONG> korregiert.";
+		$UPDATE_NOTES = "Speichern der Aktiv-{!POINTS!} f&uuml;r Platz 2 bis <strong>x</strong> korregiert.";
 		break;
 
 	case "0.5.4": // SQL queries for v0.5.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Variablenfehler in <STRONG>inc/monthly_bonus.php</STRONG> behoben.";
+		$UPDATE_NOTES = "Variablenfehler in <strong>inc/monthly_bonus.php</strong> behoben.";
 		break;
 
 	case "0.5.5": // SQL queries for v0.5.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Weitere Variablenfehler in <STRONG>inc/monthly_bonus.php</STRONG> haben daf&uuml;r gesorgt, dass die monatliche Aktiv-Rallye nicht ausgesch&uuml;ttet wurde. Mit diesem Update wurde die Aussch&uuml;ttung initialisiert. Ihre Mitglieder bekommen voraussichtlicht nichts doppelt verg&uuml;tet.";
+		$UPDATE_NOTES = "Weitere Variablenfehler in <strong>inc/monthly_bonus.php</strong> haben daf&uuml;r gesorgt, dass die monatliche Aktiv-Rallye nicht ausgesch&uuml;ttet wurde. Mit diesem Update wurde die Aussch&uuml;ttung initialisiert. Ihre Mitglieder bekommen voraussichtlicht nichts doppelt verg&uuml;tet.";
 		break;
 
 	case "0.5.6": // SQL queries for v0.5.6
@@ -377,15 +377,15 @@ WHERE last_online < ".$mark." ORDER BY userid";
 
 	case "0.5.8": // SQL queries for v0.5.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Problem mit <STRONG>is_hundred</STRONG> beim t&auml;glichen Reset endlich beseitigt.";
+		$UPDATE_NOTES = "Problem mit <strong>is_hundred</strong> beim t&auml;glichen Reset endlich beseitigt.";
 		break;
 
 	case "0.5.9": // SQL queries for v0.5.9
-		$UPDATE_NOTES = "Fehlermeldung <STRONG>/home/verzeichnis/html/inc/stats_bonus.php (42):You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' WHERE userid='59' LIMIT 1' at line 1</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Fehlermeldung <strong>/home/verzeichnis/html/inc/stats_bonus.php (42):You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' WHERE userid='59' LIMIT 1' at line 1</strong> beseitigt.";
 		break;
 
 	case "0.6.0": // SQL queries for v0.6.0
-		$UPDATE_NOTES = "SQL-Fehlermeldung in <STRONG>inc/monthly_bonus.php</STRONG> beseitigt.";
+		$UPDATE_NOTES = "SQL-Fehlermeldung in <strong>inc/monthly_bonus.php</strong> beseitigt.";
 		break;
 
 	case "0.6.1": // SQL queries for v0.6.1
@@ -457,7 +457,7 @@ WHERE last_online < ".$mark." ORDER BY userid";
 		break;
 
 	case "0.7.4": // SQL queries for v0.7.4
-		$UPDATE_NOTES = "Rechtlichen Hinweis im Mitgliedsbereich vergessen. (<STRONG>member_bonus.tpl</STRONG>)";
+		$UPDATE_NOTES = "Rechtlichen Hinweis im Mitgliedsbereich vergessen. (<strong>member_bonus.tpl</strong>)";
 		break;
 
 	case "0.7.5": // SQL queries for v0.7.5
@@ -488,7 +488,7 @@ WHERE last_online < ".$mark." ORDER BY userid";
 		break;
 
 	case "0.7.9": // SQL queries for v0.7.9
-		$UPDATE_NOTES = "Dollarzeichen fehlte in <STRONG>inc/reset/reset_bonus.php</STRONG>, Zeile 39";
+		$UPDATE_NOTES = "Dollarzeichen fehlte in <strong>inc/reset/reset_bonus.php</strong>, Zeile 39";
 		break;
 
 	case "0.8.0": // SQL queries for v0.8.0
diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 9d5f72a052..8856b76a46 100644
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -134,7 +134,7 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Das Umschreiben der Cache-Daten hat eine Fehlermeldung <STRONG>Falsches Passwort!</STRONG> im Admin-Bereich verursacht.";
+		$UPDATE_NOTES = "Das Umschreiben der Cache-Daten hat eine Fehlermeldung <strong>Falsches Passwort!</strong> im Admin-Bereich verursacht.";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
@@ -149,12 +149,12 @@ case "update": // Update an extension
 
 	case "0.1.1": // SQL queries for v0.1.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <STRONG>Division durch 0</STRONG> repariert in den DB-Cache Statistiken.";
+		$UPDATE_NOTES = "Fehler <strong>Division durch 0</strong> repariert in den DB-Cache Statistiken.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Die Tabelen <STRONG>"._MYSQL_PREFIX."_config</STRONG>, <STRONG>"._MYSQL_PREFIX."_refsystem</STRONG>, <STRONG>"._MYSQL_PREFIX."_refdepths</STRONG> und <STRONG>"._MYSQL_PREFIX."_mod_reg</STRONG> werden nun auch ausgelagert.";
+		$UPDATE_NOTES = "Die Tabelen <strong>"._MYSQL_PREFIX."_config</strong>, <strong>"._MYSQL_PREFIX."_refsystem</strong>, <strong>"._MYSQL_PREFIX."_refdepths</strong> und <strong>"._MYSQL_PREFIX."_mod_reg</strong> werden nun auch ausgelagert.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
@@ -172,7 +172,7 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <STRONG>Division durch 0</STRONG> repariert in <STRONG>inc/load_cache.php</STRONG>.";
+		$UPDATE_NOTES = "Fehler <strong>Division durch 0</strong> repariert in <strong>inc/load_cache.php</strong>.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php
index d6e8cc589b..db8cd56bb7 100644
--- a/inc/extensions/ext-demo.php
+++ b/inc/extensions/ext-demo.php
@@ -73,7 +73,7 @@ case "update": // Update an extension
 	{
 	case "0.0.1": // SQL queries for v0.0.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 	}
 	break;
diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 75cc6c2d3f..bb18e8f22a 100644
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -182,7 +182,7 @@ case "update": // Update an extension
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
@@ -202,7 +202,7 @@ case "update": // Update an extension
 
 	case "0.1.1": // SQL queries for v0.1.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Zwei SQL-Fehler in <STRONG>inc/doubler_send.php</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Zwei SQL-Fehler in <strong>inc/doubler_send.php</strong> beseitigt.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
@@ -224,7 +224,7 @@ case "update": // Update an extension
 
 	case "0.1.5": // SQL queries for v0.1.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.1.6": // SQL queries for v0.1.6
diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index fec355f877..128a8ba22e 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -121,7 +121,7 @@ case "update": // Update an extension
 
 	case "0.0.6": // SQL queries for v0.0.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.7": // SQL queries for v0.0.7
@@ -131,12 +131,12 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
@@ -160,7 +160,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*2)."'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf <STRONG>Urlaub</STRONG> geschaltet. Lassen Sie sich nicht davon verwirren, dass sie &quot;freigegeben&quot; sind!";
+		$UPDATE_NOTES = "Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf <strong>Urlaub</strong> geschaltet. Lassen Sie sich nicht davon verwirren, dass sie &quot;freigegeben&quot; sind!";
 		break;
 
 	case "0.1.4": // SQL queries for v0.1.4
@@ -186,7 +186,7 @@ case "update": // Update an extension
 
 	case "0.1.7": // SQL queries for v0.1.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.";
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 688ffb9329..9edf5a461b 100644
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -99,12 +99,12 @@ case "update": // Update an extension
 
 	case "0.1.1": // SQL queries for v0.1.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
@@ -165,7 +165,7 @@ default: // Do stuff when extension is loaded
 	// Valid email chars (without @, or do you want to have another @ inside your email addy?)
 	$VALID_EMAIL_CHARS = array(
 		'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s',
-		't','u','v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
+		't','u','v','w','x','y','z','a','B','C','D','E','F','G','H','I','J','K','L',
 		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1',
 		'2','3','4','5','6','7','8','9'
 	);
diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php
index 64066bd5ee..eaab53f82b 100644
--- a/inc/extensions/ext-iso3166.php
+++ b/inc/extensions/ext-iso3166.php
@@ -321,7 +321,7 @@ VALUES ('AD', 'Andorra', 'ext-iso3166'),
 		$EXT_UPDATE_DEPENDS = "country";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Erste Liste von 243 L&auml;ndercodes nach ISO 3166. (Quelle: Selfhtml)<br>Alle L&auml;nder sind zuerst deaktiviert. Achtung DE k&ouml;nnte doppelt vorkommen.<br>Ein Aktivieren/Deaktivieren l&auml;sst alle L&auml;nder beim Registrieren anzeigen oder nicht Anzeigen.";
+		$UPDATE_NOTES = "Erste Liste von 243 L&auml;ndercodes nach ISO 3166. (Quelle: Selfhtml)<br />Alle L&auml;nder sind zuerst deaktiviert. Achtung DE k&ouml;nnte doppelt vorkommen.<br />Ein Aktivieren/Deaktivieren l&auml;sst alle L&auml;nder beim Registrieren anzeigen oder nicht Anzeigen.";
 		break;
 
 	}
diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php
index d9e3367476..86649ecd10 100644
--- a/inc/extensions/ext-mailid.php
+++ b/inc/extensions/ext-mailid.php
@@ -83,12 +83,12 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Absicherung der Variablen <I>uid</I>, <I>mailid</I> und <I>bonusid</I> durch die eigene Funktion <I>bigintval()</I> in den beiden Dateien <I>mailid.php</I> und <I>mailid_top.php</I>.";
+		$UPDATE_NOTES = "Absicherung der Variablen <em>uid</em>, <em>mailid</em> und <em>bonusid</em> durch die eigene Funktion <em>bigintval()</em> in den beiden Dateien <em>mailid.php</em> und <em>mailid_top.php</em>.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Weisse Seite im Mozilla bzw. <I>Seite nicht gefunden</I> unter dem IE behoben.";
+		$UPDATE_NOTES = "Weisse Seite im Mozilla bzw. <em>Seite nicht gefunden</em> unter dem IE behoben.";
 		break;
 
 	case "0.0.6": // SQL queries for v0.0.6
@@ -123,7 +123,7 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Probe-Fix wegen falschen Best&auml;tigungcodes bei Druck auf Return-Taste. Bitte aktualisieren Sie auch das Template <U>mailid_confirm_buttom.tpl</U>, damit die Best&auml;tigung ohne Code auch klappt!";
+		$UPDATE_NOTES = "Probe-Fix wegen falschen Best&auml;tigungcodes bei Druck auf Return-Taste. Bitte aktualisieren Sie auch das Template <u>mailid_confirm_buttom.tpl</u>, damit die Best&auml;tigung ohne Code auch klappt!";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
@@ -133,7 +133,7 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Sicherheitsupdate an den Scripten <U>mailid.php</U> und <STRONG>mailid_top.php</STRONG> durchgef&uuml;hrt.";
+		$UPDATE_NOTES = "Sicherheitsupdate an den Scripten <u>mailid.php</u> und <strong>mailid_top.php</strong> durchgef&uuml;hrt.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
@@ -143,12 +143,12 @@ case "update": // Update an extension
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Template <U>mailid_frameset.tpl</U> nach <U>mailid_frames.tpl</U> umbenannt.";
+		$UPDATE_NOTES = "Template <u>mailid_frameset.tpl</u> nach <u>mailid_frames.tpl</u> umbenannt.";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <U>inc/footer.php</U> verlagert.";
+		$UPDATE_NOTES = "Ausgabe des generierten HTML-Codes nach <u>inc/footer.php</u> verlagert.";
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
@@ -158,7 +158,7 @@ case "update": // Update an extension
 
 	case "0.1.9": // SQL queries for v0.1.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Gesamt-{!POINTS!} werden nun nach Best&auml;tigung angezeigt. Bitte aktualisieren Sie die Templates <U>mailid_points_done.tpl</U>, <U>mailid_points_done2.tpl</U> und <U>mailid_frames.tpl</U> !";
+		$UPDATE_NOTES = "Gesamt-{!POINTS!} werden nun nach Best&auml;tigung angezeigt. Bitte aktualisieren Sie die Templates <u>mailid_points_done.tpl</u>, <u>mailid_points_done2.tpl</u> und <u>mailid_frames.tpl</u> !";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
@@ -178,7 +178,7 @@ case "update": // Update an extension
 
 	case "0.2.3": // SQL queries for v0.2.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Modul <STRONG>mailid</STRONG> war nicht gesetzt. Dadurch wurden die URLs (loader z.B.) umgeschrieben und f&uuml;hrten somit zu Fehlern.";
+		$UPDATE_NOTES = "Modul <strong>mailid</strong> war nicht gesetzt. Dadurch wurden die URLs (loader z.B.) umgeschrieben und f&uuml;hrten somit zu Fehlern.";
 		break;
 
 	case "0.2.4": // SQL queries for v0.2.4
@@ -198,7 +198,7 @@ case "update": // Update an extension
 
 	case "0.2.7": // SQL queries for v0.2.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Wenn die {!POINTS!} dem <STRONG>noch auf Auszahlung wartendem Guthaben</STRONG> aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates <STRONG>mailid_points_locked</STRONG> und <STRONG>mailid_points_locked2</STRONG> sind hinzugekommen!)";
+		$UPDATE_NOTES = "Wenn die {!POINTS!} dem <strong>noch auf Auszahlung wartendem Guthaben</strong> aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates <strong>mailid_points_locked</strong> und <strong>mailid_points_locked2</strong> sind hinzugekommen!)";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
@@ -208,7 +208,7 @@ case "update": // Update an extension
 
 	case "0.2.9": // SQL queries for v0.2.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>Code wiederholen</STRONG> nach <STRONG>Code eingeben</STRONG> hin ge&auml;ndert.";
+		$UPDATE_NOTES = "<strong>Code wiederholen</strong> nach <strong>Code eingeben</strong> hin ge&auml;ndert.";
 		break;
 
 	case "0.3.0": // SQL queries for v0.3.0
diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index b88d73a90c..8a4a2583a6 100644
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -89,7 +89,7 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index d734b49bec..389c454f04 100644
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -98,12 +98,12 @@ PRIMARY KEY(media_key)
 ) TYPE=MyISAM";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Teile der Mediendaten werden in seperater Tabelle gesichert. Bitte beachten Sie, dass dieses Update nur Daten des <STRONG>aktuellen</STRONG> Zustandes ber&uuml;cksichtigen kann und <STRONG>nicht</STRONG> bereits gel&ouml;schter Mitglieder.";
+		$UPDATE_NOTES = "Teile der Mediendaten werden in seperater Tabelle gesichert. Bitte beachten Sie, dass dieses Update nur Daten des <strong>aktuellen</strong> Zustandes ber&uuml;cksichtigen kann und <strong>nicht</strong> bereits gel&ouml;schter Mitglieder.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.";
 		break;
 
 	case "0.0.6": // SQL queries for v0.0.6
@@ -118,7 +118,7 @@ PRIMARY KEY(media_key)
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Start des {!MT_WORD2!} und Anzahl Anmeldungen aufgenommen. (Task #13)<br />
-Bitte stellen Sie diesen derzeit manuell unter <A href=\"{!URL!}/modules.php?module=admin&amp;what=config_mediadata\">Einstellungen-Medidata</A> selber einstellen.";
+Bitte stellen Sie diesen derzeit manuell unter <a href=\"{!URL!}/modules.php?module=admin&amp;what=config_mediadata\">Einstellungen-Medidata</a> selber einstellen.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php
index 641c9b9ddc..f278a3bcd6 100644
--- a/inc/extensions/ext-mods.php
+++ b/inc/extensions/ext-mods.php
@@ -85,7 +85,7 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php
index bdc46cc1e4..4e2bd33447 100644
--- a/inc/extensions/ext-mydata.php
+++ b/inc/extensions/ext-mydata.php
@@ -103,7 +103,7 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
@@ -123,9 +123,9 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"{!URL!}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<br />
+		$UPDATE_NOTES = "Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <a href=\"{!URL!}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</a> m&uuml;ssen.<br />
 <br />
-<STRONG>Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".GET_LANGUAGE()."/html/member/ !) mit hoch!</STRONG>";
+<strong>Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".GET_LANGUAGE()."/html/member/ !) mit hoch!</strong>";
 
 		// Depends on 'country'!
 		$EXT_UPDATE_DEPENDS = "country";
@@ -148,12 +148,12 @@ case "update": // Update an extension
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Die Einstellungen k&ouml;nnen nun auch ohne der Erweiterung <STRONG>country</STRONG> abgespeichert werden.";
+		$UPDATE_NOTES = "Die Einstellungen k&ouml;nnen nun auch ohne der Erweiterung <strong>country</strong> abgespeichert werden.";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 04da646cf8..4f3f75efd1 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -89,12 +89,12 @@ case "update": // Update an extension
 
 	case "0.0.2": // SQL queries for v0.0.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "URL im Versendeformular und Option <I>Immer aktiv</I> f&uuml;r diese Erweiterung deaktiviert.";
+		$UPDATE_NOTES = "URL im Versendeformular und Option <em>Immer aktiv</em> f&uuml;r diese Erweiterung deaktiviert.";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.0.4": // SQL queries for v0.0.4
@@ -114,7 +114,7 @@ case "update": // Update an extension
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Script <STRONG>inc/monthly/monthly_newsletter.php</STRONG> wird nicht mehr ausgef&uuml;hrt, wenn die Erweiterung nicht aktiviert ist.";
+		$UPDATE_NOTES = "Script <strong>inc/monthly/monthly_newsletter.php</strong> wird nicht mehr ausgef&uuml;hrt, wenn die Erweiterung nicht aktiviert ist.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
@@ -124,18 +124,18 @@ case "update": // Update an extension
 
 	case "0.0.9": // SQL queries for v0.0.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Nur bei installierter Erweiterung <STRONG>html_mail</STRONG> k&ouml;nnen Sie auch HTML-Mails versenden.";
+		$UPDATE_NOTES = "Nur bei installierter Erweiterung <strong>html_mail</strong> k&ouml;nnen Sie auch HTML-Mails versenden.";
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Nur bei installierter Erweiterung <STRONG>html_mail</STRONG> k&ouml;nnen Sie auch HTML-Mails versenden.";
+		$UPDATE_NOTES = "Nur bei installierter Erweiterung <strong>html_mail</strong> k&ouml;nnen Sie auch HTML-Mails versenden.";
 		break;
 
 	case "0.1.1": // SQL queries for v0.1.1
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <A href=\"#\"><STRONG>ext-other.zip</STRONG></A> verlagert. Bitte auch diese aktualisieren.";
+		$UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <a href=\"#\"><strong>ext-other.zip</strong></a> verlagert. Bitte auch diese aktualisieren.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
@@ -163,7 +163,7 @@ default: // Do stuff when extension is loaded
 	// Valid email chars (without @, or do you want to have another @ inside your email addy?)
 	$VALID_EMAIL_CHARS = array(
 		'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s',
-		't','u','v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
+		't','u','v','w','x','y','z','a','B','C','D','E','F','G','H','I','J','K','L',
 		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1',
 		'2','3','4','5','6','7','8','9'
 	);
diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index bb97b36a24..1a675d91b0 100644
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -130,7 +130,7 @@ case "update": // Update an extension
 
 	case "0.1.0": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.1": // SQL queries for v0.1.1
@@ -142,7 +142,7 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Zum Zusenden eines neuen Passwortes kann jetzt entweder der Nickname / User-ID <U>ODER</U> die angemeldete EMail-Adresse eingegeben werden.";
+		$UPDATE_NOTES = "Zum Zusenden eines neuen Passwortes kann jetzt entweder der Nickname / User-ID <u>ODER</u> die angemeldete EMail-Adresse eingegeben werden.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index 1ed6e70204..79c792f818 100644
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -95,12 +95,12 @@ case "update": // Update an extension
 	{
 	case "0.0.1": // SQL queries for v0.0.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <U>Unknown column 'visibled' in 'field list'</U> behoben.";
+		$UPDATE_NOTES = "Fehler <u>Unknown column 'visibled' in 'field list'</u> behoben.";
 		break;
 
 	case "0.0.2": // SQL queries for v0.0.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php
index 4f9f5b772c..6b61439763 100644
--- a/inc/extensions/ext-optimize.php
+++ b/inc/extensions/ext-optimize.php
@@ -94,7 +94,7 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index ff17638453..3b640d06dd 100644
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -97,7 +97,7 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Dummy-Datenfeld wird wieder gel&ouml;scht, um Probleme zu vermeiden. Fehlende Spalte <I>mail_order</I> korregiert auf <I>mail_orders</I>.";
+		$UPDATE_NOTES = "Dummy-Datenfeld wird wieder gel&ouml;scht, um Probleme zu vermeiden. Fehlende Spalte <em>mail_order</em> korregiert auf <em>mail_orders</em>.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
@@ -127,12 +127,12 @@ case "update": // Update an extension
 
 	case "0.2.0": // SQL queries for v0.2.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Templates <U>member_frameset-back.tpl</U> und <U>member_frameset-send.tpl</U> nach <U>member_order_back.tpl</U> und <U>member_order_send.tpl</U> umbenannt.";
+		$UPDATE_NOTES = "Templates <u>member_frameset-back.tpl</u> und <u>member_frameset-send.tpl</u> nach <u>member_order_back.tpl</u> und <u>member_order_send.tpl</u> umbenannt.";
 		break;
 
 	case "0.2.2": // SQL queries for v0.2.2
@@ -161,20 +161,20 @@ case "update": // Update an extension
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Fehler in Mailbuchung behoben: Es wurde beim Ermitteln der n&ouml;tigen {!POINTS!} die maximale Anzahl von Usern in der Kategorie gew&auml;hlt und
 nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der User h&auml;tte nicht gen&uuml;gend {!POINTS!} auf dem Konto. Ein Rechenbeispiel:
-<OL>
-  <LI>Das Mitglied w&auml;hlt eine Kategorie XYZ mit maximal 15 Empf&auml;ngern aus.</LI>
-  <LI>Es stellt die Mailart <U>&quot;3 {!POINTS!} Kosten / Mail&quot;</U> ein.</LI>
-  <LI>Es hat aber nur {!POINTS!} f&uuml;r 10 Empf&auml;nger und gibt 10 ein.</LI>
-  <LI>Das Script hatte bis zu dieser Version 3 {!POINTS!} * <U>15</U> = 45 {!POINTS!} gerechnet, hat das Mitglied mehr oder gleich 45 {!POINTS!}, fiehl dieser Fehler nicht
-  auf.</LI>
-  <LI>Hatte es aber, wie hier im Beispiel 31 {!POINTS!}, konnte es nicht mehr buchen.</LI>
-  <LI>Jetzt ist der Fehler endlich weg! Machen Sie dies bitte Ihren Mitgliedern bekannt.</LI>
-</OL>";
+<ol>
+  <li>Das Mitglied w&auml;hlt eine Kategorie XYZ mit maximal 15 Empf&auml;ngern aus.</li>
+  <li>Es stellt die Mailart <u>&quot;3 {!POINTS!} Kosten / Mail&quot;</u> ein.</li>
+  <li>Es hat aber nur {!POINTS!} f&uuml;r 10 Empf&auml;nger und gibt 10 ein.</li>
+  <li>Das Script hatte bis zu dieser Version 3 {!POINTS!} * <u>15</u> = 45 {!POINTS!} gerechnet, hat das Mitglied mehr oder gleich 45 {!POINTS!}, fiehl dieser Fehler nicht
+  auf.</li>
+  <li>Hatte es aber, wie hier im Beispiel 31 {!POINTS!}, konnte es nicht mehr buchen.</li>
+  <li>Jetzt ist der Fehler endlich weg! Machen Sie dies bitte Ihren Mitgliedern bekannt.</li>
+</ol>";
 		break;
 
 	case "0.2.7": // SQL queries for v0.2.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler mit <U>__MIN_VALUE</U> behoben.";
+		$UPDATE_NOTES = "Fehler mit <u>__MIN_VALUE</u> behoben.";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
@@ -189,7 +189,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 
 	case "0.3.0": // SQL queries for v0.3.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Basis-Modul <STRONG>order.php</STRONG> abgesichert, wenn Erweiterung nicht aktiviert ist.";
+		$UPDATE_NOTES = "Basis-Modul <strong>order.php</strong> abgesichert, wenn Erweiterung nicht aktiviert ist.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
@@ -207,22 +207,22 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 
 	case "0.3.3": // SQL queries for v0.3.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Unter <STRONG>Einstellungen - Mailbuchungsseite</STRONG> war immer die Tabellenspalte <STRONG>Mitgliedsnummer</STRONG> ausgew&auml;hlt.";
+		$UPDATE_NOTES = "Unter <strong>Einstellungen - Mailbuchungsseite</strong> war immer die Tabellenspalte <strong>Mitgliedsnummer</strong> ausgew&auml;hlt.";
 		break;
 
 	case "0.3.4": // SQL queries for v0.3.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Dateiamenskonflikt zwischen den Erweiterungen <STRONG>support</STRONG> und <STRONG>order</STRONG> behoben.";
+		$UPDATE_NOTES = "Dateiamenskonflikt zwischen den Erweiterungen <strong>support</strong> und <strong>order</strong> behoben.";
 		break;
 
 	case "0.3.5": // SQL queries for v0.3.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Das Mitglied konnte geziehlt die Anzahl Mailbuchungen durch Abspeichern seines Profiles beeinflussen. Der Fehler war eine falsche Tabellenspalte. Dies war <STRONG>max_mails</STRONG>, die durch das Mitglieder ver&auml;nderbar ist und zur Festellung der Maximalen Mailbuchungen herangezogen wurde.";
+		$UPDATE_NOTES = "Das Mitglied konnte geziehlt die Anzahl Mailbuchungen durch Abspeichern seines Profiles beeinflussen. Der Fehler war eine falsche Tabellenspalte. Dies war <strong>max_mails</strong>, die durch das Mitglieder ver&auml;nderbar ist und zur Festellung der Maximalen Mailbuchungen herangezogen wurde.";
 		break;
 
 	case "0.3.6": // SQL queries for v0.3.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Im Modul order (<STRONG>inc/modules/order.php</STRONG>) wurde fehlerhafterweise die Erweiterung <STRONG>beg</STRONG> getestet.";
+		$UPDATE_NOTES = "Im Modul order (<strong>inc/modules/order.php</strong>) wurde fehlerhafterweise die Erweiterung <strong>beg</strong> getestet.";
 		break;
 
 	case "0.3.7": // SQL queries for v0.3.7
@@ -262,7 +262,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 
 	case "0.4.4": // SQL queries for v0.4.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ein <STRONG>WHERE ext_active='Y'</STRONG> tauchte bei einigen Betreibern auf und ist mit dieser Version beseitigt.";
+		$UPDATE_NOTES = "Ein <strong>WHERE ext_active='Y'</strong> tauchte bei einigen Betreibern auf und ist mit dieser Version beseitigt.";
 		break;
 
 	case "0.4.5": // SQL queries for v0.4.5
diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 52a1974345..2afb6ac1cc 100644
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -73,7 +73,7 @@ case "update": // Update an extension
 	{
 	case "0.0.1": // SQL queries for v0.0.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> behoben.";
+		$UPDATE_NOTES = "Fehler <div class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</div> behoben.";
 		break;
 
 	case "0.0.2": // SQL queries for v0.0.2
@@ -121,13 +121,13 @@ case "update": // Update an extension
 	case "0.1.0": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Folgende Einstellungen k&ouml;nnen auf 0 gesetzt werden:
-<OL>
-<LI>Selbe beworbene URL nicht mehr bewerbar (0 = URL kann sofort wieder gebucht werden)</LI>
-<LI>G&uuml;tigkeitsdauer der Best&auml;tigungslinks (0 = Best&auml;tigungslinks laufen nie ab)</LI>
-<LI>Sperrzeit des Mitgliedprofiles nach &Auml;nderung (0 = Mitglied kann sein Account immer und sofort &auml;ndern)</LI>
-<LI>Profilaktualisierungsinterval (0 = Es wird keine Mail zum Profilaktualisierunng durch das Mitglied ausgesendet(</LI>
-<LI>Erneute Aussendung der Mail (0 = Siehe oben)</LI>
-</OL>";
+<ol>
+<li>Selbe beworbene URL nicht mehr bewerbar (0 = URL kann sofort wieder gebucht werden)</li>
+<li>G&uuml;tigkeitsdauer der Best&auml;tigungslinks (0 = Best&auml;tigungslinks laufen nie ab)</li>
+<li>Sperrzeit des Mitgliedprofiles nach &Auml;nderung (0 = Mitglied kann sein Account immer und sofort &auml;ndern)</li>
+<li>Profilaktualisierungsinterval (0 = Es wird keine Mail zum Profilaktualisierunng durch das Mitglied ausgesendet(</li>
+<li>Erneute Aussendung der Mail (0 = Siehe oben)</li>
+</ol>";
 		break;
 
 	case "0.1.1": // SQL queries for v0.1.1
@@ -137,7 +137,7 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index 8c7de0e4e5..aa85d177fe 100644
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -129,7 +129,7 @@ case "update": // Update an extension
 
 	case "0.1.8": // SQL queries for v0.1.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Auflistung der Auszahlungen ausgelagert in Template <I>member_payout.tpl</I>.";
+		$UPDATE_NOTES = "Auflistung der Auszahlungen ausgelagert in Template <em>member_payout.tpl</em>.";
 		break;
 
 	case "0.1.9": // SQL queries for v0.1.9
@@ -166,7 +166,7 @@ case "update": // Update an extension
 
 	case "0.2.5": // SQL queries for v0.2.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -176,7 +176,7 @@ case "update": // Update an extension
 
 	case "0.2.7": // SQL queries for v0.2.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
@@ -221,7 +221,7 @@ case "update": // Update an extension
 
 	case "0.3.6": // SQL queries for v0.3.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.3.7": // SQL queries for v0.3.7
diff --git a/inc/extensions/ext-profile.php b/inc/extensions/ext-profile.php
index 75a70b6bc5..e0f5c58412 100644
--- a/inc/extensions/ext-profile.php
+++ b/inc/extensions/ext-profile.php
@@ -93,7 +93,7 @@ case "update": // Update an extension
 
 	case "0.0.5": // SQL queries for v0.0.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Profilaktualisierungsmails werden nur dann ausgesendet, wenn <U>profile_update</U> und <U>prof_reupdate</U> &gt; 0 sind.";
+		$UPDATE_NOTES = "Profilaktualisierungsmails werden nur dann ausgesendet, wenn <u>profile_update</u> und <u>prof_reupdate</u> &gt; 0 sind.";
 		break;
 
 	case "0.0.6": // SQL queries for v0.0.6
@@ -103,12 +103,12 @@ case "update": // Update an extension
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Namenskonflikt gel&ouml;sst mit Erweiterung <STRONG>update</STRONG> (kommt noch raus!)";
+		$UPDATE_NOTES = "Namenskonflikt gel&ouml;sst mit Erweiterung <strong>update</strong> (kommt noch raus!)";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 4e697fc1f9..e535774569 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -146,7 +146,7 @@ case "update": // Update an extension
 
 	case "0.0.6": // SQL queries for v0.0.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <I>Unknown column 'd.useid' in 'on clause'</I> behoben.";
+		$UPDATE_NOTES = "Fehler <em>Unknown column 'd.useid' in 'on clause'</em> behoben.";
 		break;
 
 	case "0.0.7": // SQL queries for v0.0.7
@@ -156,12 +156,12 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <U>Template nicht gefunden</U> behoben und Admin-Formulare ausgelagert";
+		$UPDATE_NOTES = "Fehler <u>Template nicht gefunden</u> behoben und Admin-Formulare ausgelagert";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist. Und der vorherige Fehler <U>Template nicht gefunden</U> ist endlich beseitigt.";
+		$UPDATE_NOTES = "Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist. Und der vorherige Fehler <u>Template nicht gefunden</u> ist endlich beseitigt.";
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
@@ -198,7 +198,7 @@ case "update": // Update an extension
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
@@ -221,26 +221,26 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_prices BIGINT(20) UNSIGNED NOT NULL DEFAULT '3'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <STRONG>templates/de/emails/member/member_rallye_notify.tpl</STRONG> folgende zwei Zeilen ein:<br />
-<UL>
-  <LI>&#36;DATA&#91;min_users&#93;</LI>
-  <LI>&#36;DATA&#91;min_prices&#93;</LI>
-</UL>
-Zudem sollten Sie mindestens folgende Templates (in <STRONG>templates/".GET_LANGUAGE()."/html/guest/</STRONG> !) aktualisieren:<br />
-<UL>
-  <LI><STRONG>guest_rallye_footer.tpl</STRONG></LI>
-  <LI><STRONG>guest_rallye_header.tpl</STRONG></LI>
-</UL>";
+		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />
+<ul>
+  <li>&#36;DATA&#91;min_users&#93;</li>
+  <li>&#36;DATA&#91;min_prices&#93;</li>
+</ul>
+Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".GET_LANGUAGE()."/html/guest/</strong> !) aktualisieren:<br />
+<ul>
+  <li><strong>guest_rallye_footer.tpl</strong></li>
+  <li><strong>guest_rallye_header.tpl</strong></li>
+</ul>";
 		break;
 
 	case "0.2.1": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.2.2": // SQL queries for v0.2.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Links wegen <STRONG>what=admins_contct</STRONG> ge&auml;ndert.";
+		$UPDATE_NOTES = "Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.";
 		break;
 
 	case "0.2.3": // SQL queries for v0.2.3
@@ -281,7 +281,7 @@ Zudem sollten Sie mindestens folgende Templates (in <STRONG>templates/".GET_LANG
 
 	case "0.3.0": // SQL queries for v0.3.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index d479f1af94..c09e50cbae 100644
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -92,7 +92,7 @@ PRIMARY KEY(id)
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city','Y')";
 
 		// Add admin menu
-		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <STRONG>Profildaten &auml;ndern</STRONG> ein.', 12)";
+		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <strong>Profildaten &auml;ndern</strong> ein.', 12)";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";
@@ -163,7 +163,7 @@ PRIMARY KEY(id)
 
 	case "0.2.3": // SQL queries for v0.2.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Cookie <U>refid</U> aus Anmeldeformular entfernt.";
+		$UPDATE_NOTES = "Cookie <u>refid</u> aus Anmeldeformular entfernt.";
 		break;
 
 	case "0.2.4": // SQL queries for v0.2.4
@@ -173,7 +173,7 @@ PRIMARY KEY(id)
 
 	case "0.2.5": // SQL queries for v0.2.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -188,7 +188,7 @@ PRIMARY KEY(id)
 
 	case "0.2.8": // SQL queries for v0.2.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Parse error in <U>what-register.php</U> beseitigt.";
+		$UPDATE_NOTES = "Parse error in <u>what-register.php</u> beseitigt.";
 		break;
 
 	case "0.2.9": // SQL queries for v0.2.9
@@ -198,7 +198,7 @@ PRIMARY KEY(id)
 
 	case "0.3.0": // SQL queries for v0.3.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
@@ -208,9 +208,9 @@ PRIMARY KEY(id)
 
 	case "0.3.2": // SQL queries for v0.3.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Einbindung der Erweiterung <STRONG>country</STRONG>, die Sie sich noch optional von <A href=\"{!URL!}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</A> m&uuml;ssen.<br />
+		$UPDATE_NOTES = "Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <a href=\"{!URL!}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</a> m&uuml;ssen.<br />
 <br />
-<STRONG>Wichtig: Laden Sie noch das Template <STRONG>guest_register.tpl</STRONG> mit hoch, welches unter templates/".GET_LANGUAGE()."/html/guest/ zu finden ist!</STRONG>";
+<strong>Wichtig: Laden Sie noch das Template <strong>guest_register.tpl</strong> mit hoch, welches unter templates/".GET_LANGUAGE()."/html/guest/ zu finden ist!</strong>";
 
 		// Depends on 'country'
 		$EXT_UPDATE_DEPENDS = "country";
@@ -223,7 +223,7 @@ PRIMARY KEY(id)
 
 	case "0.3.4": // SQL queries for v0.3.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Auf Grund der Integration der neue Erweiterung <STRONG>country</STRONG> in die Anmeldephase klappte die Anmeldung nicht. Die dazu n&uuml;tige Verkn&uuml;pfung ist nun eingebaut und die Anmeldung klappt wieder. Vielen Dank nochmals an den Bug-Reporter (Fehlermelder)!";
+		$UPDATE_NOTES = "Auf Grund der Integration der neue Erweiterung <strong>country</strong> in die Anmeldephase klappte die Anmeldung nicht. Die dazu n&uuml;tige Verkn&uuml;pfung ist nun eingebaut und die Anmeldung klappt wieder. Vielen Dank nochmals an den Bug-Reporter (Fehlermelder)!";
 		break;
 
 	case "0.3.5": // SQL queries for v0.3.5
@@ -233,12 +233,12 @@ PRIMARY KEY(id)
 
 	case "0.3.6": // SQL queries for v0.3.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehlermeldung <STRONG>Fatal error: Call to undefined function: get_theme() in /../../guest/what-register.php on line 190</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Fehlermeldung <strong>Fatal error: Call to undefined function: get_theme() in /../../guest/what-register.php on line 190</strong> beseitigt.";
 		break;
 
 	case "0.3.7": // SQL queries for v0.3.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehlermeldung <STRONG>Fatal error: Call to undefined function: get_curr_theme<U>e</U>() in /../../guest/what-register.php on line 190</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Fehlermeldung <strong>Fatal error: Call to undefined function: get_curr_theme<u>e</u>() in /../../guest/what-register.php on line 190</strong> beseitigt.";
 		break;
 
 	case "0.3.8": // SQL queries for v0.3.8
@@ -266,12 +266,12 @@ PRIMARY KEY(id)
 		$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET what='config_register2' WHERE what='config_reg' LIMIT 1";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Bei der Anmeldung kann die Standart-Auswahl zwischen Ja/Nein umgeschaltet werden. Das &Auml;ndern des Templates <STRONG>templates/".GET_LANGUAGE()."/html/guest/guest_register.tpl</STRONG> ist nicht mehr n&ouml;tig.";
+		$UPDATE_NOTES = "Bei der Anmeldung kann die Standart-Auswahl zwischen Ja/Nein umgeschaltet werden. Das &Auml;ndern des Templates <strong>templates/".GET_LANGUAGE()."/html/guest/guest_register.tpl</strong> ist nicht mehr n&ouml;tig.";
 		break;
 
 	case "0.4.3": // SQL queries for v0.4.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Parser-Error in <STRONG>inc/modules/guest/what-register.php</STRONG> beseitigt.";
+		$UPDATE_NOTES = "Parser-Error in <strong>inc/modules/guest/what-register.php</strong> beseitigt.";
 		break;
 
 	case "0.4.4": // SQL queries for v0.4.4
@@ -281,7 +281,7 @@ PRIMARY KEY(id)
 
 	case "0.4.5": // SQL queries for v0.4.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.";
 		break;
 
 	case "0.4.6": // SQL queries for v0.4.6
@@ -291,12 +291,12 @@ PRIMARY KEY(id)
 
 	case "0.4.7": // SQL queries for v0.4.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>set_session()</STRONG> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
+		$UPDATE_NOTES = "<strong>set_session()</strong> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
 		break;
 
 	case "0.4.8": // SQL queries for v0.4.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.4.9": // SQL queries for v0.4.9
@@ -311,7 +311,7 @@ PRIMARY KEY(id)
 
 	case "0.5.1": // SQL queries for v0.5.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Mail-Template <strong>register-member.tpl</strong> gefixt. Danke an <A href=\"http://forum.mxchange.org/profile-59.html\" target=\"_blank\" title=\"Mitgliedsprofil aufrufen\">wliepe</A> f&uuml;r die Fehlerfindung!";
+		$UPDATE_NOTES = "Mail-Template <strong>register-member.tpl</strong> gefixt. Danke an <a href=\"http://forum.mxchange.org/profile-59.html\" target=\"_blank\" title=\"Mitgliedsprofil aufrufen\">wliepe</a> f&uuml;r die Fehlerfindung!";
 		break;
 
 	case "0.5.2": // SQL queries for v0.5.2
diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php
index ade74b3c75..c84cd17b23 100644
--- a/inc/extensions/ext-repair.php
+++ b/inc/extensions/ext-repair.php
@@ -88,7 +88,7 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 3cdd3ce01c..d667d513c9 100644
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -132,7 +132,7 @@ case "update": // Update an extension
 
 	case "0.1.0": // SQL queries for v0.2.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.1": // SQL queries for v0.1.1
diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index cb4003c39d..92bd67f760 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -149,7 +149,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` CHANGE auto_purge auto_purge BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*14)."";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "In der Tabelle <STRONG>"._MYSQL_PREFIX."_config</STRONG> musste die Spalte <STRONG>auto_purge</STRONG> (autom. L&ouml;schen von Best&auml;tigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)";
+		$UPDATE_NOTES = "In der Tabelle <strong>"._MYSQL_PREFIX."_config</strong> musste die Spalte <strong>auto_purge</strong> (autom. L&ouml;schen von Best&auml;tigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
@@ -163,7 +163,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD mails_page BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Anzahl Mails pro Seite in <STRONG>EMail-Details ansehen</STRONG> und <STRONG>EMail-Archiv</STRONG> hinzugef&uuml;gt.";
+		$UPDATE_NOTES = "Anzahl Mails pro Seite in <strong>EMail-Details ansehen</strong> und <strong>EMail-Archiv</strong> hinzugef&uuml;gt.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
@@ -189,10 +189,10 @@ case "update": // Update an extension
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
-		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD menu_blur_spacer VARCHAR(255) NOT NULL DEFAULT '&nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;'";
+		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD menu_blur_spacer VARCHAR(255) NOT NULL DEFAULT '&nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Nette Mouse-Hover-Effekte eingebaut (Anleitung <STRONG>MENUE_HOVER.txt</STRONG> zum Patchen der general.css bitte lesen!)";
+		$UPDATE_NOTES = "Nette Mouse-Hover-Effekte eingebaut (Anleitung <strong>MENUE_HOVER.txt</strong> zum Patchen der general.css bitte lesen!)";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
@@ -215,7 +215,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD index_cookie BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*365)."";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Sie k&ouml;nnen nun <A href=\"{!URL!}/modules.php?module=admin&amp;`what`=config_home\">hier</A> die Verz&ouml;gerungszeit in der <A href=\"{!URL!}/index.php\">Eingangsseite</A> einstellen.";
+		$UPDATE_NOTES = "Sie k&ouml;nnen nun <a href=\"{!URL!}/modules.php?module=admin&amp;`what`=config_home\">hier</a> die Verz&ouml;gerungszeit in der <a href=\"{!URL!}/index.php\">Eingangsseite</a> einstellen.";
 		break;
 
 	case "0.1.2": // SQL queries for v0.1.2
@@ -242,7 +242,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_extensions DROP ext_has_admin";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Spalte <U>ext_has_admin</U> aus der Tabelle <U>"._MYSQL_PREFIX."_extensions</U> entfernt, da sie keinen Sinn mehr macht.";
+		$UPDATE_NOTES = "Spalte <u>ext_has_admin</u> aus der Tabelle <u>"._MYSQL_PREFIX."_extensions</u> entfernt, da sie keinen Sinn mehr macht.";
 		break;
 
 	case "0.1.6": // SQL queries for v0.1.6
@@ -255,7 +255,7 @@ case "update": // Update an extension
 		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_title','Seitentitel &auml;ndern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <STRONG>what</STRONG>-Dateien kann hinzugef&uuml;gt werden.";
+		$UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <strong>what</strong>-Dateien kann hinzugef&uuml;gt werden.";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
@@ -317,7 +317,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD img_type ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Generierung des Mailbest&auml;tigungscodes h&auml;ngt davon ab, ob die PHP-Funktion <U>imagecreatefromjpeg()</U> und das JPEG-Bild vorhanden sind oder nicht.";
+		$UPDATE_NOTES = "Generierung des Mailbest&auml;tigungscodes h&auml;ngt davon ab, ob die PHP-Funktion <u>imagecreatefromjpeg()</u> und das JPEG-Bild vorhanden sind oder nicht.";
 		break;
 
 	case "0.2.5": // SQL queries for v0.2.5
@@ -325,7 +325,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` CHANGE max_mails max_mails BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Spalten <U>max_mails</U> und <U>receive_mails</U> auf BIGINT(20) gesetzt.";
+		$UPDATE_NOTES = "Spalten <u>max_mails</u> und <u>receive_mails</u> auf BIGINT(20) gesetzt.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -340,10 +340,10 @@ case "update": // Update an extension
 		$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET `what`='config_stats' WHERE `what`='stats' LIMIT 1";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<OL>
-<LI>Das Mitglied kann das derzeitige Design in sein Profil abspeichern.</LI>
-<LI>Mitgliederstatistik mit Seitennavigation.</LI>
-</OL>";
+		$UPDATE_NOTES = "<ol>
+<li>Das Mitglied kann das derzeitige Design in sein Profil abspeichern.</li>
+<li>Mitgliederstatistik mit Seitennavigation.</li>
+</ol>";
 		break;
 
 	case "0.2.8": // SQL queries for v0.2.8
@@ -359,7 +359,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD mt_word3 VARCHAR(255) NOT NULL DEFAULT 'Mailtauscher'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.3.0": // SQL queries for v0.3.0
diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php
index fe9b03ee45..c36e6bd0a5 100644
--- a/inc/extensions/ext-support.php
+++ b/inc/extensions/ext-support.php
@@ -90,7 +90,7 @@ case "update": // Update an extension
 
 	case "0.0.6": // SQL queries for v0.0.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.7": // SQL queries for v0.0.7
@@ -100,12 +100,12 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Dateiamenskonflikt zwischen den Erweiterungen <STRONG>support</STRONG> und <STRONG>order</STRONG> behoben.";
+		$UPDATE_NOTES = "Dateiamenskonflikt zwischen den Erweiterungen <strong>support</strong> und <strong>order</strong> behoben.";
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index cad3d0fe69..55b4d421aa 100644
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -93,7 +93,7 @@ case "update": // Update an extension
 
 	case "0.0.4": // SQL queries for v0.0.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> behoben.";
+		$UPDATE_NOTES = "Fehler <div class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</div> behoben.";
 		break;
 
 	case "0.0.5": // SQL queries for v0.0.5
@@ -133,34 +133,34 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Links wegen <STRONG>what=admins_contct</STRONG> ge&auml;ndert.";
+		$UPDATE_NOTES = "Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.";
 		break;
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Weitere Direkt-Links eingebaut:<br />
-<UL>
-  <LI>L&auml;ndercodes</LI>
-  <LI>Wartende Verdopplungen</LI>
-  <LI><STRONG>Ge&auml;ndert:</STRONG> Wartende Auszahlungen</LI>
-  <LI>Teilnehmer an der Aktiv-Rallye</LI>
-  <LI>Nett hinweisende Linktitel hinzugef&uuml;gt. :-)</LI>
-</UL>";
+<ul>
+  <li>L&auml;ndercodes</li>
+  <li>Wartende Verdopplungen</li>
+  <li><strong>Ge&auml;ndert:</strong> Wartende Auszahlungen</li>
+  <li>Teilnehmer an der Aktiv-Rallye</li>
+  <li>Nett hinweisende Linktitel hinzugef&uuml;gt. :-)</li>
+</ul>";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
@@ -205,7 +205,7 @@ case "update": // Update an extension
 
 	case "0.2.5": // SQL queries for v0.2.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>Nur mit bonus v0.6.9 oder h&ouml;her:</STRONG> Zuschaltbare Bonis werden auch bei der Ermittlung Anzahl teilnehmender Mitglieder mit ber&uumk;cksichtigt.";
+		$UPDATE_NOTES = "<strong>Nur mit bonus v0.6.9 oder h&ouml;her:</strong> Zuschaltbare Bonis werden auch bei der Ermittlung Anzahl teilnehmender Mitglieder mit ber&uumk;cksichtigt.";
 		break;
 
 	case "0.2.6": // SQL queries for v0.2.6
@@ -225,7 +225,7 @@ case "update": // Update an extension
 
 	case "0.2.9": // SQL queries for v0.2.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt. Update-Aufgaben werden nach &quot;Bearbeitung&quot; nicht mehr als <STRONG>Erledigt</STRONG> gesetzt. Dies hatte sonst den Anschein, die Update-Aufgaben m&uuml;ssten erledigt werden, um die Erweiterungs-Updates einzuspielen, was aber automatisch geschieht.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt. Update-Aufgaben werden nach &quot;Bearbeitung&quot; nicht mehr als <strong>Erledigt</strong> gesetzt. Dies hatte sonst den Anschein, die Update-Aufgaben m&uuml;ssten erledigt werden, um die Erweiterungs-Updates einzuspielen, was aber automatisch geschieht.";
 		break;
 
 	case "0.3.0": // SQL queries for v0.3.0
diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 1a95e558ef..c7b69c08f2 100644
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -101,7 +101,7 @@ case "update": // Update an extension
 
 	case "0.0.5": // SQL queries for v0.0.5
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>set_session()</STRONG> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
+		$UPDATE_NOTES = "<strong>set_session()</strong> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.";
 		break;
 
 	case "0.0.6": // SQL queries for v0.0.6
diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php
index 92ad4d70c8..3c4b23d5a2 100644
--- a/inc/extensions/ext-top10.php
+++ b/inc/extensions/ext-top10.php
@@ -79,7 +79,7 @@ case "update": // Update an extension
 	{
 	case "0.0.1": // SQL queries for v0.0.1
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <I>Column: 'userid' in group statement is ambiguous</I> im Gastbereich beseitigt.";
+		$UPDATE_NOTES = "Fehler <em>Column: 'userid' in group statement is ambiguous</em> im Gastbereich beseitigt.";
 		break;
 
 	case "0.0.2": // SQL queries for v0.0.2
@@ -114,7 +114,7 @@ case "update": // Update an extension
 
 	case "0.0.8": // SQL queries for v0.0.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.0.9": // SQL queries for v0.0.9
diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index f2fef8784f..2484f5d3b4 100644
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -125,7 +125,7 @@ case "update": // Update an extension
 	{
 	case "0.0.2": // SQL queries for v0.0.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> behoben.";
+		$UPDATE_NOTES = "Fehler <div class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</div> behoben.";
 		break;
 
 	case "0.0.3": // SQL queries for v0.0.3
@@ -142,7 +142,7 @@ case "update": // Update an extension
 		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD ap_transfer ENUM('Y','N') NOT NULL DEFAULT 'Y'";
 
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link <I>Auflisten</LI> im Admin-Bereich hatte das eingeloggte Mitglied und nicht den eingeloggten Admin abgefragt. Automatisches L&ouml;schen von veraltete Eintr&auml;gen kann unabh&auml;ngig von der autopurge-Erweiterung de-/aktiviert werden. Bitte aktualisieren Sie auch die beiden Admin-Templates!";
+		$UPDATE_NOTES = "Link <em>Auflisten</em> im Admin-Bereich hatte das eingeloggte Mitglied und nicht den eingeloggten Admin abgefragt. Automatisches L&ouml;schen von veraltete Eintr&auml;gen kann unabh&auml;ngig von der autopurge-Erweiterung de-/aktiviert werden. Bitte aktualisieren Sie auch die beiden Admin-Templates!";
 		break;
 
 	case "0.0.6": // SQL queries for v0.0.6
@@ -177,7 +177,7 @@ case "update": // Update an extension
 
 	case "0.1.2": // SQL queries for v0.1.2
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.3": // SQL queries for v0.1.3
@@ -187,7 +187,7 @@ case "update": // Update an extension
 
 	case "0.1.4": // SQL queries for v0.1.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.1.5": // SQL queries for v0.1.5
@@ -197,12 +197,12 @@ case "update": // Update an extension
 
 	case "0.1.6": // SQL queries for v0.1.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.1.7": // SQL queries for v0.1.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Wort <STRONG>Punkte</STRONG> dynamisiert.";
+		$UPDATE_NOTES = "Wort <strong>Punkte</strong> dynamisiert.";
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
@@ -244,7 +244,7 @@ case "update": // Update an extension
 
 	case "0.2.4": // SQL queries for v0.2.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "<STRONG>Touring-Code wiederholen</STRONG> nach <STRONG>Touring-Code eingeben</STRONG> hin ge&auml;ndert.";
+		$UPDATE_NOTES = "<strong>Touring-Code wiederholen</strong> nach <strong>Touring-Code eingeben</strong> hin ge&auml;ndert.";
 		break;
 
 	case "0.2.5": // SQL queries for v0.2.5
@@ -256,7 +256,7 @@ case "update": // Update an extension
 
 	case "0.2.6": // SQL queries for v0.2.6
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.";
 		break;
 
 	case "0.2.7": // SQL queries for v0.2.7
diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index fee1d8d030..170ec8d0e4 100644
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -106,7 +106,7 @@ case "update": // Update an extension
 
 	case "0.1.3": // SQL queries for v0.1.3
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Den Pfad <I>Sie sind hier</I> im Men&uuml;punkt <U>Online-Liste</U> erweitert.";
+		$UPDATE_NOTES = "Den Pfad <em>Sie sind hier</em> im Men&uuml;punkt <u>Online-Liste</u> erweitert.";
 		break;
 
 	case "0.1.4": // SQL queries for v0.1.4
@@ -133,12 +133,12 @@ case "update": // Update an extension
 
 	case "0.1.8": // SQL queries for v0.1.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+		$UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
 		break;
 
 	case "0.1.9": // SQL queries for v0.1.9
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <U>ADMIN_USER_PROFILE_LINK()</U> ausgelagert.";
+		$UPDATE_NOTES = "Link zum Mitgliedsprofil in Funktion <u>ADMIN_USER_PROFILE_LINK()</u> ausgelagert.";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
@@ -168,7 +168,7 @@ case "update": // Update an extension
 
 	case "0.2.4": // SQL queries for v0.2.4
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+		$UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
 		break;
 
 	case "0.2.5": // SQL queries for v0.2.5
@@ -188,7 +188,7 @@ case "update": // Update an extension
 
 	case "0.2.8": // SQL queries for v0.2.8
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "if-Anweisungen auf Funktion <STRONG>empty()</STRONG> umgestellt.";
+		$UPDATE_NOTES = "if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.";
 		break;
 
 	case "0.2.9": // SQL queries for v0.2.9
@@ -200,7 +200,7 @@ case "update": // Update an extension
 
 	case "0.3.0": // SQL queries for v0.3.0
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "Hash-Erstellung von <STRONG>md5()</STRONG> auf bessere Funktion <STRONG>generateHash()</STRONG> umgestellt.<br />Diverse Fixes f&uuml;r <em>0.2.1-Beta1</em> Release.";
+		$UPDATE_NOTES = "Hash-Erstellung von <strong>md5()</strong> auf bessere Funktion <strong>generateHash()</strong> umgestellt.<br />Diverse Fixes f&uuml;r <em>0.2.1-Beta1</em> Release.";
 		break;
 
 	case "0.3.1": // SQL queries for v0.3.1
diff --git a/inc/functions.php b/inc/functions.php
index 0562cceee6..e25fce1111 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -135,7 +135,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
 		default:
 			// Huh, something goes wrong or maybe you have edited config.php ???
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE));
-			MXCHANGE_DIE("<STRONG>".FATAL_ERROR.":</STRONG> ".LANG_NO_RENDER_DIRECT);
+			MXCHANGE_DIE("<strong>".FATAL_ERROR.":</strong> ".LANG_NO_RENDER_DIRECT);
 			break;
 		}
 	} elseif ((_OB_CACHING == "on") && ($footer == 1)) {
@@ -386,7 +386,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 		$ret = "<!-- Template ".$template." - Start -->\n".$ret."<!-- Template ".$template." - End -->\n";
 	} elseif ((IS_ADMIN()) || ((isBooleanConstantAndTrue('mxchange_installing')) && (!isBooleanConstantAndTrue('mxchange_installed')))) {
 		// Only admins shall see this warning or when installation mode is active
-		$ret = "<br /><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><br />
+		$ret = "<br /><span class=\"guest_failed\">".TEMPLATE_404."</span><br />
 (".basename($file).")<br />
 <br />
 ".TEMPLATE_CONTENT."
@@ -981,7 +981,7 @@ function LOAD_URL($URL, $addUrlData=true) {
 		$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
 
 		// Output new location link as anchor
-		OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>");
+		OUTPUT_HTML("<a href=\"".$URL."\">".$URL."</a>");
 	} elseif (!headers_sent()) {
 		// Load URL when headers are not sent
 		/*
@@ -1090,7 +1090,7 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
  * $array - Das 3-dimensionale Array, das paralell sortiert werden soll *
  * $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben    *
  * $primary_key - Prim.rschl.ssel aus $a_sort, nach dem sortiert wird   *
- * $order - Sortiereihenfolge: -1 = A-Z, 0 = keine, 1 = Z-A             *
+ * $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a             *
  * $nums - true = Als Zahlen sortieren, false = Als Zeichen sortieren   *
  *                                                                      *
  * $a_sort muss Elemente enthalten, deren Wert Schluessel von $array    *
@@ -1141,29 +1141,29 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
 	if ($type == "yn") {
 		// This is a yes/no selection only!
 		if ($id > 0) $prefix .= "[".$id."]";
-		$OUT .= "    <SELECT name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
+		$OUT .= "    <select name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
 	} else {
 		// Begin with regular selection box here
 		if (!empty($prefix)) $prefix .= "_";
 		$type2 = $type;
 		if ($id > 0) $type2 .= "[".$id."]";
-		$OUT .= "    <SELECT name=\"".strtolower($prefix.$type2)."\" class=\"register_select\" size=\"1\">\n";
+		$OUT .= "    <select name=\"".strtolower($prefix.$type2)."\" class=\"register_select\" size=\"1\">\n";
 	}
 
 	switch ($type) {
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++) {
-			$OUT .= "<OPTION value=\"".$idx."\"";
+			$OUT .= "<option value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
-			$OUT .= ">".$idx."</OPTION>\n";
+			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
 
 	case "month": // Month
 		foreach ($MONTH_DESCR as $month => $descr) {
-			$OUT .= "<OPTION value=\"".$month."\"";
+			$OUT .= "<option value=\"".$month."\"";
 			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
-			$OUT .= ">".$descr."</OPTION>\n";
+			$OUT .= ">".$descr."</option>\n";
 		} // END - for
 		break;
 
@@ -1186,19 +1186,19 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
 		// Check if the default value is larger than minimum and bigger than actual year
 		if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
-				$OUT .= "<OPTION value=\"".$idx."\"";
+				$OUT .= "<option value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		} elseif ($DEFAULT == -1) {
 			// Current year minus 1
 			for ($idx = $startYear; $idx <= ($YEAR + 1); $idx++)
 			{
-				$OUT .= "<OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
+				$OUT .= "<option value=\"".$idx."\">".$idx."</option>\n";
 			}
 		} else {
 			// Get current year and subtract the configured minimum age
-			$OUT .= "<OPTION value=\"".($minYear - 1)."\">&lt;".$minYear."</OPTION>\n";
+			$OUT .= "<option value=\"".($minYear - 1)."\">&lt;".$minYear."</option>\n";
 			// Calculate earliest year depending on extension version
 			if (GET_EXT_VERSION("other") >= "0.2.1") {
 				// Use configured minimum age
@@ -1210,9 +1210,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
 
 			// Construct year selection list
 			for ($idx = $minYear; $idx <= $YEAR; $idx++) {
-				$OUT .= "<OPTION value=\"".$idx."\"";
+				$OUT .= "<option value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		}
 		break;
@@ -1221,30 +1221,30 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
 	case "min":
 		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "<OPTION value=\"".$idx."\"";
+			$OUT .= "<option value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
-			$OUT .= ">".$idx."</OPTION>\n";
+			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
 
 	case "hour":
 		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "<OPTION value=\"".$idx."\"";
+			$OUT .= "<option value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
-			$OUT .= ">".$idx."</OPTION>\n";
+			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
 
 	case "yn":
-		$OUT .= "<OPTION value=\"Y\"";
+		$OUT .= "<option value=\"Y\"";
 		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".YES."</OPTION>\n<OPTION value=\"N\"";
+		$OUT .= ">".YES."</option>\n<option value=\"N\"";
 		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".NO."</OPTION>\n";
+		$OUT .= ">".NO."</option>\n";
 		break;
 	}
-	$OUT .= "    </SELECT>\n";
+	$OUT .= "    </select>\n";
 	return $OUT;
 }
 //
@@ -1442,36 +1442,36 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 		);
 	} else {
 		// Generate table
-		$OUT  = "<DIV align=\"".$align."\">\n";
+		$OUT  = "<div align=\"".$align."\">\n";
 		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
 		$OUT .= "<TR>\n";
 
 		if (ereg('Y', $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._YEARS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._YEARS."</strong></TD>\n";
 		}
 
 		if (ereg("M", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MONTHS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MONTHS."</strong></TD>\n";
 		}
 
 		if (ereg("W", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._WEEKS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._WEEKS."</strong></TD>\n";
 		}
 
 		if (ereg("D", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._DAYS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._DAYS."</strong></TD>\n";
 		}
 
 		if (ereg("h", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._HOURS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._HOURS."</strong></TD>\n";
 		}
 
 		if (ereg("m", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MINUTES."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MINUTES."</strong></TD>\n";
 		}
 
 		if (ereg("s", $display) || (empty($display))) {
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._SECONDS."</strong></TD>\n";
 		}
 
 		$OUT .= "</TR>\n";
@@ -1479,98 +1479,98 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 
 		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 10; $idx++) {
-				$OUT .= "    <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "    <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $Y) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\">\n";
+			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\" />\n";
 		}
 
 		if (ereg("M", $display) || (empty($display))) {
 			// Generate month selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
 			{
-					$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+					$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $M) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\">\n";
+			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\" />\n";
 		}
 
 		if (ereg("W", $display) || (empty($display))) {
 			// Generate week selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 4; $idx++) {
-				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $W) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\">\n";
+			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\" />\n";
 		}
 
 		if (ereg("D", $display) || (empty($display))) {
 			// Generate day selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 31; $idx++) {
-				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $D) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
 		}
 
 		if (ereg("h", $display) || (empty($display))) {
 			// Generate hour selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 23; $idx++) 	{
-				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $h) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
 		}
 
 		if (ereg("m", $display) || (empty($display))) {
 			// Generate minute selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
-				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $m) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
 		}
 
 		if (ereg("s", $display) || (empty($display))) {
 			// Generate second selection
-			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
+			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
-				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $s) $OUT .= " selected default";
-				$OUT .= ">".$idx."</OPTION>\n";
+				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </SELECT></TD>\n";
+			$OUT .= "  </select></TD>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
 		}
 		$OUT .= "</TR>\n";
 		$OUT .= "</TABLE>\n";
-		$OUT .= "</DIV>\n";
+		$OUT .= "</div>\n";
 		// Return generated HTML code
 	}
 	return $OUT;
@@ -1696,10 +1696,10 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 		// Is the page currently selected or shall we generate a link to it?
 		if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
 			// Is currently selected, so only highlight it
-			$NAV .= "<STRONG>-";
+			$NAV .= "<strong>-";
 		} else {
 			// Open anchor tag and add base URL
-			$NAV .= "<A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
+			$NAV .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
 
 			// Add userid when we shall show all mails from a single member
 			if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) $NAV .= "&amp;u_id=".bigintval($_GET['u_id']);
@@ -1710,10 +1710,10 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 		$NAV .= $page;
 		if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
 			// Is currently selected, so only highlight it
-			$NAV .= "-</STRONG>";
+			$NAV .= "-</strong>";
 		} else {
 			// Close anchor tag
-			$NAV .= "</A>";
+			$NAV .= "</a>";
 		}
 
 		// Add seperator if we have not yet reached total pages
@@ -1989,7 +1989,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 	$eval = "\$OUT = \"[&nbsp;";
 
 	foreach ($TARGETS as $tar) {
-		$eval .= "<SPAN class=\\\"admin_user_link\\\"><A href=\\\"".URL."/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"\".ADMIN_LINK_";
+		$eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"".URL."/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"\".ADMIN_LINK_";
 		//* DEBUG: */ echo "*".$tar."/".$status."*<br />\n";
 		if (($tar == "lock_user") && ($status == "LOCKED")) {
 			// Locked accounts shall be unlocked
@@ -2006,7 +2006,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 			// All other status is fine
 			$eval .= strtoupper($tar);
 		}
-		$eval .= ".\"</A></SPAN>&nbsp;|&nbsp;";
+		$eval .= ".\"</a></span>&nbsp;|&nbsp;";
 	}
 
 	// Finish navigation link
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 732d4345b1..9f822c302e 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -93,7 +93,7 @@ if (getConfig('file_hash') == "") {
 		//* DEBUG: */ unlink($file);
 		//* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
 		//* DEBUG: */ $test = generateHash(str_replace('.', "", $test));
-		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br>Cookie: ".get_session('u_hash')."<br>Test: ".$test);
+		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
 
 		// Write $file_hash to database
 		SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1b9ecb61af..50a31a3360 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -51,9 +51,9 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
 	if (FILE_READABLE($file)) {
 		$search = "CFG: ".$comment;
 		$tmp = $file.".tmp";
-		$fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
+		$fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
 		if (is_resource($fp)) {
-			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
+			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
 			if (is_resource($fp_tmp)) {
 				while (!feof($fp)) {
 					$line = fgets ($fp, 10240);
@@ -89,11 +89,11 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
 				@copy($tmp, $file);
 				@unlink($tmp);
 			} else {
-				OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
+				OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
 			}
 		} // END - if
 	} else {
-		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
+		OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
 	}
 }
 
@@ -165,11 +165,11 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 		if (empty($mysql['host']))   $mysql['host']   = "localhost";
 		if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
 		if (getTotalFatalErrors() > 0) {
-			OUTPUT_HTML("<SPAN class=\"install_fatal\">");
+			OUTPUT_HTML("<span class=\"install_fatal\">");
 			foreach ($FATAL as $key => $err) {
-				OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
+				OUTPUT_HTML("  <strong>&middot;</strong>&nbsp;{!FATAL_NO!}".($key + 1).":&nbsp;".$err."<br />");
 			}
-			OUTPUT_HTML("</SPAN><br />");
+			OUTPUT_HTML("</span><br />");
 		}
 		define('__MYSQL_HOST'  , $mysql['host']);
 		define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -239,95 +239,95 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 		define('__SMTP_HOST'	, $_POST['smtp_host']);
 		define('__SMTP_USER'	, $_POST['smtp_user']);
 		define('__SMTP_PASS'	, $_POST['smtp_pass1']);
-		OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
+		OUTPUT_HTML("<form action=\"{!__BURL_ACTION!}/install.php?page=finalize\" method=\"POST\" target=\"_self\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD colspan=\"2\" align=\"center\">
-    <STRONG class=\"install\">".HEADER_TEXT_PAGE5."</STRONG>
+    <div class=\"install\">{!HEADER_TEXT_PAGE5!}</strong>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD colspan=\"2\"><SPAN class=\"install_intro\">
-    ".TEXT_PAGE_5."
-  </SPAN></TD>
+  <TD colspan=\"2\"><span class=\"install_intro\">
+    {!TEXT_PAGE_5!}
+  </span></TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD class=\"install\" align=\"right\">".LANG_OUTPUT_MODE.":&nbsp;&nbsp;</TD>
+  <TD class=\"install\" align=\"right\">{!LANG_OUTPUT_MODE!}:&nbsp;&nbsp;</TD>
   <TD>
-    <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"render\"");
+    <select name=\"omode\" size=\"1\" class=\"install_select\">
+      <option value=\"render\"");
 		if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".MODE_RENDER."</OPTION>
-      <OPTION value=\"direct\"");
+		OUTPUT_HTML(">{!MODE_RENDER!}</option>
+      <option value=\"direct\"");
 		if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".MODE_DIRECT."</OPTION>
-    </SELECT>
+		OUTPUT_HTML(">{!MODE_DIRECT!}</option>
+    </select>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD class=\"install\" align=\"right\">".WARN_NO_PASSWORD.":&nbsp;&nbsp;</TD>
+  <TD class=\"install\" align=\"right\">{!WARN_NO_PASSWORD!}:&nbsp;&nbsp;</TD>
   <TD>
-    <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
+    <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
+      <option value=\"true\"");
 		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
+		OUTPUT_HTML(">{!YES!}</option>
+      <option value=\"false\"");
 		if (!defined('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".NO."</OPTION>
-    </SELECT>
+		OUTPUT_HTML(">{!NO!}</option>
+    </select>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD class=\"install\" align=\"right\">".LANG_WRITE_FOOTER.":&nbsp;&nbsp;</TD>
+  <TD class=\"install\" align=\"right\">{!LANG_WRITE_FOOTER!}:&nbsp;&nbsp;</TD>
   <TD>
-    <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
+    <select name=\"wfooter\" size=\"1\" class=\"install_select\">
+      <option value=\"true\"");
 		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
+		OUTPUT_HTML(">{!YES!}</option>
+      <option value=\"false\"");
 		if (!defined('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".NO."</OPTION>
-    </SELECT>
+		OUTPUT_HTML(">{!NO!}</option>
+    </select>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD class=\"install\" align=\"right\">".INSTALL_ENABLE_BACKLINK.":&nbsp;&nbsp;</TD>
+  <TD class=\"install\" align=\"right\">{!INSTALL_ENABLE_BACKLINK!}:&nbsp;&nbsp;</TD>
   <TD>
-    <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
+    <select name=\"blink\" size=\"1\" class=\"install_select\">
+      <option value=\"true\"");
 		if (ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
+		OUTPUT_HTML(">{!YES!}</option>
+      <option value=\"false\"");
 		if (!ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
-		OUTPUT_HTML(">".NO."</OPTION>
-    </SELECT>
+		OUTPUT_HTML(">{!NO!}</option>
+    </select>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD colspan=\"2\" align=\"center\">");
 		foreach ($mysql as $key => $value) {
-			OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+			OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key!}]\" value=\"".$value!}\">");
 		}
-		OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
-    <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
-    <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
-    <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
-    <INPUT type=\"hidden\" name=\"email\" value=\"".__EMAIL_VALUE."\">
-    <INPUT type=\"hidden\" name=\"smtp_host\" value=\"".__SMTP_HOST."\">
-    <INPUT type=\"hidden\" name=\"smtp_user\" value=\"".__SMTP_USER."\">
-    <INPUT type=\"hidden\" name=\"smtp_pass\" value=\"".__SMTP_PASS."\">
-    <INPUT type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"".NEXT_PAGE."\" class=\"install_submit\">
+		OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\">
+    <INPUT type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
+    <INPUT type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
+    <INPUT type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
+    <INPUT type=\"hidden\" name=\"email\" value=\"{!__EMAIL_VALUE!}\" />
+    <INPUT type=\"hidden\" name=\"smtp_host\" value=\"{!__SMTP_HOST!}\" />
+    <INPUT type=\"hidden\" name=\"smtp_user\" value=\"{!__SMTP_USER!}\" />
+    <INPUT type=\"hidden\" name=\"smtp_pass\" value=\"{!__SMTP_PASS!}\" />
+    <INPUT type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"{!NEXT_PAGE!}\" class=\"install_submit\" />
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 </TABLE>
-</FORM>");
+</form>");
 		break;
 
 	case "finalize": // Write captured data to files
@@ -404,7 +404,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 			if (getTotalFatalErrors() > 0) {
 				$OUT = "";
 	  			foreach ($FATAL as $value) {
-					$OUT .= "    <LI>".$value."</LI>\n";
+					$OUT .= "    <li>".$value."</li>\n";
 				} // END foreach
 				define('__FATAL_ERROR_LI', $OUT);
 				$OUT = "";
@@ -419,33 +419,33 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 				define('__SMTP_USER'	, $_POST['smtp_user']);
 				define('__SMTP_PASS'	, $_POST['smtp_pass']);
 
-				OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
+				OUTPUT_HTML("<form action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD align=\"center\">
-    <STRONG class=\"install\">".HEADER_MYSQL_ERRORS."</STRONG>
+    <div class=\"install\">".HEADER_MYSQL_ERRORS."</strong>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
-  <TD><SPAN class=\"install_intro\">
+  <TD><span class=\"install_intro\">
     ".TEXT_MYSQL_ERRORS."
-  </SPAN></TD>
+  </span></TD>
 </TR>
 <TR>
-  <TD align=\"center\"><STRONG>
-    <OL>
+  <TD align=\"center\"><strong>
+    <ol>
 ".__FATAL_ERROR_LI."
-    </OL>
+    </ol>
 ".__MYSQL_DATA."
     <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
     <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
     <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
     <INPUT type=\"submit\" class=\"admin_submit\" name=\"ok\" value=\"".RETURN_MYSQL_PAGE."\">
-  </STRONG></TD>
+  </strong></TD>
 </TR>
 </TABLE>
-</FORM>");
+</form>");
 			} else {
 				// Installation is done!
 				LOAD_URL($burl."/install.php?page=finalize");
@@ -462,7 +462,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 
 	default:
 		DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected.", $_GET['page']));
-		OUTPUT_HTML("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
+		OUTPUT_HTML("    <div class=\"install_error\">".WRONG_PAGE."</strong>");
 		break;
 	}
 } else {
diff --git a/inc/language/active_de.php b/inc/language/active_de.php
index 2f692a450b..acd2a95df3 100644
--- a/inc/language/active_de.php
+++ b/inc/language/active_de.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 define('GUEST_ACTIVE_LINK', "Heute Online");
 define('GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY', "Heute war noch kein einziges Mitglied online!");
 define('GUEST_ACTIVE_HEADER', "Wir waren heute online!");
-define('GUEST_ACTIVE_FOOTER', "Diese Mitglieder waren heute bei <STRONG>{--MAIN_TITLE--}</STRONG> eingeloggt.");
+define('GUEST_ACTIVE_FOOTER', "Diese Mitglieder waren heute bei <strong>{--MAIN_TITLE--}</strong> eingeloggt.");
 define('ADMIN_ACTIVE_SETTINGS', "Einstellungen an Aktiv-Liste");
 define('ADMIN_ACTIVE_LIMIT', "Anzahl Eintr&auml;ge in Liste");
 
diff --git a/inc/language/admins_de.php b/inc/language/admins_de.php
index 28ef7b6a9a..7afc3a62ce 100644
--- a/inc/language/admins_de.php
+++ b/inc/language/admins_de.php
@@ -54,7 +54,7 @@ define('ADMIN_ADMINS_PASSWORD', "Passwort und Wiederholung");
 define('ADMIN_ADMINS_EDIT_NOTE', "Bitte beachten Sie, dass Sie nur dann das Passwort zweimal eingeben m&uuml;ssen, wenn Sie es &auml;ndern wollen. Wollen Sie nur die Daten &auml;ndern, brauchen Sie kein Passwort eingeben!");
 define('ADMIN_ADMINS_DELETE_ACCOUNTS', "Wollen Sie wirklich diese Accounts l&ouml;schen?");
 define('ADMIN_ADMINS_CANNOT_DELETE_LAST', "Das letzte Admin-Account kann nicht gel&ouml;scht werden!");
-define('ADMINS_SELECT_ADMIN', "Bitte w&auml;hlen Sie einen Administrator aus dem Men&uuml;punkt <I>Admin-Account &auml;ndern</I> aus!");
+define('ADMINS_SELECT_ADMIN', "Bitte w&auml;hlen Sie einen Administrator aus dem Men&uuml;punkt <em>Admin-Account &auml;ndern</em> aus!");
 define('ADMINS_ADMIN_ID', "Admin-ID");
 define('ADMINS_CONTACT_SUBMIT', "Admin kontaktieren");
 define('ADMINS_ENTER_CONTACT_TEXT', "Kontaktgrund eingeben");
@@ -72,7 +72,7 @@ define('ADMIN_ADMINS_SELECT_MODE', "Zugriffsmodus ausw&auml;hlen");
 define('ADMINS_ALLOW_MODE', "Erlauben");
 define('ADMINS_DENY_MODE', "Ablehnen");
 define('ADMIN_ADMINS_ACCESS_MODE', "Zugriffsmodus");
-define('ADMIN_ADMINS_ACL_NOTE', "Sperren Sie nicht sich selber aus, indem Sie den Zugriffsmodus Ihres eigenen Accountes auf <STRONG>Ablehnen</STRONG> stellen! Dann k&ouml;nnen Sie zwar einloggen, aber nichts mehr machen!");
+define('ADMIN_ADMINS_ACL_NOTE', "Sperren Sie nicht sich selber aus, indem Sie den Zugriffsmodus Ihres eigenen Accountes auf <strong>Ablehnen</strong> stellen! Dann k&ouml;nnen Sie zwar einloggen, aber nichts mehr machen!");
 define('ADMIN_ADMINS_SAME_MODE_SELECTED', "Bitte w&auml;hlen Sie den anderen Zugriffsmodus aus!");
 define('ADMIN_ADMINS_SELECT_ACTION_WHAT', "Bitte w&auml;hlen Sie ein Haupt- oder Untermen&uuml; aus!");
 define('ADMIN_ADMINS_ACL_ALREADY_ADDED', "Zugriffskontrollzeile bereits hinzugef&uuml;gt!");
diff --git a/inc/language/bank_de.php b/inc/language/bank_de.php
index 4a7d605ec2..5f1e7a2bbe 100644
--- a/inc/language/bank_de.php
+++ b/inc/language/bank_de.php
@@ -66,9 +66,9 @@ define('ADMIN_LIST_BANK_PACKAGES_STATUS', "Erwerbbar?");
 define('ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_PLUS', "Zinsen f. Haben");
 define('ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_MINUS', "Zinsen f. Soll");
 define('ADMIN_DELETE_BANK_PACKAGES', "Angebotspakete entg&uuml;ltig entfernen");
-define('ADMIN_DELETE_BANK_PACKAGES_NOTES', "<STRONG>Hinweis:</STRONG> Wenn Sie die aufgelisteten Angebotspakete entg&uuml;ltig l&ouml;schen, kann eventuell Ihre Bank nicht korrekt funktionieren, da eventuell einige Mitglieder dieses Paket ausgew&auml;hlt haben. Bitte schauen Sie unter <EM>Konten auflisten</EM> vorher nach!");
+define('ADMIN_DELETE_BANK_PACKAGES_NOTES', "<strong>Hinweis:</strong> Wenn Sie die aufgelisteten Angebotspakete entg&uuml;ltig l&ouml;schen, kann eventuell Ihre Bank nicht korrekt funktionieren, da eventuell einige Mitglieder dieses Paket ausgew&auml;hlt haben. Bitte schauen Sie unter <EM>Konten auflisten</EM> vorher nach!");
 define('ADMIN_EDIT_BANK_PACKAGES', "Angebotspakete &auml;ndern");
-define('ADMIN_EDIT_BANK_PACKAGES_NOTES', "<STRONG>Hinweis:</STRONG> Derzeit keine Tipps f&uuml;r diese Aktion.");
+define('ADMIN_EDIT_BANK_PACKAGES_NOTES', "<strong>Hinweis:</strong> Derzeit keine Tipps f&uuml;r diese Aktion.");
 
 // Output modes
 define('BANK_OUTPUT_MODE_LOGIN', "Nur im Mitgliedsbereich");
diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 8a9876ed9b..76b33c640f 100644
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -105,17 +105,17 @@ define('ADMIN_BEG_TIMEOUT_1', "Es werden nur Mitglieder ausgewertet und hier auf
 define('ADMIN_BEG_TIMEOUT_2', "noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht!");
 define('ADMIN_EDIT_BEG_RALLYE_SETTINGS', "Einstellungen an der Bettel-Rallye");
 define('ADMIN_BEG_RALLYE_ACTIVE', "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)");
-define('ADMIN_BEG_RALLYE_ONLY_ACTIVE', "Nur aktive Mitglieder nehmen dran?<br /><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
+define('ADMIN_BEG_RALLYE_ONLY_ACTIVE', "Nur aktive Mitglieder nehmen dran?<br /><div class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>");
 define('ADMIN_BEG_NO_RALLYE', "Niemand nimmt an der Bettel-Rallye dran teil!");
 define('ADMIN_BEG_WITHDRAW_NOW', "Jetzt Verg&uuml;tung Bettel-Rallye verg&uuml;ten");
 define('ADMIN_BEG_WITHDRAW_NOTE', "Es wird nur die Verg&uuml;tung vorbereitet. Die eigentliche Verg&uuml;tung erfolgt beim T&auml;glichen Reset um 00:00 Uhr!");
 define('ADMIN_BEG_WITHDRAW_PREPARED', "Verg&uuml;tung der Bettel-Rallye vorbereitet.");
 define('ADMIN_BEG_WINNER_HIGLIGHTED', "M&ouml;gliche Gewinner der Bettel-Rallye sind dick marktiert.");
 define('ADMIN_BEG_ALREADY_WITHDRAW', "Manuelle Verg&uuml;tungvorbereitung bereits bet&auml;tigt!");
-define('BEG_RALLYE_NOTE', "Hinweis: Unter <STRONG>{--BEG_POINTS--}</STRONG> finden Sie Ihre gesamt erbettelten {!POINTS!} wieder!");
+define('BEG_RALLYE_NOTE', "Hinweis: Unter <strong>{--BEG_POINTS--}</strong> finden Sie Ihre gesamt erbettelten {!POINTS!} wieder!");
 define('BEG_RALLYE_CONDITIONS', "Wer alles an der Bettel-Rallye teilnehmen kann");
 define('BEG_RALLYE_CONDITION_1', "Es werden nur aktive und freigeschaltete Mitglieder ber&uuml;cksichtig.");
-define('BEG_RALLYE_CONDITION_2', "Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<STRONG>{--MAIN_TITLE--}</STRONG>) und freigegeben ist.");
+define('BEG_RALLYE_CONDITION_2', "Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<strong>{--MAIN_TITLE--}</strong>) und freigegeben ist.");
 define('BEG_RALLYE_CONDITION_3', "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {!POINTS!} ber&uuml;cksichtig.");
 define('BEG_RALLYE_CONDITION_4', "Der Rechtsweg ist ausgeschlossen.");
 define('BEG_MEMBER_HERE_IS_THE_LIST', "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern!");
@@ -127,7 +127,7 @@ define('ADMIN_BEG_RALLYE_DEACTIVATED', "Bettel-Rallye nicht aktiviert.");
 define('ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS', "Benachrichtungen per Mail zur Bettel-Rallye");
 define('ADMIN_BEG_RAL_EN_NOTIFY', "Benachtigen, wenn Bettel-Rallye aktiviert wurde?");
 define('ADMIN_BEG_RAL_DI_NOTIFY', "Benachtigen, wenn Bettel-Rallye deaktiviert wurde?");
-define('ADMIN_BEG_NOTIFY_BONUS', "Bonus-Mail mit Anzahl {!POINTS!} aussenden, wenn Bettel-Rallye aktiviert wurde. <FONT class=\"admin_note\">(0 = Unverg&uuml;tete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung <STRONG>bonus!</STRONG>)</FONT>");
+define('ADMIN_BEG_NOTIFY_BONUS', "Bonus-Mail mit Anzahl {!POINTS!} aussenden, wenn Bettel-Rallye aktiviert wurde. <div class=\"admin_note\">(0 = Unverg&uuml;tete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung <strong>bonus!</strong>)</div>");
 define('ADMIN_BEG_NEW_MEMBER_NOTIFY', "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bettel-Rallye benachrichtigt werden?");
 define('ADMIN_BEG_NOTIFY_WAIT', "Wie lange soll die Wartezeit der Bonus-Mail sein?");
 define('BEG_NO_LIMITATION', "Keine IP-Sperre eingerichtet!!!");
diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php
index 17733a4f08..c27d28fb56 100644
--- a/inc/language/birthday_de.php
+++ b/inc/language/birthday_de.php
@@ -41,14 +41,14 @@ if (!defined('__SECURITY')) {
 define('HAPPY_BIRTHDAY', "Herzlichen Glueckwunsch zum Geburtstag!");
 define('ADMIN_CONFIG_BIRTHDAY_HEADER', "Einstellungen zu Geburtstagsmails");
 define('ADMIN_BIRTHDAY_POINTS', "{!POINTS!} als &quot;Geburtstagsgeschenk&quot;");
-define('ADMIN_BIRTHDAY_POINTS_NOTE', "Wert <STRONG>0</STRONG> deaktiviert die Extragutschrift!");
-define('BIRTHDAY_CANNOT_STATUS_1', "Kann keine {!POINTS!} gutschreiben! Status Ihres Accounts: <STRONG>");
-define('BIRTHDAY_CANNOT_STATUS_2', "</STRONG>");
+define('ADMIN_BIRTHDAY_POINTS_NOTE', "Wert <strong>0</strong> deaktiviert die Extragutschrift!");
+define('BIRTHDAY_CANNOT_STATUS_1', "Kann keine {!POINTS!} gutschreiben! Status Ihres Accounts: <strong>");
+define('BIRTHDAY_CANNOT_STATUS_2', "</strong>");
 define('BIRTHDAY_CANNOT_LOAD_DATA', "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag!");
 define('ADMIN_SELECT_BIRTHDAY_MODE', "Verg&uuml;tungsmodus der {!POINTS!}");
 define('BIRTHDAY_MODE_DIRECT', "Nur direktem Mitglied gutschreiben.");
 define('BIRTHDAY_MODE_REF', "Auch dem Werber des Mitgliedes gutschreiben.");
-define('ADMIN_BIRTHDAY_ONLY_ACTIVE', "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><FONT class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <STRONG>autopurge</STRONG>!)</FONT>");
+define('ADMIN_BIRTHDAY_ONLY_ACTIVE', "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>");
 
 //
 ?>
diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 28cd9c9020..ce9cc2e055 100644
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -53,10 +53,10 @@ define('ADMIN_BONUS_TURBO_RANKS', "Wie viele Mitglieder sollen die monatliche Au
 define('ADMIN_BONUS_NO_ACTIVE_RALLYE', "Niemand nimmt an der Aktiv-Rallye dran teil!");
 define('BONUS_SHOW_TURBO_BONUS', "Sehen Sie hier nach, wer alles schon best&auml;tigt hat...");
 define('BONUS_SHOW_WRONG_CALL', "Falscher Aufruf des Scriptes, bitte nur aus dem Best&auml;tigungsframe aufrufen!");
-define('BONUS_SHOW_WRONG_TYPE', "Falscher Typ an das Script &uuml;bergeben! Bitte melden Sie sich <A href=\"mailto:{!WEBMASTER!}\">beim Webmaster</A> !");
+define('BONUS_SHOW_WRONG_TYPE', "Falscher Typ an das Script &uuml;bergeben! Bitte melden Sie sich <a href=\"mailto:{!WEBMASTER!}\">beim Webmaster</a> !");
 define('BONUS_SHOW_NO_DATA', "Entweder haben Sie f&uuml;r diese Mail keine Aktiv-Verg&uuml;tung erhalten oder der Link ist nicht mehr g&uuml;ltig.");
-define('BONUS_NO_RANKS_1', "Es hat noch niemand {!POINTS!} zur Mail <U>");
-define('BONUS_NO_RANKS_2', "</U> gewonnen! Sie k&ouml;nnten der erste sein! :-)");
+define('BONUS_NO_RANKS_1', "Es hat noch niemand {!POINTS!} zur Mail <u>");
+define('BONUS_NO_RANKS_2', "</u> gewonnen! Sie k&ouml;nnten der erste sein! :-)");
 define('BONUS_LOGIN_TURBO_NOTE', "Der Login-, Referal-, Klickrate-, Mailbuchungs-  und Best&auml;tigungsbonus wird Ihnen nicht sofort verg&uuml;tet, sondern erst am Ende jeden Monats in Form einer Aktiv-Rallye. Den Mailbuchungsbonus erhalten Sie erst bei Freischaltung Ihrer Mail auf das Bonus-Konto gutgeschrieben.");
 define('BONUS_POINTS_TITLE', "Sonderbonus-{!POINTS!}");
 define('BONUS_RANK_YOU_ARE_NOT_FOUND', "Sie haben bis jetzt noch keine Aktiv-Verg&uuml;tung erhalten!");
@@ -74,7 +74,7 @@ define('BONUS_RALLYE_NOTE', "Bitte beachten Sie, dass Ihr Login-Bonus hier nicht
 define('BONUS_RALLYE_CONDITIONS', "Wer alles an der Aktiv-Rallye teilnehmen kann");
 define('BONUS_RALLYE_CONDITION_1', "Es werden nur aktive und freigeschaltete Mitglieder ber&uuml;cksichtig.");
 define('BONUS_RALLYE_CONDITION_2', "Der Login-Bonus wird bei der Auswertung nicht beachtet, aber dem Mitglied gutgeschrieben.");
-define('BONUS_RALLYE_CONDITION_3', "Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<STRONG>{--MAIN_TITLE--}</STRONG>) und freigegeben ist.");
+define('BONUS_RALLYE_CONDITION_3', "Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<strong>{--MAIN_TITLE--}</strong>) und freigegeben ist.");
 define('BONUS_RALLYE_CONDITION_4', "Zur Erstellung des Rallye-Ergebnisses wird nur die Aktiv-Verg&uuml;tung ber&uuml;cksichtig, welche Sie beim Best&auml;tigen von Mails erhalten k&ouml;nnen.");
 define('BONUS_RALLYE_CONDITION_5', "Der Rechtsweg ist ausgeschlossen.");
 define('BONUS_START_CONFIRMING_MAILS', "Hier sind Ihre unbest&auml;tigten Mails...");
@@ -90,7 +90,7 @@ define('ADMIN_BONUS_TIMEOUT_1', "Es werden nur Mitglieder ausgewertet und hier a
 define('ADMIN_BONUS_TIMEOUT_2', "noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht!");
 define('ADMIN_BONUS_USERID', "Mitgliedskonto zum Abbuchen der {!POINTS!}");
 define('ADMIN_CONFIG_BONUS_TIMEOUT', "Verweildauer von Aktiv-Bonus-Eintr&auml;gen");
-define('ADMIN_BONUS_TURBO_LINES', "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <STRONG>show_bonus.php</STRONG>");
+define('ADMIN_BONUS_TURBO_LINES', "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>");
 define('ADMIN_SEND_BONUS_MAILS', "Versenden von Bonus-Mails");
 define('ADMIN_SEND_BONUS_NORMAL', "Text-Mail versenden");
 define('ADMIN_SEND_BONUS_HTML', "HTML-Mail versenden");
@@ -98,7 +98,7 @@ define('ADMIN_SEND_BONUS_NORMAL_NOTES', "Standart Text-Mail an Ihre Mitglieder a
 define('ADMIN_SEND_BONUS_HTML_NOTES', "HTML-Mail an Ihre Mitglieder versenden. Dazu muss die Erweiterung html_mail jedoch installiert sein!");
 define('ADMIN_BONUS_ORDER_BONUS', "Bonus f&uuml;r eine Mailbuchung");
 define('ADMIN_BONUS_REF_BONUS', "Bonus f&uuml;r das Werben eines weiteren Mitgliedes");
-define('ADMIN_BONUS_STATS_BONUS', "Einmalige Bonus bei Erreichen von 100% Klickrate auf eine Mailbuchung (=<STRONG class=\"tiny\">Statistik-Bonus</STRONG>)");
+define('ADMIN_BONUS_STATS_BONUS', "Einmalige Bonus bei Erreichen von 100% Klickrate auf eine Mailbuchung (=<div class=\"tiny\">Statistik-Bonus</strong>)");
 define('ADMIN_BONUS_TURBO_BONUS_TITLE', "Bonus-{!POINTS!} f&uuml;r best&auml;tigte Mails");
 define('ADMIN_BONUS_TURBO_TIMEOUT_TITLE', "Zeitabst&auml;nde und Aufbewahrungszeiten");
 define('ADMIN_BONUS_TURBO_MISC_TITLE', "Sonstige Einstellungen zur Bonus-Erweiterung");
@@ -118,7 +118,7 @@ define('ADMIN_BONUS_RALLYE_DEACTIVATED', "Aktiv-Rallye deaktiviert.");
 define('ADMIN_BONUS_RALLYE_NOTIFTICATIONS', "Benachrichtigungen per Mail &uuml;ber Bonus-Rallye");
 define('ADMIN_BONUS_RALLYE_EN_NOTIFY', "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?");
 define('ADMIN_BONUS_RALLYE_DI_NOTIFY', "Sollen die Mitglieder bei Deaktivierung benachtichtigt werden?");
-define('ADMIN_BONUS_RALLYE_NOTIFY_POINTS', "Bonus-Mail mit Anzahl {!POINTS!} aussenden, wenn Bonus-Rallye aktiviert wurde. <FONT class=\"admin_note\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</FONT>");
+define('ADMIN_BONUS_RALLYE_NOTIFY_POINTS', "Bonus-Mail mit Anzahl {!POINTS!} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"admin_note\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>");
 define('ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY', "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bonus-Rallye benachrichtigt werden?");
 define('ADMIN_BONUS_RALLYE_NOTIFY_WAIT', "Wie lange soll die Wartezeit der Bonus-Mail sein?");
 define('ADMIN_BONUS_INCLUDE_OWN', "Soll Ihre Mitglieder-ID an der Aktiv-Rallye dran teilnehmen?");
diff --git a/inc/language/cache_de.php b/inc/language/cache_de.php
index fe26f49d01..297a32115c 100644
--- a/inc/language/cache_de.php
+++ b/inc/language/cache_de.php
@@ -39,30 +39,30 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 define('CACHE_PROBLEMS_DETECTED', "Probleme mit dem Cache-Subsystem erkannt!");
-define('CACHE_CANNOT_LOAD_1', "Kann nicht Cache-Datei <STRONG><U>");
-define('CACHE_CANNOT_LOAD_2', "</U></STRONG> laden!");
-define('CACHE_CANNOT_INITIALIZE', "Konnte das Caching-System nicht initialisieren. Bitte die Dokumentation <STRONG>DOCS/de/cache/README.txt</STRONG> lesen!");
+define('CACHE_CANNOT_LOAD_1', "Kann nicht Cache-Datei <strong><u>");
+define('CACHE_CANNOT_LOAD_2', "</u></strong> laden!");
+define('CACHE_CANNOT_INITIALIZE', "Konnte das Caching-System nicht initialisieren. Bitte die Dokumentation <strong>DOCS/de/cache/README.txt</strong> lesen!");
 define('ADMIN_CACHE_STATS_TITLE', "Statistiken des Caching-Systems");
 define('ADMIN_CACHE_DB_HITS', "Zugriffe auf die Datenbank");
 define('ADMIN_CACHE_HITS', "Zugriffe auf den Cache");
 define('ADMIN_CACHE_PERCENTS', "Prozentual (*)");
 define('ADMIN_CACHE_NOTES', "(*): Sollten bei Ihnen die Prozente unter 50&#37; liegen und Sie nicht vor September 2008 das Script *neu* installiert haben, so ist dies kein Grund zur Besorgnis. Im Normalfall sollten die Prozente seit eigenen Revisionen im September 2008 (R300+) &uuml;ber 50&#37; liegen.");
 define('ADMIN_TOTAL_HITS', "Gesamtzugriffe");
-define('CACHE_CANNOT_UNLINK_1', "Kann nicht die Cache-Datei <STRONG><U>");
-define('CACHE_CANNOT_UNLINK_2', "</U></STRONG> vom Server entfernen!");
+define('CACHE_CANNOT_UNLINK_1', "Kann nicht die Cache-Datei <strong><u>");
+define('CACHE_CANNOT_UNLINK_2', "</u></strong> vom Server entfernen!");
 
 // Administrative settings
 define('ADMIN_CONFIG_CACHE_SETTINGS', "Caching-Einstellung");
-define('ADMIN_CACHE_ADMINS', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_admins</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_ACLS', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_admins_acls</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_EXTS', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_extensions</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_CONFIG', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_config</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_MODREG', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_mod_reg</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_REFDEPTH', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_refdepths</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_REFSYS', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_refsystem</STRONG> beschleunigt werden?");
-define('ADMIN_CACHE_THEMES', "Soll der Zugriff auf die Tabelle <STRONG>{!_MYSQL_PREFIX!}_themes</STRONG> beschleunigt werden?");
+define('ADMIN_CACHE_ADMINS', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_admins</strong> beschleunigt werden?");
+define('ADMIN_CACHE_ACLS', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_admins_acls</strong> beschleunigt werden?");
+define('ADMIN_CACHE_EXTS', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_extensions</strong> beschleunigt werden?");
+define('ADMIN_CACHE_CONFIG', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_config</strong> beschleunigt werden?");
+define('ADMIN_CACHE_MODREG', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_mod_reg</strong> beschleunigt werden?");
+define('ADMIN_CACHE_REFDEPTH', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_refdepths</strong> beschleunigt werden?");
+define('ADMIN_CACHE_REFSYS', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_refsystem</strong> beschleunigt werden?");
+define('ADMIN_CACHE_THEMES', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_PREFIX!}_themes</strong> beschleunigt werden?");
 define('ADMIN_CACHE_ADMIN_MENU', "Soll der Aufbau des Administratormen&uuml;s beschleunigt werden (EXPERIMENTELL!)?");
-define('ADMIN_CACHE_PATH', "Relativer Pfad f&uuml;r alle Cache-Dateien zum Pfad <STRONG>inc</STRONG>");
+define('ADMIN_CACHE_PATH', "Relativer Pfad f&uuml;r alle Cache-Dateien zum Pfad <strong>inc</strong>");
 
 //
 ?>
diff --git a/inc/language/country_de.php b/inc/language/country_de.php
index ebb1d03a9a..6f3e4814ba 100644
--- a/inc/language/country_de.php
+++ b/inc/language/country_de.php
@@ -48,10 +48,10 @@ define('ADMIN_LIST_COUNTRIES', "L&auml;ndercodes auflisten");
 define('ADMIN_COUNTRY_CODE', "Code");
 define('ADMIN_COUNTRY_NAME', "Name");
 define('ADMIN_COUNTRY_STATUS', "Anzeigen?");
-define('ADMIN_COUNTRY_ALREADY_1', "L&auml;ndercode <U>");
-define('ADMIN_COUNTRY_ALREADY_2', "</U> existiert bereits!");
-define('ADMIN_COUNTRY_ADDED_1', "L&auml;ndercode f&uuml;r Land <U>");
-define('ADMIN_COUNTRY_ADDED_2', "</U> hinzugef&uuml;gt.");
+define('ADMIN_COUNTRY_ALREADY_1', "L&auml;ndercode <u>");
+define('ADMIN_COUNTRY_ALREADY_2', "</u> existiert bereits!");
+define('ADMIN_COUNTRY_ADDED_1', "L&auml;ndercode f&uuml;r Land <u>");
+define('ADMIN_COUNTRY_ADDED_2', "</u> hinzugef&uuml;gt.");
 define('ADMIN_COUNTRY_EDIT_NOW', "L&auml;ndercodes &auml;ndern");
 define('ADMIN_COUNTRY_DELETE_NOW', "L&auml;ndercodes l&ouml;schen");
 define('ADMIN_COUNTRY_EDIT_TITLE', "L&auml;ndercodes &auml;ndern");
diff --git a/inc/language/de.php b/inc/language/de.php
index 1ad3693be5..9d03964ad2 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -58,8 +58,8 @@ define('_OGESAMT', "KiloByte Gesamt optimiert");
 define('_WOPT', "wurde bereits optimiert");
 define('_OKOPT', "Optimiert!");
 define('LANG_DOWN_MAINTAINCE', "System wegen Wartungsarbeiten geschlossen!");
-define('LANG_MOD_REG_404_1', "Modul <U>");
-define('LANG_MOD_REG_404_2', "</U> existiert nicht!");
+define('LANG_MOD_REG_404_1', "Modul <u>");
+define('LANG_MOD_REG_404_2', "</u> existiert nicht!");
 define('LANG_MOD_NOT_REG', " ist nicht registriert!");
 define('LANG_UNKNOWN_MODULE', "Unbekanntes Modul");
 define('META_YOUR_NAME_1', "Ihr Name hier");
@@ -85,21 +85,21 @@ define('RETURN_MYSQL_PAGE', "Zur&uuml;ck zu den MySQL-Einstellungen");
 define('INSTALL_FINALIZER_FAILED', "W&auml;hrend der Installation ist ein unerwarteter Fehler aufgetreten! Der Finalizer konnte die Installation nicht abschliessen!");
 define('INSTALL_MAYBE_DONE', "Die Installation ist m&ouml;glicherweise abgeschlossen oder es ist ein unerwarteter Fehler aufgetreten!");
 define('INSTALL_FINISHED', "Die Installation ist abgeschlossen! :-)");
-define('INSTALL_FIN_SECU', "<strong><U>Sicherheitshinweise:</U></strong><br />Installieren Sie eine .htaccess Datei in alle Unterverzeichnisse ab dem Verzeichnis inc!");
+define('INSTALL_FIN_SECU', "<strong><u>Sicherheitshinweise:</u></strong><br />Installieren Sie eine .htaccess Datei in alle Unterverzeichnisse ab dem Verzeichnis inc!");
 define('CONTINUE_ADMIN', "Weiter zum Administrationsbereich...");
 define('RUNTIME_PROBLEMS_DETECTED', "Laufzeit-Problem erkannt!");
 define('FATAL_INC_WRITABLE', "Das Verzeichnis inc ist beschreibbar! Bitte setzen Sie die Zugriffsrechte auf 755 oder 555.");
 define('LANG_WRITE_FOOTER', "Scriptname, -version und -author anzeigen?");
 define('LANG_FRAMESET_ACTIVE', "Soll das Frameset aktiviert werden? (Wenn nein wird ein Table-Set aktiviert)");
 define('MYSQL_ERRORS', "Es sind MySQL-Fehler aufgetreten! Bitte korregieren Sie diese!");
-define('LANG_MOD_UNKNOWN_1', "Der Return-Code <U>");
-define('LANG_MOD_UNKNOWN_2', "</U> ist unbekannt!");
-define('LANG_MOD_LOCKED_1', "Das Modul <U>");
-define('LANG_MOD_LOCKED_2', "</U> wurde gesperrt!");
-define('ADMIN_UNKNOWN_ACTION_1', "Unbekannte Admin-Aktion <U>");
-define('ADMIN_UNKNOWN_ACTION_2', "</U> erkannt! Bitte das Modul richtig aufrufen!");
-define('ADMIN_ACTION_404_1', "Admin-Modul f&uuml;r Aktion <U>");
-define('ADMIN_ACTION_404_2', "</U> nicht gefunden!");
+define('LANG_MOD_UNKNOWN_1', "Der Return-Code <u>");
+define('LANG_MOD_UNKNOWN_2', "</u> ist unbekannt!");
+define('LANG_MOD_LOCKED_1', "Das Modul <u>");
+define('LANG_MOD_LOCKED_2', "</u> wurde gesperrt!");
+define('ADMIN_UNKNOWN_ACTION_1', "Unbekannte Admin-Aktion <u>");
+define('ADMIN_UNKNOWN_ACTION_2', "</u> erkannt! Bitte das Modul richtig aufrufen!");
+define('ADMIN_ACTION_404_1', "Admin-Modul f&uuml;r Aktion <u>");
+define('ADMIN_ACTION_404_2', "</u> nicht gefunden!");
 define('ADMIN_NOT_REGISTERED', "Es ist noch kein Administrator-Account angelegt worden.");
 define('ADMIN_REGISTER_NOW', "Legen Sie jetzt das Administrator-Account an:");
 define('ADMIN_LOGIN', "Geben Sie ein Administrator-Login ein");
@@ -134,8 +134,8 @@ define('ADMIN_LOGOUT_DONE', "Ausloggen aus dem Admin-Bereich abgeschlossen!");
 define('ADMIN_LOGOUT_FAILED', "Konnte nicht aus dem Admin-Bereich ausloggen! :-(");
 define('ADMIN_RELOGIN_LINK', "Klicken Sie hier, um sich erneut einzuloggen.");
 define('ADMIN_404_ACTION', "Admin-Modul nicht gefunden!");
-define('ADMIN_404_ACTION_1', "Das aufgerufe Admin-Modul <U>");
-define('ADMIN_404_ACTION_2', "</U> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.");
+define('ADMIN_404_ACTION_1', "Das aufgerufe Admin-Modul <u>");
+define('ADMIN_404_ACTION_2', "</u> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.");
 define('ALREADY_INSTALLED', "Dieses Script ist bereits auf diesem Server installiert worden Bitte l&ouml;schen Sie install.php inc/install-inc.php und install.sql von Ihrem Server! (Keine Sorge, Sie k&ouml;nnen es tun...)");
 define('ADMIN_MAIN_TITLE', "Willkommen zum Administrationsbereich");
 define('YOU_ARE_HERE', "Sie sind hier:");
@@ -151,8 +151,8 @@ define('EDIT_MENU_1', "Es soll/sollen <strong>");
 define('EDIT_MENU_2', "</strong> Men&uuml;eintrag/-eintr&auml;ge ge&auml;ndert werden:");
 define('ENTRY_MODIFY', "Eintrag");
 define('SUBMIT_CHANGES', "&Auml;nderungen durchf&uuml;hren");
-define('ENTRY_404_1', "Eintrag <I>");
-define('ENTRY_404_2', "</I> wurde nicht gefunden!");
+define('ENTRY_404_1', "Eintrag <em>");
+define('ENTRY_404_2', "</em> wurde nicht gefunden!");
 define('EDIT_UNKNOWN_OKAY', "Es wurde eine unbekannte Aktion durchgef&uuml;hrt!");
 define('SAVING_DATA', "Speichere Daten ab");
 define('SAVING_DONE', "Speicherung beendet!");
@@ -222,7 +222,7 @@ define('PER_DAY', "Mails");
 define('REFID_BY', "Sie wurden geworben von");
 define('TERMS_OF_USAGE', "AGBs zustimmen und absenden");
 define('YOU_FINALIZE', "Sie haben es gleich geschafft!");
-define('AGREE_TO_THIS', "Stimmen Sie unseren [<A href=\"{!URL!}/modules.php?module=index&amp;what=agb\" class=\"register_term\" target=\"_blank\">AGBs</A>] zu?");
+define('AGREE_TO_THIS', "Stimmen Sie unseren [<a href=\"{!URL!}/modules.php?module=index&amp;what=agb\" class=\"register_term\" target=\"_blank\">AGBs</a>] zu?");
 define('SUBMIT_REGISTER', "Anmeldedaten abschicken");
 define('HAVE_TO_AGREE', "Sie m&uuml;ssen unseren AGBs zustimmen, damit Sie an diesem {!MT_WORD!} teilnehmen k&ouml;nnen!");
 define('ENTER_BOTH_PASSWORDS', "Bitte geben Sie ein Passwort und das selbe Passwort noch einmal ein!");
@@ -237,8 +237,8 @@ define('SETTINGS_NOT_SAVED', "Einstellungen NICHT gespeichert / ge&auml;ndert!")
 define('SETTINGS_SAVED', "Einstellungen gespeichert.");
 define('FATAL_CANNOT_LOAD_CONFIG', "Kann die Konfigurationsdaten nicht laden! Vermutlich richtet der Webmaster diesen {!MT_WORD2!} gerade das Script erst ein! Bitte schauen Sie sp&auml;ter noch einmal vorbei!");
 define('ADMIN_INVALID_ACTION', "Ung&uuml;ltige action/what-Kombination erkannt! Bitte rufen Sie das Admin-Men&uuml; richtig auf!");
-define('ADMIN_INVALID_ACTION_1', "Die action/what-Kombination <U>");
-define('ADMIN_INVALID_ACTION_2', "</U> ist ung&uuml;ltig!");
+define('ADMIN_INVALID_ACTION_1', "Die action/what-Kombination <u>");
+define('ADMIN_INVALID_ACTION_2', "</u> ist ung&uuml;ltig!");
 define('SHORT_PASS', "Das eingegebene Passwort ist nach unseren Sicherheitseinstellungen zu kurz. Mindestl&auml;nge ist");
 define('EDIT_POINTS_SETTINGS', "&Auml;ndern der Willkommensgutschrift und anderer {!POINTS!}");
 define('POINTS_REGISTER', "Willkommensgutschrift");
@@ -329,10 +329,10 @@ define('LIFE_DAYS', "Tag(e)");
 define('LIFE_WEEKS', "Woche(n)");
 define('LIFE_MONTHS', "Monat(e)");
 define('LIFE_YEARS', "Jahr(e)");
-define('LANG_MEM_ONLY_1', "Auf das ausgew&auml;hlte Modul <U>");
-define('LANG_MEM_ONLY_2', "</U> d&uuml;rfen nur eingeloggte Mitglieder zugreifen!");
-define('MEMBER_404_ACTION_1', "Das Mitgliedsaktionsmodul <U>");
-define('MEMBER_404_ACTION_2', "</U> ist nicht auffindbar!");
+define('LANG_MEM_ONLY_1', "Auf das ausgew&auml;hlte Modul <u>");
+define('LANG_MEM_ONLY_2', "</u> d&uuml;rfen nur eingeloggte Mitglieder zugreifen!");
+define('MEMBER_404_ACTION_1', "Das Mitgliedsaktionsmodul <u>");
+define('MEMBER_404_ACTION_2', "</u> ist nicht auffindbar!");
 define('_GUEST', "Gast");
 define('_UNKNOWN', "Name ist nicht ladbar");
 define('_ADMIN', "Administrator");
@@ -511,8 +511,8 @@ define('REF_UID', "Werber-ID");
 define('UNKNOWN_STATUS_1', "Unbekannter Status <strong>");
 define('UNKNOWN_STATUS_2', "</strong> erkannt!");
 define('ACCOUNT_STATUS', "Account-Status");
-define('ACCOUNT_UNCONFIRMED', "<SPAN class=\"admin_failed\">Unbest&auml;tigt</SPAN>");
-define('ACCOUNT_CONFIRMED', "<SPAN class=\"admin_green\">Best&auml;tigt</SPAN>");
+define('ACCOUNT_UNCONFIRMED', "<span class=\"admin_failed\">Unbest&auml;tigt</span>");
+define('ACCOUNT_CONFIRMED', "<span class=\"admin_green\">Best&auml;tigt</span>");
 define('ACCOUNT_LOCKED', "Gesperrt");
 define('ACCOUNT_DELETED', "Gel&ouml;scht");
 define('ADMIN_ALL_ACCOUNTS', "Alle Mitglieder-Accounts auflisten");
@@ -537,7 +537,7 @@ define('ADMIN_EDIT_USER', "&Auml;ndern");
 define('ADMIN_ALL_REFS', "Alle Refs auflisten");
 define('BIRTHDAY2', "Geburtstag");
 define('TOTAL_CATS', "Ausgew&auml;hlte Kategorien");
-define('ADMIN_GOTO_USERLIST', "Dieser Men&uuml;punkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen <I><U>User auflisten</U></I> auf.");
+define('ADMIN_GOTO_USERLIST', "Dieser Men&uuml;punkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen <em><u>User auflisten</u></em> auf.");
 define('ADMIN_USER_UPDATED', "Das Mitgliedsaccount wurde aktualisiert!");
 define('ADMIN_LOCKED_YOUR_ACCOUNT', "Ihr Account wurde von einem unserer Administratoren gesperrt! Bitte halten Sie sich an unsere AGBs.");
 define('REASON_LOCKED', "Grund der Sperrung war");
@@ -639,12 +639,12 @@ define('PATCH_FSIZE', "Downloadgr&ouml;sse");
 define('KBYTES', "KBytes");
 define('DEFAULT_SUBJECT_LINE', "Klick-Mail von {!MAIN_TITLE!}");
 define('MEBER_UPDATE_PWD_WRONG', "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen!");
-define('ADMIN_MEM_NO_CATS_1', "Das Mitglied <U>");
-define('ADMIN_MEM_NO_CATS_2', "</U> hat keine Kategorien ausgew&auml;hlt!");
+define('ADMIN_MEM_NO_CATS_1', "Das Mitglied <u>");
+define('ADMIN_MEM_NO_CATS_2', "</u> hat keine Kategorien ausgew&auml;hlt!");
 define('USER_ID', "Mitglied");
 define('UNCONFIRMED_LINKS', "Unbest&auml;tigte Mails");
-define('ADMIN_MEMBER_LINKS_1', "Das Mitglied <U>");
-define('ADMIN_MEMBER_LINKS_2', "</U> hat alle seine Mails best&auml;tigt.");
+define('ADMIN_MEMBER_LINKS_1', "Das Mitglied <u>");
+define('ADMIN_MEMBER_LINKS_2', "</u> hat alle seine Mails best&auml;tigt.");
 define('MEMBER_TOTAL_LINKS_1', "Es m&uuml;ssen noch <strong>");
 define('MEMBER_TOTAL_LINKS_2', "</strong> Mails von diesem Mitglied best&auml;tigt werden!");
 define('ADMIN_DEL_UNCONFIRMED_LINKS', "Alle unbest&auml;tigten Mails l&ouml;schen");
@@ -723,8 +723,8 @@ define('PATCH_NOTES', "Bitte beachten Sie, dass wenn bei der Installation die SQ
 define('LATEST_PATCH_INSTALLED', "Es wurde bereits die Datenbank aktualisiert!");
 define('PATCH_LISTED', "Anbei eine Liste der noetigen Dateien:");
 define('NO_PATCHES_APPLIED', "Keine Patches wurden ausgef&uuml;hrt!");
-define('LOAD_URL_ERROR_1', "Konnte nicht weiterleiten, da bereits Kopfinformationen gesendet wurden! <A href=\"");
-define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</A>, um zur URL zu kommen.<br />\n<br />\nDanke.");
+define('LOAD_URL_ERROR_1', "Konnte nicht weiterleiten, da bereits Kopfinformationen gesendet wurden! <a href=\"");
+define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</a>, um zur URL zu kommen.<br />\n<br />\nDanke.");
 define('GUEST_STATS', "Statistiken unseres {!MT_WORD2!}");
 define('GUEST_STATS_MONTHLY', "Mitgliederverteilung auf Kalendermonate");
 define('GUEST_STATS_CATS', "Mitgliederverteilung auf Mail-Kategorien");
@@ -815,9 +815,8 @@ define('ADMIN_EXT_FILE_CTIME', "Erweiterung erstellt am");
 define('ADMIN_EXT_FILE_VERSION', "Version (alt)");
 define('ADMIN_EXT_TOTAL_FSIZE', "Downloadgesamtgr&ouml;sse");
 define('ADMIN_EXT_TOTAL_FOUND', "Gesamt gefundene Erweiterungen");
-define('ADMIN_EXT_ALREADY_INSTALLED_1', "Alle <strong><U>");
-define('ADMIN_EXT_ALREADY_INSTALLED_2', "</U></strong> gefundenen Erweiterungen sind bereits installiert!");
-define('ADMIN_EXT_NOTHING_FOUND', "Keine Erweiterungen auf dem Server gefunden!");
+define('ADMIN_EXT_ALREADY_INSTALLED_1', "Alle <strong><u>");
+define('ADMIN_EXT_ALREADY_INSTALLED_2', "</u></strong> gefundenen Erweiterungen sind bereits installiert!");
 define('ADMIN_EXT_VERSION', "Version");
 define('ADMIN_EXTENSION_UPDATED', "Erweiterung aktualisiert!");
 define('ADMIN_UPDATE_EXT_SUBJ', "Erweiterung-Update installiert");
@@ -828,11 +827,11 @@ define('MEMBER_ORDER_PAGE4_INTRO', "Mailbuchung - Schritt 4 von 4: Vielen Dank!"
 define('MEMBER_ORDER_PAGE1_NOTE', "Geben Sie hier die ersten ein bis drei Stellen der Postleitzahl ein, in der gesendet werden soll.<br />
 <br />
 Beispiele:
-<UL>
-	<LI><strong>1</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 1 anf&auml;ngt.</LI>
-	<LI><strong>12</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 12 anf&auml;ngt.</LI>
-	<LI><strong>123</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 123 anf&auml;ngt.</LI>
-</UL>
+<ul>
+	<li><strong>1</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 1 anf&auml;ngt.</li>
+	<li><strong>12</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 12 anf&auml;ngt.</li>
+	<li><strong>123</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 123 anf&auml;ngt.</li>
+</ul>
 <br />
 Oder geben Sie nichts ein, wenn Sie diese Option nicht w&uuml;nschen.");
 define('MEMBER_ENTER_ZIP_CODE', "PLZ eingeben");
@@ -847,7 +846,7 @@ define('SORT_NAVIGATION', "Sortieren");
 define('HIGHER', "H&ouml;her");
 define('LOWER', "Niedriger");
 define('MEMBER_SETTINGS_SAVED', "Einstellungen gespeichert.");
-define('REMOTE_ADDR_TIMEOUT', "Ein Mitglied ist mit Ihrer IP-Nummer <U>{!REMOTE_ADDR!}</U> bereits registriert! Bitte kontaktieren Sie uns, wenn dies ein Fehler sein sollte!");
+define('REMOTE_ADDR_TIMEOUT', "Ein Mitglied ist mit Ihrer IP-Nummer <u>{!REMOTE_ADDR!}</u> bereits registriert! Bitte kontaktieren Sie uns, wenn dies ein Fehler sein sollte!");
 define('IP_TIMEOUT', "IP-Zeitsperre");
 define('ADMIN_PAYOUT_NOT_INSTALLED', "payout-Erweiterung nicht installiert!");
 define('ADMIN_WERNIS_NOT_INSTALLED', "wernis-Erweiterung nicht installiert!");
@@ -869,13 +868,13 @@ define('ADMIN_EDIT_USER_PASSWORD_NOTE', "Geben Sie nur zweimal das Passwort ein,
 define('POINTS_LOCKED', "Noch wartende {!POINTS!}");
 define('ADMIN_TASK_INFOS', "Infos");
 define('NICKNAME', "Nickname");
-define('EXT_NICKNAME_404', "<FONT class=\"note\">nickname-Erweiterung fehlt!</FONT>");
+define('EXT_NICKNAME_404', "<div class=\"note\">nickname-Erweiterung fehlt!</div>");
 define('ADMIN_PROBLEM_NO_MENU', "Konnte keine Men&uuml;eintr&auml;ge finden!");
 define('USER_REF_404', "Dieses Mitglied hat keine Referals gemacht.");
 define('USER_NICKNAME', "Nickname");
 define('ADMIN_EXT_AUTOPURGE_404', "autopurge nicht installiert!");
-define('ADMIN_EXT_BONUS_OUTDATED_1', "Ihre Bonus-Erweiterung ist veraltet! Version <U>");
-define('ADMIN_EXT_BONUS_OUTDATED_2', "</U> oder h&ouml;her wird ben&ouml;tigt!");
+define('ADMIN_EXT_BONUS_OUTDATED_1', "Ihre Bonus-Erweiterung ist veraltet! Version <u>");
+define('ADMIN_EXT_BONUS_OUTDATED_2', "</u> oder h&ouml;her wird ben&ouml;tigt!");
 define('ADMIN_EXT_BONUS_404', "bonus nicht installiert!");
 define('ADMIN_CONFIG_POINTS_DIRECT', "{!POINTS!} immer gutgeschreiben.");
 define('ADMIN_CONFIG_POINTS_MAILS', "Anzahl zu best. Mails ber&uuml;cksichtigen.");
@@ -910,10 +909,10 @@ define('ADMIN_UNKNOWN_FIELD_TYPE_2', "</strong> erkannt!");
 define('ADMIN_ADD_POINTS_TO_USER', "Einem Mitglied {!POINTS!} gutschreiben");
 define('MEMBER_ORDER_DELETED', "Ihre Mailbuchung wurde soeben geloescht");
 define('ADMIN_CALL_NOT_DIRECTLY', "Bitte diesen Men&uuml;punkt nicht direkt aufrufen!");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID <U>");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_2', "</U> !");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID <U>");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_2', "</U> !");
+define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID <u>");
+define('ADMIN_UNCONFIRMED_POOL_MISSING_2', "</u> !");
+define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID <u>");
+define('ADMIN_UNCONFIRMED_STATS_MISSING_2', "</u> !");
 define('ADMIN_UNCONFIRMED_INVALID_LINK', "Ung&uuml;tigen Link aufgerufen oder Mail ist nicht mehr vorhanden!");
 define('ADMIN_UNCONFIRMED_NO_LINK_LEFT', "Diese Mailbuchung wurde komplett best&auml;tigt!");
 define('ADMIN_CONFIG_REFMODE', "Soll die einmalige Referal-Gutschrift dem Werber alleine oder auch seinem Werber (usw.) gutgeschrieben werden?");
@@ -939,8 +938,8 @@ define('ADMIN_INDEX_MANUAL_FORWARD', "Klicken leitet weiter");
 define('ADMIN_INDEX_NO_DELAY', "Sofort weiterleiten");
 define('ADMIN_CONTINUE_TO_CONFIG', "Weiter zu den Einstellungen");
 define('ADMIN_CONFIG_INDEX_COOKIE', "Wie lange soll der Besucher die Eingangsseite nicht mehr sehen?");
-define('BONUS_EXTENSION_UPGRADE_1', "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <U>");
-define('BONUS_EXTENSION_UPGRADE_2', "</U> oder neuer!");
+define('BONUS_EXTENSION_UPGRADE_1', "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <u>");
+define('BONUS_EXTENSION_UPGRADE_2', "</u> oder neuer!");
 define('_ON', "an");
 define('CLICK_STATISTICS', "Mail-Statistik");
 define('ADMIN_SELECT_DEF_REFID', "Standart Referal-ID bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link");
@@ -962,8 +961,8 @@ define('ADMIN_CHANGE_STATUS_THEME', "Themes de-/aktivieren");
 define('ADMIN_THEME_NO_OUTPUT', "Problem: Kein Text zum Ausgeben!");
 define('ADMIN_THEMES_UPDATED', "Themes wurden aktualisiert.");
 define('ADMIN_THEMES_DELETED', "Themes wurden gel&ouml;scht.");
-define('ADMIN_THEME_IMPORTED_1', "Theme <U>");
-define('ADMIN_THEME_IMPORTED_2', "</U> wurde importiert.");
+define('ADMIN_THEME_IMPORTED_1', "Theme <u>");
+define('ADMIN_THEME_IMPORTED_2', "</u> wurde importiert.");
 define('CURR_THEME_IS_1', "Aktuelles Design: <strong>");
 define('CURR_THEME_IS_2', "</strong>");
 define('ADMIN_NO_THEME_INSTALLED_WARNING', "Kein Design installiert!");
@@ -997,8 +996,8 @@ define('MEMBER_ENTER_MORE_RECEIVERS', "Geben Sie mindestens ein Empf&auml;nger e
 define('MEMBER_NO_MORE_RECEIVERS_FOUND', "Es konnten nicht ausreichend genug empfangsbereite Mitglieder gefunden werden.");
 define('ADMIN_USER_PROFILE_TITLE', "Mitgliedsprofil aufrufen");
 define('LIST_UNCONFIRMED_MEMBER_LINKS', "Unbest&auml;tigte Maillinks eines Mitgliedes auflisten");
-define('MEMBER_ENTER_MORE_MIN_RECEIVERS_1', "Geben Sie mehr als <U>");
-define('MEMBER_ENTER_MORE_MIN_RECEIVERS_2', "</U> Empf&auml;nger ein!");
+define('MEMBER_ENTER_MORE_MIN_RECEIVERS_1', "Geben Sie mehr als <u>");
+define('MEMBER_ENTER_MORE_MIN_RECEIVERS_2', "</u> Empf&auml;nger ein!");
 define('NO_TEMPLATE_SUPPLIED', "Keinen Template-Namen uebergeben! Fehler im Script erkannt. Bitte den Webmaster ({!WEBMASTER!}) verstaendigen!");
 define('_OR', "oder");
 define('GUEST_NEW_PASSWORD_SEND', "Neues Passwort ist zu Ihrem Postfach unterwegs!");
@@ -1153,7 +1152,7 @@ define('ADMIN_NO_LOGIN_WITH_EMAIL', "Kein Administrator-Account mit der angegebe
 define('ADMIN_RESET_PASS_LINK_SUBJ', "Zuruecksetzung Ihres Admin-Passwortes");
 define('ADMIN_RESET_LINK_SENT', "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.");
 define('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED', "Validierung Ihrer Logindaten fehlgeschlagen. Haben Sie auch den Link aus der Mail angeklickt und Ihren Loginnamen eingegeben?");
-define('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2', "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Fehler im Script vor. Bitte im <A href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker</A> den Fehler melden.");
+define('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2', "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Fehler im Script vor. Bitte im <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker</a> den Fehler melden.");
 define('ADMIN_SHOW_LOGIN', "Ihr Administratorlogin:");
 define('ADMIN_CHANGE_LOGIN', "Anderes Adminlogin");
 define('ADMIN_PASSWORD_RESET_DONE', "Ihr Administratorkennwort wurde neu gesetzt. Sie k&ouml;nnen sich jetzt mit Ihren neuen Zugangsdaten im Adminbereich einloggen.");
diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php
index 2d1b419292..c7be819f9a 100644
--- a/inc/language/doubler_de.php
+++ b/inc/language/doubler_de.php
@@ -111,8 +111,8 @@ define('DOUBLER_FORM_404_PASSWORD', "Password nicht eingeben!");
 define('DOUBLER_FORM_404_POINTS', "Keine {!POINTS!} zum Verdoppeln eingegeben!");
 define('DOUBLER_FORM_404_NICKNAME', "Unbekannter Nickname eingegeben oder falsches Passwort!");
 define('DOUBLER_FORM_404_MEMBER', "Mitgliedsaccount nicht gefunden oder falsches Passwort!");
-define('DOUBLER_FORM_STATUS_UNCONFIRMED', "Bitte best&auml;tigen Sie erst Ihre EMail-Adresse. Den Best&auml;tigungslink k&ouml;nnen Sie <A href=\"{!URL!}/modules.php?module=index&amp;what=confirm\">hier erneut per EMail anfordern</A> !");
-define('DOUBLER_FORM_STATUS_LOCKED', "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte <A href=\"{!URL!}/modules.php?module=index&amp;what=impressum\">melden Sie sich bei uns</A>, damit wir Ihren Account freischalten k&ouml;nnen!");
+define('DOUBLER_FORM_STATUS_UNCONFIRMED', "Bitte best&auml;tigen Sie erst Ihre EMail-Adresse. Den Best&auml;tigungslink k&ouml;nnen Sie <a href=\"{!URL!}/modules.php?module=index&amp;what=confirm\">hier erneut per EMail anfordern</a> !");
+define('DOUBLER_FORM_STATUS_LOCKED', "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte <a href=\"{!URL!}/modules.php?module=index&amp;what=impressum\">melden Sie sich bei uns</a>, damit wir Ihren Account freischalten k&ouml;nnen!");
 define('DOUBLER_FORM_WRONG_PASS', "Passwort ist falsch!");
 define('DOUBLER_FORM_POINTS_MIN', "Zu wenig {!POINTS!} zum Verdoppeln eingegeben!");
 define('DOUBLER_FORM_POINTS_MAX', "Zu viele {!POINTS!} zum Verdoppeln eingegeben!");
@@ -133,7 +133,7 @@ define('DOUBLER_MEMBER_ALREADY_PAYOUT', "An Sie bereits ausgezahlte Verdoppelung
 define('DOUBLER_MEMBER_NEXT_PAYOUT', "Sie erhalten bald folgende Verdoppelungen ausgezahlt");
 define('DOUBLER_MEMBER_REF_PAYOUT', "Ihr Refferal-Verdienst");
 define('DOUBLER_MEMBER_YOUR_LINK', "Hier ist Ihr Verdoppler-Link");
-define('DOUBLER_MEMBER_LINK_NOTE', "<STRONG>Tipp:</STRONG> Nutzen Sie diesen zum Werben unseres {!MT_WORD2!}, um die <STRONG>{!__REF_VALUE!}%</STRONG> Referal-Verg&uuml;tung zu erhalten!");
+define('DOUBLER_MEMBER_LINK_NOTE', "<strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {!MT_WORD2!}, um die <strong>{!__REF_VALUE!}%</strong> Referal-Verg&uuml;tung zu erhalten!");
 define('DOUBLER_MEMBER_YOUR_REFLINK', "Ihr Referal-Link zum Verdoppeln");
 define('DOUBLER_POINTS_LEFT_1', "Es stehen noch");
 define('DOUBLER_POINTS_LEFT_2', "zum Verdoppeln zur Verf&uuml;gung.");
diff --git a/inc/language/en.ph b/inc/language/en.ph
index 9d5e3a9bad..ff595d7eff 100644
--- a/inc/language/en.ph
+++ b/inc/language/en.ph
@@ -8,7 +8,7 @@ define('LOGIN_UNKNOWN_CODE', "Unknown return code!");
 define('LOGIN_WRONG_PASS', "Wrong password entered.");
 define('LOGIN_WRONG_ID', "Your login ID is no longer valid.");
 define('LOGIN_ID_LOCKED', "Your account has been locked.");
-define('LOGIN_ID_UNCONFIRMED', "Please confirm your email address before proceding here!<BR>Have you lost your personal confirmation link? In left menu you can request it again!");
+define('LOGIN_ID_UNCONFIRMED', "Please confirm your email address before proceding here!<br />Have you lost your personal confirmation link? In left menu you can request it again!");
 define('LOGIN_NO_COOKIES', "Please switch on cookies for this mailer or lower your security settings in IE settings.");
 define('GUEST_REG_POINTS_1', "For your successfull registration we have added");
 define('GUEST_REG_POINTS_2', "{!POINTS!} to your account. As long as there are enough receivers left you can already send emails to other members.");
@@ -19,10 +19,10 @@ define('LIFE_DAYS', "Day(s)");
 define('LIFE_WEEKS', "Week(s)");
 define('LIFE_MONTHS', "Month(s)");
 define('LIFE_YEARS', "Year(s)");
-define('LANG_MEM_ONLY_1', "Only logged in members are allowed to access the module <U>");
-define('LANG_MEM_ONLY_2', "</U>.");
-define('MEMBER_404_ACTION_1', "The requested member action-module <U>");
-define('MEMBER_404_ACTION_2', "</U> was not found on this server.");
+define('LANG_MEM_ONLY_1', "Only logged in members are allowed to access the module <u>");
+define('LANG_MEM_ONLY_2', "</u>.");
+define('MEMBER_404_ACTION_1', "The requested member action-module <u>");
+define('MEMBER_404_ACTION_2', "</u> was not found on this server.");
 define('_GUEST', "Guest");
 define('_UNKNOWN', "Unknown person");
 define('_ADMIN', "Administrator");
@@ -35,7 +35,7 @@ define('GENDER_M', "Male");
 define('GENDER_F', "Female");
 define('GENDER_C', "Company");
 define('SAVE_CHANGES', "Save changes");
-define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
+define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
 define('MEMBER_HAVE_CHANGED_DATA', "Sie haben heute Ihr Mitgliedsprofil ge&auml;ndert.");
 define('YOUR_NEW_DATA', "Hier sind Ihre neuen Profildaten");
@@ -108,8 +108,8 @@ define('HOURS', "Stunden");
 define('MINS', "Minuten");
 define('SECS', "Sekunden");
 define('_AND', "und");
-define('UNKNOWN_CODE_1', "Es ist w&auml;hrend der Ausf&uuml;hrung ein unbekannter Fehler-Code <STRONG>");
-define('UNKNOWN_CODE_2', "</STRONG> enstanden, f&uuml;r den Sie vermutlich nicht verantwortlich sind. Bitte informieren Sie uns &uuml;ber diese Meldung!");
+define('UNKNOWN_CODE_1', "Es ist w&auml;hrend der Ausf&uuml;hrung ein unbekannter Fehler-Code <strong>");
+define('UNKNOWN_CODE_2', "</strong> enstanden, f&uuml;r den Sie vermutlich nicht verantwortlich sind. Bitte informieren Sie uns &uuml;ber diese Meldung!");
 define('MEMBER_TEXT_CONTAINS_URL', "Ihr Werbetext enth&auml;lt eine URL, dies ist in unserem {!MT_WORD!} nicht zul&auml;ssig. Bitte entfernen Sie diese aus Ihrem Text und versuchen Sie es erneut.");
 define('MEMBER_TEXT_OVERLENGTH', "Ihr Text hat die maximale Textl&auml;nge &uuml;berschritten. Bitte fassen Sie ihn etwas k&uuml;rzer.");
 define('MEMBER_SUBJ_CONTAINS_URL', "Ihre eingegebe Betreffzeile enth&auml;lt eine URL,  dies ist in unserem {!MT_WORD!} nicht zul&auml;ssig. Bitte entfernen Sie diese aus Ihrer Betreffzeile und versuchen Sie es erneut.");
@@ -179,8 +179,8 @@ define('ADMIN_SUBJ_SEND_DONE', "Vollstaendig: Aussendung einer Werbebbuchung!");
 define('MEMBER_SENDING_DONE', "Ihre gebuchte Mail wurde soeben vollstaendig von unserem System versendet! Wir wuenschen Ihnen viel Erfolg mit Ihrer Werbebuchung!");
 define('MEMBER_NOTIFY_DONE', "Den weiteren Verlauf dieser Werbebuchung koennen Sie im Mitgliedsbereich unter Statistiken verfolgen!");
 define('MEMBER_SUBJ_SEND_DONE', "Ihre Werbebuchung wurde versandt");
-define('GUEST_SELECT_LEAST_CATS_1', "Bitte w&auml;hlen Sie mindestens <STRONG><BIG>");
-define('GUEST_SELECT_LEAST_CATS_2', "</BIG></STRONG> Kategorien aus. Anderfalls erfolgt keine Anmeldung!");
+define('GUEST_SELECT_LEAST_CATS_1', "Bitte w&auml;hlen Sie mindestens <strong><BIG>");
+define('GUEST_SELECT_LEAST_CATS_2', "</BIG></strong> Kategorien aus. Anderfalls erfolgt keine Anmeldung!");
 define('MEMBER_POOL_CONTENT', "Ihre Mails im Sende-Pool");
 define('EMAIL_END_SEND', "Vollst&auml;ndig versendet");
 define('EMAIL_CONFIRMED', "Best&auml;tigt");
@@ -196,16 +196,16 @@ define('ADMIN_UNCONFIRMED_ACCOUNTS', "Hier alle Accounts, deren Email-Adresse ni
 define('_UID', "User-ID");
 define('REMOTE_IP', "IP-Nummer");
 define('REF_UID', "Werber-ID");
-define('UNKNOWN_STATUS_1', "Unbekannter Status <STRONG>");
-define('UNKNOWN_STATUS_2', "</STRONG> erkannt!");
+define('UNKNOWN_STATUS_1', "Unbekannter Status <strong>");
+define('UNKNOWN_STATUS_2', "</strong> erkannt!");
 define('ACCOUNT_STATUS', "Account-Status");
-define('ACCOUNT_UNCONFIRMED', "<SPAN class=\"admin_failed\">Unbest&auml;tigt</SPAN>");
-define('ACCOUNT_CONFIRMED', "<SPAN class=\"admin_green\">Best&auml;tigt</SPAN>");
+define('ACCOUNT_UNCONFIRMED', "<span class=\"admin_failed\">Unbest&auml;tigt</span>");
+define('ACCOUNT_CONFIRMED', "<span class=\"admin_green\">Best&auml;tigt</span>");
 define('ACCOUNT_LOCKED', "Gesperrt");
 define('ADMIN_ALL_ACCOUNTS', "Alle Mitglieder-Accounts auflisten");
 define('ADMIN_NO_NONE_REGISTERED', "Ihre Suchkriterieren ergaben keine Treffer in der Mitgliederliste.");
-define('ADMIN_MEMBER_404_1', "Mitglieds-Account <STRONG>");
-define('ADMIN_MEMBER_404_2', "</STRONG> existiert nicht!");
+define('ADMIN_MEMBER_404_1', "Mitglieds-Account <strong>");
+define('ADMIN_MEMBER_404_2', "</strong> existiert nicht!");
 define('ADMIN_LAST_ONLINE', "Zuletzt aktiv");
 define('ADMIN_LAST_MODULE', "Letzte Aktion");
 define('RECEIVE_MAILS', "Kann Mails empfangen");
@@ -225,7 +225,7 @@ define('ADMIN_EDIT_USER', "&Auml;ndern");
 define('ADMIN_ALL_REFS', "Alle Refs auflisten");
 define('BIRTHDAY2', "Geburtstag");
 define('TOTAL_CATS', "Ausgew&auml;hlte Kategorien");
-define('ADMIN_GOTO_USERLIST', "Dieser Men&uuml;punkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen <I><U>User auflisten</U></I> auf.");
+define('ADMIN_GOTO_USERLIST', "Dieser Men&uuml;punkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen <em><u>User auflisten</u></em> auf.");
 define('ADMIN_USER_UPDATED', "Das Mitgliedsaccount wurde aktualisiert!");
 define('ADMIN_LOCKED_YOUR_ACCOUNT', "Ihr Account wurde von einem unserer Administratoren gesperrt! Bitte halten Sie sich an unsere AGBs.");
 define('REASON_LOCKED', "Grund der Sperrung war");
@@ -328,24 +328,24 @@ define('PATCH_FSIZE', "Downloadgr&ouml;sse");
 define('KBYTES', "KBytes");
 define('DEFAULT_SUBJECT_LINE', "Klick-Mail von {!MAIN_TITLE!}");
 define('MEBER_UPDATE_PWD_WRONG', "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen!");
-define('ADMIN_MEM_NO_CATS_1', "Das Mitglied <U>");
-define('ADMIN_MEM_NO_CATS_2', "</U> hat keine Kategorien ausgew&auml;hlt!");
+define('ADMIN_MEM_NO_CATS_1', "Das Mitglied <u>");
+define('ADMIN_MEM_NO_CATS_2', "</u> hat keine Kategorien ausgew&auml;hlt!");
 define('USER_ID', "Mitglied");
 define('UNCONFIRMED_LINKS', "Unbest&auml;tigte Mails");
-define('ADMIN_MEMBER_LINKS_1', "Das Mitglied <U>");
-define('ADMIN_MEMBER_LINKS_2', "</U> hat alle seine Mails best&auml;tigt.");
-define('MEMBER_TOTAL_LINKS_1', "Es m&uuml;ssen noch <STRONG>");
-define('MEMBER_TOTAL_LINKS_2', "</STRONG> Mails von diesem Mitglied best&auml;tigt werden!");
+define('ADMIN_MEMBER_LINKS_1', "Das Mitglied <u>");
+define('ADMIN_MEMBER_LINKS_2', "</u> hat alle seine Mails best&auml;tigt.");
+define('MEMBER_TOTAL_LINKS_1', "Es m&uuml;ssen noch <strong>");
+define('MEMBER_TOTAL_LINKS_2', "</strong> Mails von diesem Mitglied best&auml;tigt werden!");
 define('ADMIN_DEL_UNCONFIRMED_LINKS', "Alle unbest&auml;tigten Mails l&ouml;schen");
 define('ADMIN_LINKS_DELETED', "Links f&uuml;r unbest&auml;tigte Mails wurden gel&ouml;scht!");
 define('ADMIN_DEL_LINK_SUBJ', "Ihr unbestaetigen Mails wurden geloescht!");
-define('MEMBER_LINKS_LEFT_1', "Sie haben <STRONG>");
-define('MEMBER_LINKS_LEFT_2', "</STRONG> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <STRONG>");
-define('MEMBER_LINKS_LEFT_3', "</STRONG> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.");
+define('MEMBER_LINKS_LEFT_1', "Sie haben <strong>");
+define('MEMBER_LINKS_LEFT_2', "</strong> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <strong>");
+define('MEMBER_LINKS_LEFT_3', "</strong> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.");
 define('TODAY', "Heute");
-define('MEMBER_PROFILE_LOCKED_1', "Sie k&ouml;nnen Ihren Account erst am <STRONG>");
-define('MEMBER_PROFILE_LOCKED_2', "</STRONG> wieder &auml;ndern!");
-define('MEMBER_HAS_ZERO_MMAILS', "Sie haben Ihren Empfang auf <STRONG>Urlaub</STRONG> stehen! Bitte stellen Sie unter &quot;Profildaten &auml;ndern&quot; den Empfang h&ouml;her ein!");
+define('MEMBER_PROFILE_LOCKED_1', "Sie k&ouml;nnen Ihren Account erst am <strong>");
+define('MEMBER_PROFILE_LOCKED_2', "</strong> wieder &auml;ndern!");
+define('MEMBER_HAS_ZERO_MMAILS', "Sie haben Ihren Empfang auf <strong>Urlaub</strong> stehen! Bitte stellen Sie unter &quot;Profildaten &auml;ndern&quot; den Empfang h&ouml;her ein!");
 define('REF_CLIX', "Clicks");
 define('REF_VIEWS', "Views");
 define('REFBANNER_TOTALS', "Gesamt");
@@ -367,10 +367,10 @@ define('ADMIN_DELETE_BONUS_MAIL', "Obrige Bonus-Mail l&ouml;schen");
 define('ADMIN_DELETE_NORMAL_MAIL', "Obrige Normal-Mail l&ouml;schen");
 define('ADMIN_REALLY_DELETE_ALL_MAILS', "Wollen Sie wirklich alle Mails l&ouml;schen?");
 define('SURNAME_FAMILY', "Vor- und Nachname");
-define('ADMIN_TOTAL_REFS_1', "Das Mitglied <STRONG>");
-define('ADMIN_TOTAL_REFS_2', "</STRONG> hat bereits <STRONG>");
-define('ADMIN_TOTAL_REFS_3', "</STRONG> weitere(s) Mitglied(er) geworben, davon sind <STRONG>");
-define('ADMIN_TOTAL_REFS_4', "</STRONG> gesperrt oder nicht best&auml;tigt!");
+define('ADMIN_TOTAL_REFS_1', "Das Mitglied <strong>");
+define('ADMIN_TOTAL_REFS_2', "</strong> hat bereits <strong>");
+define('ADMIN_TOTAL_REFS_3', "</strong> weitere(s) Mitglied(er) geworben, davon sind <strong>");
+define('ADMIN_TOTAL_REFS_4', "</strong> gesperrt oder nicht best&auml;tigt!");
 define('REFS_COUNT', "Refs");
 define('MEMBER_JOINED', "Beigetreten");
 define('ADMIN_EMAIL_DELETED', "E-Mail wurde aus dem System gel&ouml;scht.");
@@ -379,27 +379,27 @@ define('PROFILE_LAST_CHANGE', "Letzte &Auml;nderung");
 define('PROFILE_OUTDATED', "Haben Sie Neuigkeiten fuer uns?");
 define('PROFILE_NEVER_CHANGED', "Sie haben noch nie eine Aenderung durchgefuehrt!");
 define('PROFILE_UPDATED', "Profildaten wurden ge&auml;ndert!");
-define('NEW_PATCHES_AVAILABLE_1', "Neue Entwickler-Patches f&uuml;r Version <STRONG>");
-define('NEW_PATCHES_AVAILABLE_2', "</STRONG> verf&uuml;gbar!");
+define('NEW_PATCHES_AVAILABLE_1', "Neue Entwickler-Patches f&uuml;r Version <strong>");
+define('NEW_PATCHES_AVAILABLE_2', "</strong> verf&uuml;gbar!");
 define('SORT_BY', "Sortieren");
 define('_OTHERS', "Andere");
 define('_ALL2', "Alle");
 define('WE_HAVE', "Wir haben");
 define('MEMBER_TEST_URL', "Zur beworbenen Seite");
-define('ADMIN_USAGE_DIR_404_1', "Das Verzeichnis mit den Webalizer-Statistiken konnte nicht gefunden werden! (<STRONG>");
-define('ADMIN_USAGE_DIR_404_2', "</STRONG>)");
+define('ADMIN_USAGE_DIR_404_1', "Das Verzeichnis mit den Webalizer-Statistiken konnte nicht gefunden werden! (<strong>");
+define('ADMIN_USAGE_DIR_404_2', "</strong>)");
 define('ADMIN_ENTER_REDIRECT_URL', "URL eingeben, wenn abgelehnt werden soll");
-define('ADMIN_ID_404_1', "ID <STRONG>");
-define('ADMIN_ID_404_2', "</STRONG> nicht gefunden!");
+define('ADMIN_ID_404_1', "ID <strong>");
+define('ADMIN_ID_404_2', "</strong> nicht gefunden!");
 define('ADMIN_ASSIGNED_ADMIN', "Zugewiesener Admin-Login");
 define('ADMIN_MEMBER_UID', "ID des Mitgliedes");
 define('ADMIN_TASK_TYPE', "Aufgabenbereich");
 define('ADMIN_TASK_CREATED', "Task erstellt");
 define('ADMIN_NO_ADMIN_ASSIGNED', "Kein Admin-Login zugewiesen!");
 define('ADMIN_TASK_IS_MEMBER_SUPPORT', "Support-Anfrage eines Mitgliedes");
-define('ADMIN_UNKNOWN_TASK_TYPE_1', "Unbekannter Task-Typ <STRONG>");
-define('ADMIN_UNKNOWN_TASK_TYPE_2', "</STRONG> im Task <STRONG>");
-define('ADMIN_UNKNOWN_TASK_TYPE_3', "</STRONG> erkannt!");
+define('ADMIN_UNKNOWN_TASK_TYPE_1', "Unbekannter Task-Typ <strong>");
+define('ADMIN_UNKNOWN_TASK_TYPE_2', "</strong> im Task <strong>");
+define('ADMIN_UNKNOWN_TASK_TYPE_3', "</strong> erkannt!");
 define('ADMIN_TASK_SYSTEM_WELCOME', "Task-Management Ihres {!MT_WORD2!}");
 define('ADMIN_UNSELECT_ALL', "Alles abw&auml;hlen");
 define('ADMIN_ASSIGN_TASKS', "Bearbeiten");
@@ -411,8 +411,8 @@ define('LATEST_PATCH_INSTALLED', "Es wurde bereits die Datenbank aktualisiert!")
 define('PATCH_LISTED', "Anbei eine Liste der noetigen Dateien:");
 define('NO_PATCHES_APPLIED', "Keine Patches wurden ausgef&uuml;hrt!");
 define('LOAD_URL_ERROR_1', "Konnte nicht weiterleiten, da bereits Kopfinformationen gesendet wurden! <A href=\"");
-define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</A>, um zur URL zu kommen.<BR>
-<BR>
+define('LOAD_URL_ERROR_2', "\">Bitte klicken Sie hier</A>, um zur URL zu kommen.<br />
+<br />
 Danke.");
 define('GUEST_STATS', "Statistiken unseres {!MT_WORD2!}");
 define('GUEST_STATS_MONTHLY', "Mitgliederverteilung auf Kalendermonate");
@@ -425,8 +425,8 @@ define('GUEST_STATS_TREGISTER', "Heutige Anmeldungen");
 define('GUEST_STATS_YREGISTER', "Gestrige Anmeldungen");
 define('CHANGE_MENUS', "&Auml;ndern");
 define('CHANGE_MEMBER_MENU', "Verdecken, anzeigen, deaktivieren, aktivieren des Mitgliedsmen&uuml;s");
-define('CHANGE_MENU_1', "&Auml;ndern von <STRONG>");
-define('CHANGE_MENU_2', "</STRONG> Men&uuml;eintr&auml;gen");
+define('CHANGE_MENU_1', "&Auml;ndern von <strong>");
+define('CHANGE_MENU_2', "</strong> Men&uuml;eintr&auml;gen");
 define('IS_VISIBLE', "Wird angezeigt");
 define('IS_ACTIVE', "Aktiviert");
 define('CHANGE_ENTRIES', "&Auml;nderungen durchf&uuml;hren");
@@ -502,9 +502,8 @@ define('ADMIN_EXT_FILE_CTIME', "Erweiterung erstellt am");
 define('ADMIN_EXT_FILE_VERSION', "Version (alt)");
 define('ADMIN_EXT_TOTAL_FSIZE', "Downloadgesamtgr&ouml;sse");
 define('ADMIN_EXT_TOTAL_FOUND', "Gesamt gefundene Erweiterungen");
-define('ADMIN_EXT_ALREADY_INSTALLED_1', "Alle <STRONG><U>");
-define('ADMIN_EXT_ALREADY_INSTALLED_2', "</U></STRONG> gefundenen Erweiterungen sind bereits installiert!");
-define('ADMIN_EXT_NOTHING_FOUND', "Keine Erweiterungen auf dem Server gefunden!");
+define('ADMIN_EXT_ALREADY_INSTALLED_1', "Alle <strong><u>");
+define('ADMIN_EXT_ALREADY_INSTALLED_2', "</u></strong> gefundenen Erweiterungen sind bereits installiert!");
 define('ADMIN_EXT_VERSION', "Version");
 define('ADMIN_TASK_IS_EXTENSION_UPDATE', "Erweiterung-Update");
 define('ADMIN_EXTENSION_UPDATED', "Erweiterung aktualisiert!");
@@ -513,15 +512,15 @@ define('MEMBER_ORDER_PAGE1_INTRO', "Mailbuchung - Schritt 1 von 4: PLZ eingeben"
 define('MEMBER_ORDER_PAGE2_INTRO', "Mailbuchung - Schritt 2 von 4: Daten eingeben");
 define('MEMBER_ORDER_PAGE3_INTRO', "Mailbuchung - Schritt 3 von 4: Frame-Killer Test und Absenden");
 define('MEMBER_ORDER_PAGE4_INTRO', "Mailbuchung - Schritt 4 von 4: Vielen Dank!");
-define('MEMBER_ORDER_PAGE1_NOTE', "Geben Sie hier die ersten ein bis drei Stellen der Postleitzahl ein, in der gesendet werden soll.<BR>
-<BR>
+define('MEMBER_ORDER_PAGE1_NOTE', "Geben Sie hier die ersten ein bis drei Stellen der Postleitzahl ein, in der gesendet werden soll.<br />
+<br />
 Beispiele:
-<UL>
-  <LI><STRONG>1</STRONG> : Sendet nur an Mitglieder, deren Postleitzahl mit 1 anf&auml;ngt.</LI>
-  <LI><STRONG>12</STRONG> : Sendet nur an Mitglieder, deren Postleitzahl mit 12 anf&auml;ngt.</LI>
-  <LI><STRONG>123</STRONG> : Sendet nur an Mitglieder, deren Postleitzahl mit 123 anf&auml;ngt.</LI>
-</UL>
-<BR>
+<ul>
+  <li><strong>1</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 1 anf&auml;ngt.</li>
+  <li><strong>12</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 12 anf&auml;ngt.</li>
+  <li><strong>123</strong> : Sendet nur an Mitglieder, deren Postleitzahl mit 123 anf&auml;ngt.</li>
+</ul>
+<br />
 Oder geben Sie nichts ein, wenn Sie diese Option nicht w&uuml;nschen.");
 define('MEMBER_ENTER_ZIP_CODE', "PLZ eingeben");
 define('ORDER_PAGE_2', "Weiter zur Seite 2");
@@ -535,7 +534,7 @@ define('SORT_NAVIGATION', "Sortieren");
 define('HIGHER', "H&ouml;her");
 define('LOWER', "Niedriger");
 define('MEMBER_SETTINGS_SAVED', "Einstellungen gespeichert.");
-define('REMOTE_ADDR_TIMEOUT', "Ein Mitglied ist mit Ihrer IP-Nummer <U>{!REMOTE_ADDR!}</U> bereits registriert! Bitte kontaktieren Sie uns, wenn dies ein Fehler sein sollte!");
+define('REMOTE_ADDR_TIMEOUT', "Ein Mitglied ist mit Ihrer IP-Nummer <u>{!REMOTE_ADDR!}</u> bereits registriert! Bitte kontaktieren Sie uns, wenn dies ein Fehler sein sollte!");
 define('IP_TIMEOUT', "IP-Zeitsperre");
 define('ADMIN_PAYOUT_NOT_INSTALLED', "payout-Erweiterung nicht installiert!");
 define('ADMIN_ADD_MAX_VALUE', "Neuen Maximal-Wert hinzuf&uuml;gen");
@@ -556,13 +555,13 @@ define('ADMIN_EDIT_USER_PASSWORD_NOTE', "Geben Sie nur zweimal das Passwort ein,
 define('POINTS_LOCKED', "Noch wartende {!POINTS!}");
 define('ADMIN_TASK_INFOS', "Infos");
 define('NICKNAME', "Nickname");
-define('EXT_NICKNAME_404', "<FONT class=\"note\">nickname-Erweiterung fehlt!</FONT>");
+define('EXT_NICKNAME_404', "<div class=\"note\">nickname-Erweiterung fehlt!</div>");
 define('ADMIN_PROBLEM_NO_MENU', "Konnte keine Men&uuml;eintr&auml;ge finden!");
 define('USER_REF_404', "Dieses Mitglied hat keine Referals gemacht.");
 define('USER_NICKNAME', "Nickname");
 define('ADMIN_EXT_AUTOPURGE_404', "autopurge nicht installiert!");
-define('ADMIN_EXT_BONUS_OUTDATED_1', "Ihre Bonus-Erweiterung ist veraltet! Version <U>");
-define('ADMIN_EXT_BONUS_OUTDATED_2', "</U> oder h&ouml;her wird ben&ouml;tigt!");
+define('ADMIN_EXT_BONUS_OUTDATED_1', "Ihre Bonus-Erweiterung ist veraltet! Version <u>");
+define('ADMIN_EXT_BONUS_OUTDATED_2', "</u> oder h&ouml;her wird ben&ouml;tigt!");
 define('ADMIN_EXT_BONUS_404', "bonus nicht installiert!");
 define('ADMIN_CONFIG_POINTS_DIRECT', "Direkt auszahlen");
 define('ADMIN_CONFIG_POINTS_MAILS', "Nach best. Mails");
@@ -582,8 +581,8 @@ define('ADMIN_EDIT', "&Auml;ndern");
 define('ADMIN_EDIT_EXTENSIONS', "&Auml;ndern von Erweiterungen");
 define('ADMIN_EXT_CHANGED', "Erweiterungen ge&auml;ndert.");
 define('POOL_DELETED', "Bereinigt");
-define('ONLINE_TIMEOUT_IS_1', "Die Liste zeigt die Besucher der letzten <STRONG>");
-define('ONLINE_TIMEOUT_IS_2', "</STRONG> an.");
+define('ONLINE_TIMEOUT_IS_1', "Die Liste zeigt die Besucher der letzten <strong>");
+define('ONLINE_TIMEOUT_IS_2', "</strong> an.");
 define('ADMIN_CONFIG_EXTENSIONS_SETTINGS', "Erweiterungs-Management konfigurieren");
 define('ADMIN_VERBOSE_SQL', "SQL-Anweisungen beim Registrieren/Updates/Entfernen ausgeben");
 define('ADMIN_REMOVING_THESE_EXTENSIONS', "Diese Erweiterungen werden deinstalliert");
@@ -592,32 +591,32 @@ define('ADMIN_SQLS_EXECUTED_ON_REMOVAL', "Beim Entfernen ausgef&uuml;hrte SQL-An
 define('ADMIN_NO_ADDITIONAL_SQLS', "Keine weiteren SQL-Anweisungen zum Ausf&uuml;hren!");
 define('ADMIN_SQLS_EXECUTED_ON_UPDATE', "Beim Aktualisieren ausgef&uuml;hrte SQL-Anweisungen");
 define('ADMIN_SQLS_EXECUTED_ON_REGISTER', "Beim Registrieren ausgef&uuml;hrte SQL-Anweisungen");
-define('ADMIN_UNKNOWN_FIELD_TYPE_1', "Unbekannter Datentyp <STRONG>");
-define('ADMIN_UNKNOWN_FIELD_TYPE_2', "</STRONG> erkannt!");
+define('ADMIN_UNKNOWN_FIELD_TYPE_1', "Unbekannter Datentyp <strong>");
+define('ADMIN_UNKNOWN_FIELD_TYPE_2', "</strong> erkannt!");
 define('ADMIN_ADD_POINTS_TO_USER', "Einem Mitglied {!POINTS!} gutschreiben");
 define('MEMBER_ORDER_DELETED', "Ihre Mailbuchung wurde soeben geloescht");
 define('ADMIN_LIST_UNCONFIRMED_NOT_DIRECTLY', "Bitte diesen Men&uuml;punkt nicht direkt aufrufen!");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID <U>");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_2', "</U> !");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID <U>");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_2', "</U> !");
+define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID <u>");
+define('ADMIN_UNCONFIRMED_POOL_MISSING_2', "</u> !");
+define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID <u>");
+define('ADMIN_UNCONFIRMED_STATS_MISSING_2', "</u> !");
 define('ADMIN_UNCONFIRMED_INVALID_LINK', "Ung&uuml;tigen Link aufgerufen oder Mail ist nicht mehr vorhanden!");
 define('ADMIN_UNCONFIRMED_NO_LINK_LEFT', "Diese Mailbuchung wurde komplett best&auml;tigt!");
 define('ADMIN_CONFIG_REFMODE', "Verg&uuml;tungsmodus f&uuml;r einmalige Referal-Gutschrift");
 define('ADMIN_CONFIG_REFMODE_REF', "&Uuml;ber das Ref-System");
 define('ADMIN_CONFIG_REFMODE_DIRECT', "Nur User selber aufbuchen");
-define('ADMIN_HEADER_LOCK_ACCOUNT_1', "Mitgliedsaccount <U>");
-define('ADMIN_HEADER_LOCK_ACCOUNT_2', "</U> sperren");
-define('ADMIN_HEADER_UNLOCK_ACCOUNT_1', "Mitgliedsaccount <U>");
-define('ADMIN_HEADER_UNLOCK_ACCOUNT_2', "</U> freigeben");
-define('ADMIN_HEADER_DEL_ACCOUNT_1', "Mitgliedsaccount <U>");
-define('ADMIN_HEADER_DEL_ACCOUNT_2', "</U> l&ouml;schen");
-define('ADMIN_TEXT_DEL_ACCOUNT_1', "M&ouml;chten Sie den User <STRONG>");
-define('ADMIN_TEXT_DEL_ACCOUNT_2', "</STRONG> nun <STRONG>unwiederruflich</STRONG> l&ouml;schen? Bitte geben Sie einen Grund der L&ouml;schung mit an!");
-define('ADMIN_TEXT_LOCK_ACCOUNT_1', "M&ouml;chten Sie den User <STRONG>");
-define('ADMIN_TEXT_LOCK_ACCOUNT_2', "</STRONG> nun sperren? Bitte geben Sie einen Grund der Sperrung mit an!");
-define('ADMIN_TEXT_UNLOCK_ACCOUNT_1', "M&ouml;chten Sie den User <STRONG>");
-define('ADMIN_TEXT_UNLOCK_ACCOUNT_2', "</STRONG> nun freischalten? Sie k&ouml;nnen auch optional einen Text mit angeben.");
+define('ADMIN_HEADER_LOCK_ACCOUNT_1', "Mitgliedsaccount <u>");
+define('ADMIN_HEADER_LOCK_ACCOUNT_2', "</u> sperren");
+define('ADMIN_HEADER_UNLOCK_ACCOUNT_1', "Mitgliedsaccount <u>");
+define('ADMIN_HEADER_UNLOCK_ACCOUNT_2', "</u> freigeben");
+define('ADMIN_HEADER_DEL_ACCOUNT_1', "Mitgliedsaccount <u>");
+define('ADMIN_HEADER_DEL_ACCOUNT_2', "</u> l&ouml;schen");
+define('ADMIN_TEXT_DEL_ACCOUNT_1', "M&ouml;chten Sie den User <strong>");
+define('ADMIN_TEXT_DEL_ACCOUNT_2', "</strong> nun <strong>unwiederruflich</strong> l&ouml;schen? Bitte geben Sie einen Grund der L&ouml;schung mit an!");
+define('ADMIN_TEXT_LOCK_ACCOUNT_1', "M&ouml;chten Sie den User <strong>");
+define('ADMIN_TEXT_LOCK_ACCOUNT_2', "</strong> nun sperren? Bitte geben Sie einen Grund der Sperrung mit an!");
+define('ADMIN_TEXT_UNLOCK_ACCOUNT_1', "M&ouml;chten Sie den User <strong>");
+define('ADMIN_TEXT_UNLOCK_ACCOUNT_2', "</strong> nun freischalten? Sie k&ouml;nnen auch optional einen Text mit angeben.");
 define('ADMIN_EDIT_HOME_TARGET', "Home-Seite festlegen");
 define('ADMIN_EDIT_HOME_SETTINGS', "Einstellungen an Eingangsseite");
 define('ADMIN_CONFIG_HOME_TITLE', "Einstellungen an der Home-Seite");
@@ -626,8 +625,8 @@ define('ADMIN_INDEX_MANUAL_FORWARD', "Klicken leitet weiter");
 define('ADMIN_INDEX_NO_DELAY', "Sofort weiterleiten");
 define('ADMIN_CONTINUE_TO_CONFIG', "Weiter zu den Einstellungen");
 define('ADMIN_CONFIG_INDEX_COOKIE', "Wie lange soll der Besucher die Eingangsseite nicht mehr sehen?");
-define('BONUS_EXTENSION_UPGRADE_1', "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <U>");
-define('BONUS_EXTENSION_UPGRADE_2', "</U> oder neuer!");
+define('BONUS_EXTENSION_UPGRADE_1', "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <u>");
+define('BONUS_EXTENSION_UPGRADE_2', "</u> oder neuer!");
 define('_ON', "an");
 define('CLICK_STATISTICS', "Mail-Statistik");
 define('ADMIN_SELECT_DEF_REFID', "Standart Referal-ID bei Anmeldung &uuml;ber keinen Ref-Link");
@@ -649,10 +648,10 @@ define('ADMIN_CHANGE_STATUS_THEME', "Themes de-/aktivieren");
 define('ADMIN_THEME_NO_OUTPUT', "Problem: Kein Text zum Ausgeben!");
 define('ADMIN_THEMES_UPDATED', "Themes wurden aktualisiert.");
 define('ADMIN_THEMES_DELETED', "Themes wurden gel&ouml;scht.");
-define('ADMIN_THEME_IMPORTED_1', "Theme <U>");
-define('ADMIN_THEME_IMPORTED_2', "</U> wurde importiert.");
-define('CURR_THEME_IS_1', "Aktuelles Design: <STRONG>");
-define('CURR_THEME_IS_2', "</STRONG>");
+define('ADMIN_THEME_IMPORTED_1', "Theme <u>");
+define('ADMIN_THEME_IMPORTED_2', "</u> wurde importiert.");
+define('CURR_THEME_IS_1', "Aktuelles Design: <strong>");
+define('CURR_THEME_IS_2', "</strong>");
 define('ADMIN_NO_THEME_INSTALLED_WARNING', "Kein Design installiert!");
 define('CHANGE_THEME', "Design &auml;ndern");
 define('ADMIN_SET_AS_NEW_THEME', "Dieses Theme als Standart-Theme setzen");
@@ -672,8 +671,8 @@ define('CONFIRM_ACCOUNT', "Account best&auml;tigen");
 define('CONFIRMATION_LINK', "Hier best&auml;tigen");
 define('CLICK_NOW', "Klick!");
 define('MAILID_LINK', "Best.-Link");
-define('UNKNOWN_MAILID_CODE_1', "Unbekannter Fehler-Code <STRONG>");
-define('UNKNOWN_MAILID_CODE_2', "</STRONG> erkannt!");
+define('UNKNOWN_MAILID_CODE_1', "Unbekannter Fehler-Code <strong>");
+define('UNKNOWN_MAILID_CODE_2', "</strong> erkannt!");
 define('EXTENSION_PROBLEM_EXT_INACTIVE', "Erweiterung deaktiviert! Fehler: Kann nicht fortfahren!");
 define('CHANGE_GUEST_MENU', "Verdecken, anzeigen, deaktivieren, aktivieren des Gastmen&uuml;s");
 define('IS_LOCKED', "Ist gesperrt");
@@ -684,8 +683,8 @@ define('MEMBER_ENTER_MORE_RECEIVERS', "Geben Sie mindestens ein Empf&auml;nger e
 define('MEMBER_NO_MORE_RECEIVERS_FOUND', "Es konnten nicht ausreichend genug empfangsbereite Mitglieder gefunden werden.");
 define('ADMIN_USER_PROFILE_TITLE', "Mitgliedsprofil aufrufen");
 define('LIST_UNCONFIRMED_MEMBER_LINKS', "Unbest&auml;tigte Maillinks eines Mitgliedes auflisten");
-define('MEMBER_ENTER_MORE_MIN_RECEIVERS_1', "Geben Sie mehr als <U>");
-define('MEMBER_ENTER_MORE_MIN_RECEIVERS_2', "</U> Empf&auml;nger ein!");
+define('MEMBER_ENTER_MORE_MIN_RECEIVERS_1', "Geben Sie mehr als <u>");
+define('MEMBER_ENTER_MORE_MIN_RECEIVERS_2', "</u> Empf&auml;nger ein!");
 define('NO_TEMPLATE_SUPPLIED', "Keinen Template-Namen uebergeben! Fehler im Script erkannt. Bitte den Webmaster ({!WEBMASTER!}) verstaendigen!");
 define('_OR', "oder");
 define('GUEST_NEW_PASSWORD_SEND', "Neues Passwort ist zu Ihrem Postfach unterwegs!");
@@ -708,7 +707,7 @@ define('ADMIN_MEMBER_STATS_LIMIT', "Anzahl Mailbuchungen pro Seite");
 define('MEMBER_NO_THEMES_FOUND', "Keine Design gefunden!");
 define('MEMBER_THEME_LIST_NOTE', "Wenn Sie Fragen zu einem der Designs haben, wenden Sie sich bitte an den jeweiligen Autor!");
 define('MEMBER_SAVE_THEME', "Design speichern");
-define('MEMBER_THEME_LIST_USAGE', "W&auml;hlen Sie unten ein neues Design aus und klicken Sie auf <STRONG>Theme abspeichern</STRONG>, das Design wird dann nur f&uuml;r Sie dauerhaft ge&auml;ndert.");
+define('MEMBER_THEME_LIST_USAGE', "W&auml;hlen Sie unten ein neues Design aus und klicken Sie auf <strong>Theme abspeichern</strong>, das Design wird dann nur f&uuml;r Sie dauerhaft ge&auml;ndert.");
 define('MEMBER_THEME_SAVED', "Design gespeichert.");
 define('TASK_NO_TITLE', "Aufgabe ohne SQL-Anweisungen");
 define('UNCONFIRMED_LOCKED', "Noch zu best. Mails");
@@ -735,7 +734,7 @@ define('ADMIN_SELECT_BANNER_ACTIVE', "Ist der Banner aktiv?");
 define('ADMIN_SUBMIT_BANNER', "Banner hinzuf&uuml;gen");
 define('ADMIN_LIST_REFERRALS_1', "Referals des Mitgliedes ");
 define('ADMIN_LIST_REFERRALS_2', " in erster Ebene");
-define('ADMIN_LIST_REFERRALS_NOTE', "<STRONG>&Auml;nderung:</STRONG> Klicken Sie die User-ID an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.");
+define('ADMIN_LIST_REFERRALS_NOTE', "<strong>&Auml;nderung:</strong> Klicken Sie die User-ID an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.");
 define('ADMIN_NORMAL_MAIL_ALREADY_DELETED', "Mitglieder-Mail bereits gel&ouml;scht!");
 define('INITIAL_RELEASE', "Erste Alpha-Version");
 define('NO_UPDATE_NOTES', "Keine Update-Hinweise gefunden!");
diff --git a/inc/language/en.php b/inc/language/en.php
index 52329ef52c..4aa1c90481 100644
--- a/inc/language/en.php
+++ b/inc/language/en.php
@@ -42,8 +42,8 @@ define('__LANG_ID', "English (US)");
 
 // Language definitions
 define('LANG_DOWN_MAINTAINCE', "System is down for maintenance.");
-define('LANG_MOD_REG_404_1', "Module <U>");
-define('LANG_MOD_REG_404_2', "</U> does not exists.");
+define('LANG_MOD_REG_404_1', "Module <u>");
+define('LANG_MOD_REG_404_2', "</u> does not exists.");
 define('LANG_MOD_NOT_REG', " is not registered.");
 define('LANG_UNKNOWN_MODULE', "Unknown module");
 define('META_YOUR_NAME_1', "Your name here");
@@ -53,7 +53,7 @@ define('META_KEYWORDS', "Enter at least (1) 20 search keywords seperated by comm
 define('LANG_WARNING', "Warning");
 define('DIE_CONFIG_CHANGED_YOU', "You have edited your config.php file! I'm out here...");
 define('DIE_RUN_INSTALL_MYSQL', "Please run http://your-domain.com/install.php to setup your MySQL data.");
-define('WARN_NULL_PASSWORD', "You have a null-password! If you want to switch off this warning please have a look in <STRONG>inc/config.php</STRONG>.");
+define('WARN_NULL_PASSWORD', "You have a null-password! If you want to switch off this warning please have a look in <strong>inc/config.php</strong>.");
 define('FATAL_CONFIG_WRITABLE', "Your file inc/config.php is writeable! This is a possible security risk.");
 define('FATAL_CANNOT_WRITE_CONFIG', "Cannot write config data because I have no write permissions to inc/config.php.");
 define('FATAL_ERROR', "Fatal error");
@@ -90,21 +90,21 @@ define('RETURN_MYSQL_PAGE', "Back to MySQL settings");
 define('INSTALL_FINALIZER_FAILED', "While installtion unexpected errors occur! The finalizer cannt finish installation.");
 define('INSTALL_MAYBE_DONE', "The installation is possibely completed or unexpected errros occur.");
 define('INSTALL_FINISHED', "Installation is completed! :-)");
-define('INSTALL_FIN_SECU', "<STRONG><U>Security notes:</U></STRONG><br />Install a .htaccess file in directory inc and templates including all secondary directories.");
+define('INSTALL_FIN_SECU', "<strong><u>Security notes:</u></strong><br />Install a .htaccess file in directory inc and templates including all secondary directories.");
 define('CONTINUE_ADMIN', "Continue to administrator's area...");
 define('RUNTIME_PROBLEMS_DETECTED', "Runtime-problem detected!");
 define('FATAL_INC_WRITABLE', "Directory inc is writeable! Please set the access rights to CHMOD 755.");
 define('LANG_WRITE_FOOTER', "Display name, version and author of this script?");
 define('LANG_FRAMESET_ACTIVE', "Enable frameset? If not a table-set will be used instead.");
 define('MYSQL_ERRORS', "MySQL errors detected. Please correct first to continue.");
-define('LANG_MOD_UNKNOWN_1', "Unknown return-code <U>");
-define('LANG_MOD_UNKNOWN_2', "</U> detected!");
-define('LANG_MOD_LOCKED_1', "Selected module <U>");
-define('LANG_MOD_LOCKED_2', "</U> is locked!");
-define('ADMIN_UNKNOWN_ACTION_1', "Unknown administrator-action <U>");
-define('ADMIN_UNKNOWN_ACTION_2', "</U> detected. Please call this module correctly!");
-define('ADMIN_ACTION_404_1', "Administrator module for action <U>");
-define('ADMIN_ACTION_404_2', "</U> was not found on server.");
+define('LANG_MOD_UNKNOWN_1', "Unknown return-code <u>");
+define('LANG_MOD_UNKNOWN_2', "</u> detected!");
+define('LANG_MOD_LOCKED_1', "Selected module <u>");
+define('LANG_MOD_LOCKED_2', "</u> is locked!");
+define('ADMIN_UNKNOWN_ACTION_1', "Unknown administrator-action <u>");
+define('ADMIN_UNKNOWN_ACTION_2', "</u> detected. Please call this module correctly!");
+define('ADMIN_ACTION_404_1', "Administrator module for action <u>");
+define('ADMIN_ACTION_404_2', "</u> was not found on server.");
 define('ADMIN_NOT_REGISTERED', "There is no administrator account created so far.");
 define('ADMIN_REGISTER_NOW', "Please create an administrator account now:");
 define('ADMIN_LOGIN', "Enter administrator login");
@@ -139,8 +139,8 @@ define('ADMIN_LOGOUT_DONE', "Logout from admin-account completed.");
 define('ADMIN_LOGOUT_FAILED', "Logout from admin-account failed! :-(");
 define('ADMIN_RELOGIN_LINK', "Click here to re-login again.");
 define('ADMIN_404_ACTION', "Admin-module not found!");
-define('ADMIN_404_ACTION_1', "Called admin-module <U>");
-define('ADMIN_404_ACTION_2', "</U> is well valid but it is not on this server.");
+define('ADMIN_404_ACTION_1', "Called admin-module <u>");
+define('ADMIN_404_ACTION_2', "</u> is well valid but it is not on this server.");
 define('ALREADY_INSTALLED', "This script is already installed on this server. Please delete the whole installation system for your server. Don't worry you can do it...");
 define('ADMIN_MAIN_TITLE', "Welcome to the administration area");
 define('YOU_ARE_HERE', "You are here:");
@@ -152,18 +152,18 @@ define('UNDO_SELECTIONS', "Undo selections");
 define('EDIT_MENUS', "Edit menus");
 define('DEL_MENUS', "Delete menus");
 define('EDIT_ADMIN_MENU', "Edit admin menu entries");
-define('EDIT_MENU_1', "<STRONG>");
-define('EDIT_MENU_2', "</STRONG> menu entr(y/ies) shall be edited:");
+define('EDIT_MENU_1', "<strong>");
+define('EDIT_MENU_2', "</strong> menu entr(y/ies) shall be edited:");
 define('ENTRY_MODIFY', "Entry");
 define('SUBMIT_CHANGES', "Submit changes");
-define('ENTRY_404_1', "Entry <I>");
-define('ENTRY_404_2', "</I> was not found!");
+define('ENTRY_404_1', "Entry <em>");
+define('ENTRY_404_2', "</em> was not found!");
 define('EDIT_UNKNOWN_OKAY', "An unknown action was performed.");
 define('SAVING_DATA', "Saving data");
 define('SAVING_DONE', "finished!");
 define('DEL_ADMIN_MENU', "Admin-Men&uuml;eintr&auml;ge l&ouml;schen");
-define('DEL_MENU_1', "<STRONG>");
-define('DEL_MENU_2', "</STRONG> menu entr(y/ies) shall be deleted:");
+define('DEL_MENU_1', "<strong>");
+define('DEL_MENU_2', "</strong> menu entr(y/ies) shall be deleted:");
 define('DEL_ENTRIES', "Remove entries permanently");
 define('EDIT_ACTION', "Change action value");
 define('EDIT_WHAT', "Change sub action");
@@ -227,7 +227,7 @@ define('PER_DAY', "Mails");
 define('REFID_BY', "You are advertised by");
 define('TERMS_OF_USAGE', "Accept T&amp;C and submit form");
 define('YOU_FINALIZE', "You have nearly filled out this form!");
-define('AGREE_TO_THIS', "Do you accep our [<A href=\"{!URL!}/agb.php\" class=\"register_term\" target=\"_blank\">Terms And Conditions</A>] ?");
+define('AGREE_TO_THIS', "Do you accep our [<a href=\"{!URL!}/agb.php\" class=\"register_term\" target=\"_blank\">Terms And Conditions</a>] ?");
 define('SUBMIT_REGISTER', "Submit registration form");
 define('HAVE_TO_AGREE', "You have to accept our Terms And Conditions you cannot join this mail exchange!");
 define('ENTER_BOTH_PASSWORDS', "Please enter a password by your choice twice.");
@@ -240,10 +240,10 @@ define('EDIT_SECURITY_SETTINGS', "Change security-related settings");
 define('MIN_PASS_LENGTH', "Minimum password length");
 define('SETTINGS_NOT_SAVED', "Settings are NOT saved/changed!");
 define('SETTINGS_SAVED', "Settings saved.");
-define('FATAL_CANNOT_LOAD_CONFIG', "Cannot load base configuration! A possible reason for this message is that the webmaster is setting up this mail exchange. Please come back later again.");
+define('FATAL_CANNOT_LOAD_CONFIG', "Cannot load base configuration! a possible reason for this message is that the webmaster is setting up this mail exchange. Please come back later again.");
 define('ADMIN_INVALID_ACTION', "Invalid combination of action/what detected! Please click on Home to continue.");
-define('ADMIN_INVALID_ACTION_1', "Your combination action/what <U>");
-define('ADMIN_INVALID_ACTION_2', "</U> is invalid!");
+define('ADMIN_INVALID_ACTION_1', "Your combination action/what <u>");
+define('ADMIN_INVALID_ACTION_2', "</u> is invalid!");
 define('SHORT_PASS', "Your entered password is to short to match with our security conditions. Mimum length is");
 define('EDIT_POINTS_SETTINGS', "Edit welcome credit and other {!POINTS!}");
 define('POINTS_REGISTER', "Wecome credit");
@@ -283,7 +283,7 @@ define('THANX', "Thank you very much.\n\nBest regards,");
 define('YOUR', "your");
 define('TEAM', "team");
 define('HELLO_ADMIN', "Hello administrator");
-define('ADMIN_GUEST_REGISTERED_WITH_US', "A guest has registered with our service.");
+define('ADMIN_GUEST_REGISTERED_WITH_US', "a guest has registered with our service.");
 define('ADMIN_GUEST_PERSONA_DATA', "Here you can verify his personal data");
 define('ADMIN_THANX', "Best regards,");
 define('SCRIPT', "Script");
@@ -291,7 +291,7 @@ define('ADMIN_NEW_ACCOUNT', "New registration for your email exchange");
 define('REGISTRATION_DONE', "Registration is done. An email is on its way to you.");
 define('GUEST_404_ACTION', "The action module <u>%s</u> does not exist or this script makes a boo-boo!");
 define('GUEST_LOCKED_ACTION', "Action module is locked.");
-define('FATAL_REPORT_ERRORS', "A fatal error ocurs while runtime. If a module is locked we are working on it othervice please contact us!");
+define('FATAL_REPORT_ERRORS', "a fatal error ocurs while runtime. If a module is locked we are working on it othervice please contact us!");
 define('TEMPLATE_404', "Template not found.");
 define('EDIT_GUEST_MENU', "Edit guest menu");
 define('EDIT_MEMBER_MENU', "Edit member menu");
diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php
index 2233d5d445..3f7b887ddc 100644
--- a/inc/language/holiday_de.php
+++ b/inc/language/holiday_de.php
@@ -56,8 +56,8 @@ define('HOLIDAY_ADMIN_DELETE_NOTE', "Bitte beachten Sie, dass beim vorzeitigen B
 define('HOLIDAY_NO_DIRECT_CALL', "Bite rufen Sie dieses Script &uuml;ber Auflisten auf.");
 define('HOLIDAY_ADMIN_DEL_LINK', "Urlaub beenden");
 define('HOLIDAY_ADMIN_SINGLE_DELETED', "Urlaub eines Mitgliedes beendet!");
-define('HOLIDAY_ADMIN_MULTI_DEL_1', "Urlaub von <U>");
-define('HOLIDAY_ADMIN_MULTI_DEL_2', "</U> Mitglied(-ern) beendet!");
+define('HOLIDAY_ADMIN_MULTI_DEL_1', "Urlaub von <u>");
+define('HOLIDAY_ADMIN_MULTI_DEL_2', "</u> Mitglied(-ern) beendet!");
 define('HOLIDAY_ADMIN_CONFIG_HEADER', "Einstellungen an der Urlaubsschaltung");
 define('HOLIDAY_ADMIN_MAX_HOLIDAY', "Maximale beantragbare Urlaubszeit");
 define('HOLIDAY_IS_ACTIVATED_NOW', "Ihre Urlaubsschaltung wurde jetzt aktiviert. Sie k&ouml;nnen keine Mails mehr buchen!");
@@ -69,8 +69,8 @@ define('HOLIDAY_MEMBER_CANNOT_DEACTIVATE', "Konnte Ihre Urlaubsschaltung nicht a
 define('HOLIDAY_ORDER_NOT_POSSIBLE', "Sie k&ouml;nnen keine Mails versenden, da Ihre Urlaubsschaltung aktiviert ist!");
 define('HOLIDAY_MEMBER_TLOCK', "Urlaubsschaltung eingerichtet");
 define('HOLIDAY_MEMBER_LOCKED', "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.");
-define('HOLIDAY_MEMBER_ORDER_1', "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht ver&auml;ndern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: <U>");
-define('HOLIDAY_MEMBER_ORDER_2', "</U>");
+define('HOLIDAY_MEMBER_ORDER_1', "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht ver&auml;ndern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: <u>");
+define('HOLIDAY_MEMBER_ORDER_2', "</u>");
 define('HOLIDAY_ADMIN_SINGLE_404', "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link!");
 define('HOLIDAY_ADMIN_LOCKED', "Dauer bis Urlaubsschaltung aufgehoben werden kann");
 define('HOLIDAY_ADMIN_MODE', "Zeitpunkt der Abarbeitung der Urlaubsschaltungen");
diff --git a/inc/language/html_mail_de.php b/inc/language/html_mail_de.php
index 239d7d0a7e..3747df3d40 100644
--- a/inc/language/html_mail_de.php
+++ b/inc/language/html_mail_de.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Language definitions
-define('ADMIN_HTML_DOWNLOAD_CLASS', "Bitte laden Sie sich die Klasse <A href=\"".DEREFERER("https://sourceforge.net/projects/phpmailer/")."\" target=\"_blank\">PHPMailer</A> herunter, um diese Funktion nutzen zu k&ouml;nnen!");
+define('ADMIN_HTML_DOWNLOAD_CLASS', "Bitte laden Sie sich die Klasse <a href=\"".DEREFERER("https://sourceforge.net/projects/phpmailer/")."\" target=\"_blank\">PHPMailer</a> herunter, um diese Funktion nutzen zu k&ouml;nnen!");
 define('MEMBER_HTML_INTRO', "HTML-Emfpang - Einstellung");
 define('MEMBER_HTML_TEXT', "In unserem {!MT_WORD!} ist das Empfangen von HTML-Mails nun m&ouml;glich. Gleichzeitig k&ouml;nnen Sie auch selber HTML-Mails versenden. M&ouml;chten Sie dies beides nutzen?");
 define('MEMBER_HTML_ORDER_INTRO', "HTML- oder normale Text-Mails versenden?");
diff --git a/inc/language/install_de.php b/inc/language/install_de.php
index e8bac91c49..916c7b04e8 100644
--- a/inc/language/install_de.php
+++ b/inc/language/install_de.php
@@ -42,7 +42,7 @@ define('MT_WORD', "Mailtausch");
 define('MT_WORD2', "Mailtausches");
 define('INSTALLATION_OF_MXCHANGE', "Installation von MXChange-{!MT_WORD!}-Script");
 define('INSTALL_MISSING_DUMPS', "Die SQL-Dumps wurden nicht gefunden! Diese sollten auch mit hochgeladen werden und lesbar sein (CHMOD 644).");
-define('INSTALL_ENABLE_BACKLINK', "Backlink (=R&uuml;ckverlinkung zu mxchange.org setzen?) <EM>rel=&quot;external&quot;</EM> ist gesetzt. Bitte nicht den Backlink einbauen, und <STRONG>nofollow</STRONG> verwenden! Das schadet allen.");
+define('INSTALL_ENABLE_BACKLINK', "Backlink (=R&uuml;ckverlinkung zu mxchange.org setzen?) <EM>rel=&quot;external&quot;</EM> ist gesetzt. Bitte nicht den Backlink einbauen, und <strong>nofollow</strong> verwenden! Das schadet allen.");
 define('WRONG_PAGE', "Sie oder dieses Script haben eine falsche Seite ausgew&auml;hlt!");
 define('WELCOME_TEXT', "Willkommen zum Installationsscript von MXChange-{!MT_WORD!}, dem kostenlosen {!MT_WORD!} Powered by MyAutoInstaller-Community!");
 define('INTRO_TEXT', "Dieses Script wird den {!MT_WORD!} f&uuml;r Sie soweit installieren, die Datenbank einrichten und vorkonfigurieren.<br />Sie werden w&auml;hrend der Installation Schritt-F&uuml;r-Schritt durch die Installation gebracht! Bitte halten Sie die MySQL-Daten, sowie den absoluten Server-Pfad bereit!<br />Nach erfolgreicher Installation sollten Sie als n&auml;chstes das erste Administrator-Login einrichten. Anschliessend k&ouml;nnen Sie sich einloggen und weitere Einstellungen verfeinern.<br />Wir empfehlen dann alle Installationsdateien von Ihrem Server zu l&ouml;schen.");
@@ -53,7 +53,7 @@ define('HEADER_TEXT_PAGE3', "SMTP-Server Einstellungen");
 define('HEADER_TEXT_PAGE4', "Cascading Stylesheet-Datei");
 define('HEADER_TEXT_PAGE5', "Verschiedene Einstellungen");
 define('HEADER_MYSQL_ERRORS', "Fehler beim Verbinden zur MySQL-Datenbank!");
-define('TEXT_PAGE_1', "Geben Sie hier den absoluten Server-Pfad (/ihr/server/pfad/) <STRONG>mit</STRONG> abschliessendem Slash (/), die Basis-URL (vorgegebene stimmt meistens) und den Titel Ihres {!MT_WORD2!} ein.");
+define('TEXT_PAGE_1', "Geben Sie hier den absoluten Server-Pfad (/ihr/server/pfad/) <strong>mit</strong> abschliessendem Slash (/), die Basis-URL (vorgegebene stimmt meistens) und den Titel Ihres {!MT_WORD2!} ein.");
 define('TEXT_PAGE_2', "Geben Sie hier die Daten vom MySQL-Server ein, die Ihnen vom Hoster mitgeteilt wurden. Es wird dann anschliessend versucht, eine Testverbindung aufzubauen.");
 define('TEXT_PAGE_3', "Geben Sie hier die Ihre Zugangsdaten zum SMTP-Server (ausgehender Mailserver) ein, wenn der mail()-Befehl auf Ihrem Server deaktiviert sein sollte. Oder lassen Sie alle Felder leer f&uuml;r Standart-Einstellungen.");
 define('TEXT_PAGE_4', "Geben Sie hier die URL Ihrer hochgeladenen CSS-Datei an. Wenn Sie die bestehende Standart-Datei verwenden m&ouml;chten, so klicken Sie einfach auf Weiter.");
diff --git a/inc/language/mediadata_de.php b/inc/language/mediadata_de.php
index 6a317072bf..861f5f1b9d 100644
--- a/inc/language/mediadata_de.php
+++ b/inc/language/mediadata_de.php
@@ -83,10 +83,10 @@ define('USERS_CONFIRMED', "Best&auml;tigte Accounts");
 define('USERS_UNCONFIRMED', "Auf Freischaltung wartend");
 define('USERS_LOCKED', "Gesperrte Accounts");
 define('USER_MT_START', "Start dieses {!MT_WORD2!}");
-define('USER_MT_PROJECTED_1', "Voraussichtlich: Am <STRONG>");
-define('USER_MT_PROJECTED_2', "</STRONG> werden wir <STRONG>");
-define('USER_MT_PROJECTED_3', "</STRONG> Mitglieder erreicht haben!");
-define('USER_PROJECTION_UNKNOWN', "<I>unbekanntes Datum</I>");
+define('USER_MT_PROJECTED_1', "Voraussichtlich: Am <strong>");
+define('USER_MT_PROJECTED_2', "</strong> werden wir <strong>");
+define('USER_MT_PROJECTED_3', "</strong> Mitglieder erreicht haben!");
+define('USER_PROJECTION_UNKNOWN', "<em>unbekanntes Datum</em>");
 
 //
 ?>
diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php
index d3bd0b5be8..706d52db5a 100644
--- a/inc/language/nickname_de.php
+++ b/inc/language/nickname_de.php
@@ -45,7 +45,7 @@ define('NICKNAME_SUBMIT', "Nickname &auml;ndern");
 define('NICKNAME_ALREADY_IN_USE', "Der von Ihnen eingegebene Nickname wird bereits verwendet!");
 define('NICKNAME_SAVED', "Nickname wurde gespeichert.");
 define('GUEST_ENTER_LOGIN_NICKNAME', "Nickname o. Login-ID");
-define('NICKNAME_ALLOWED_CHARS', "Erlaubte Zeichen: <STRONG>{!__NICKNAME_LANG_CHARS!}</STRONG>");
+define('NICKNAME_ALLOWED_CHARS', "Erlaubte Zeichen: <strong>{!__NICKNAME_LANG_CHARS!}</strong>");
 define('NICKNAME_IS_INVALID', "Ung&uuml;tige Zeichen im Nicknamen gefunden oder ist zu kurz!");
 define('NICKNAME_YOUR_REFLINK', "Ihr Nickname-Reflink");
 define('NO_NICKNAME_SET', "Sie haben noch keinen Nickname eingerichtet! Damit k&ouml;nnen Sie sich alternativ zur User-ID einloggen.");
diff --git a/inc/language/order_de.php b/inc/language/order_de.php
index 23a7d5793d..490e6ef41d 100644
--- a/inc/language/order_de.php
+++ b/inc/language/order_de.php
@@ -44,9 +44,9 @@ define('ORDER_MAX_ORDER_SELECT', "Wie viele Mailbuchungen sollen die Mitglieder
 define('ORDER_MIN_RECEIVER_PER_ORDER', "Minimale Empf&auml;nger pro Mailbuchung");
 define('ORDER_ADMIN_MAX', "So viele wie m&ouml;glich.");
 define('ORDER_ADMIN_ORDER', "So viele wie auf Empfang eingestellt.");
-define('ORDER_ALLOWED_RECEIVE_1', "Sie k&ouml;nnen heute noch <STRONG>");
-define('ORDER_ALLOWED_RECEIVE_2', "</STRONG> von <STRONG>");
-define('ORDER_ALLOWED_RECEIVE_3', "</STRONG> Mailbuchungen aufgeben.");
+define('ORDER_ALLOWED_RECEIVE_1', "Sie k&ouml;nnen heute noch <strong>");
+define('ORDER_ALLOWED_RECEIVE_2', "</strong> von <strong>");
+define('ORDER_ALLOWED_RECEIVE_3', "</strong> Mailbuchungen aufgeben.");
 define('MEMBER_ORDER_MAX_ALLOWED', "Maximale Mailbuchungen");
 define('ORDER_ALLOED_MAX', "Sie k&ouml;nnen solange Mailbuchungen aufgeben, bis alle Mitglieder nicht mehr empfangsbereit sind.");
 define('ORDER_ALLOWED_UNKNOWN', "Fehler in Konfiguration erkannt! Bitte den Administrator benachrichtigen.");
diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php
index 5ecf1601de..67eea41f4e 100644
--- a/inc/language/payout_de.php
+++ b/inc/language/payout_de.php
@@ -61,10 +61,10 @@ define('ADMIN_PAYOUT_MIN_POINTS2', "Min. {!POINTS!}");
 define('ADMIN_PAYOUT_YOUR_ACCOUNT', "Ihre Account-ID");
 define('ADMIN_PAYOUT_YOUR_PASSWORD', "Passwort");
 define('ADMIN_PAYOUT_YOUR_URL', "URL zum ext. Script");
-define('ADMIN_PAYOUT_YOUR_URL_NOTE', "<FONT class=\"admin_note\">
+define('ADMIN_PAYOUT_YOUR_URL_NOTE', "<div class=\"admin_note\">
   Wobei &#36;fuid/&#36;fpass und &#36;f/&#36;fpass die Logindaten sind und &#36;points die zu &uuml;bberweisenden {!POINTS!} sind:<br />
   http://url/engine.php?action=trans&amp;from_uid=&#36;fuid&amp;from_pass=&#36;fpass&amp;to_uid=&#36;tuid&amp;to_pass=&#36;tpass&amp;points=&#36;points<br />
-</FONT>");
+</div>");
 define('ADMIN_PAYOUT_YOUR_RET_DONE', "Return-Code: Erfolgreich");
 define('ADMIN_PAYOUT_YOUR_RET_FAILED', "Return-Code: Fehlgeschlagen");
 define('ADMIN_PAYOUT_OPTIONAL_SETTINGS', "Optionale Einstellungen");
@@ -88,7 +88,7 @@ define('PAYOUT_REQUEST_SENT', "Auszahlungsanfrage wurde versendet . . .");
 define('ADMIN_TASK_IS_PAYOUT_REQUEST', "Auszahlungsanfrage");
 define('ADMIN_PAYOUT_LIST_REQUESTS', "Jetzt alle Auszahlungsanfragen auflisten.");
 define('PAYOUT_ADMIN_LIST_PAYOUTS', "Alle Auszahlungen nach Mitgliedern auflisten");
-define('PAYOUT_DELETE_ALL_REQUESTS', "Alle Anfragen <STRONG>*SOFORT*</STRONG> l&ouml;schen");
+define('PAYOUT_DELETE_ALL_REQUESTS', "Alle Anfragen <strong>*SOFORT*</strong> l&ouml;schen");
 define('PAYOUT_TOTAL_PAYOUT', "Gesamtbetrag");
 define('PAYOUT_TARGET_ACCOUNT2', "Ziel-Account");
 define('PAYOUT_TARGET_BANK2', "Ziel-Bank");
diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php
index c84d450cf4..9ed0e7b64c 100644
--- a/inc/language/primera_de.php
+++ b/inc/language/primera_de.php
@@ -46,7 +46,7 @@ define('PRIMERA_ADMIN_MIN_WITHDRAW', "Minimumguthaben f&uuml;r Einzahlungen.");
 define('PRIMERA_ADMIN_API_NAME', "Primus-Nickname");
 define('PRIMERA_ADMIN_API_MD5', "Primera-Passwort (Wird als MD5-Hash gespeichert)");
 define('PRIMERA_ADMIN_API_REFID', "Primus-Referal-ID (???)");
-define('PRIMERA_ADMIN_CONFIG_NOTE', "<A href=\"http://www.primusportal.de/r/Quix0r\" target=\"_blank\">Hier</A> k&ouml;nnen Sie sich ein Primus-Portal-Account holen. <strong>Geben Sie immer Ihren Usernamen von Primus-Portal ein und &uuml;berpr&uuml;fen Sie diesen mehrmals! Er wird zum &Uuml;berweisen von Primera ben&ouml;tigt.");
+define('PRIMERA_ADMIN_CONFIG_NOTE', "<a href=\"http://www.primusportal.de/r/Quix0r\" target=\"_blank\">Hier</a> k&ouml;nnen Sie sich ein Primus-Portal-Account holen. <strong>Geben Sie immer Ihren Usernamen von Primus-Portal ein und &uuml;berpr&uuml;fen Sie diesen mehrmals! Er wird zum &Uuml;berweisen von Primera ben&ouml;tigt.");
 define('PRIMERA_ADMIN_NO_TRANSFERS', "Derzeit keine Primera transferiert!");
 define('PRIMERA_ADMIN_ACCOUNT', "Account bei Primus-Portal");
 define('PRIMERA_ADMIN_TRANSFERED', "Primera transferiert");
@@ -69,8 +69,8 @@ define('PRIMERA_MEMBER_LIST_PRIMERA', "&Uuml;berweisungsliste von/an Primus-Port
 define('PRIMERA_API_REQUEST_DATA_INVALID', "Interner Fehler: Abfragedaten sind defekt!");
 define('PRIMERA_API_REQUEST_DATA_MISSING', "Interner Fehler: Abfragedaten sind nicht komplett!");
 define('PRIMERA_API_REQUEST_ERROR', "Abfragefehler: <span class=\"data\">%s</span>");
-define('PRIMERA_API_REQUEST_FAILED', "Unbekannter Fehler <span class=\"data\">%s</span> von API erhalten! Bitte im [<A href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker posten</A>], den Fehlercode nennen und wie es dazu gekommen ist.");
-define('PRIMERA_API_REQUEST_FAILED_AUTH', "Authorisierung an API fehlgeschlagen! Bitte Primera-Nickname und Passwort &uuml;berpr&uuml;fen. [<A href=\"http://www.primusportal.de/\" target=\"_blank\" title=\"Direkt zum Primus-Exportaccount\">Hier</A>] direkt zum Primera-Account. Sie ben&ouml;tigen Ihren Usernamen und Passwort!");
+define('PRIMERA_API_REQUEST_FAILED', "Unbekannter Fehler <span class=\"data\">%s</span> von API erhalten! Bitte im [<a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker posten</a>], den Fehlercode nennen und wie es dazu gekommen ist.");
+define('PRIMERA_API_REQUEST_FAILED_AUTH', "Authorisierung an API fehlgeschlagen! Bitte Primera-Nickname und Passwort &uuml;berpr&uuml;fen. [<a href=\"http://www.primusportal.de/\" target=\"_blank\" title=\"Direkt zum Primus-Exportaccount\">Hier</a>] direkt zum Primera-Account. Sie ben&ouml;tigen Ihren Usernamen und Passwort!");
 define('PRIMERA_API_REQUEST_FAILED_USER', "Useraccount nicht gefunden oder Primera-Passwort ist ung&uuml;ltig!");
 define('PRIMERA_API_REQUEST_FAILED_OWN', "&Uuml;berweisung an eigenes Account nicht m&ouml;glich.");
 define('PRIMERA_API_REQUEST_FAILED_AMOUNT', "Konto weist nicht gen&uuml;gend Deckung auf.");
@@ -96,8 +96,8 @@ define('PRIMERA_MEMBER_PAYOUT_POINTS', "Auszahlf&auml;higes Primera-Guthaben");
 define('PRIMERA_MEMBER_PAYOUT_MIN_POINTS', "Mindestens auszuzahlendes Primera-Guthaben");
 define('PRIMERA_MEMBER_PAYOUT_SUBMIT', "Auszahlung durchf&uuml;hren");
 define('PRIMERA_MEMBER_PAYOUT_NOTE', "Ihr Primera-Passwort wird bei {!MAIN_TITLE!} nicht gespeichert. Bitte bei Primera-Betrag nur gerade Betr&auml;ge eingeben! &Uuml;berpr&uuml;fen Sie vor dem Absenden Ihren Primus-Usernamen.");
-define('PRIMERA_MEMBER_NICKNAME', "Username bei Primus-Portal: [<A href=\"http://www.primusportal.de/lost_password.php\" target=\"_blank\">Vergessen?</A>]");
-define('PRIMERA_MEMBER_PASSWORD', "Primera-Passwort (nicht Accountpasswort!): [<A href=\"http://www.primusportal.de/lost_password.php\" target=\"_blank\">Vergessen?</A>]");
+define('PRIMERA_MEMBER_NICKNAME', "Username bei Primus-Portal: [<a href=\"http://www.primusportal.de/lost_password.php\" target=\"_blank\">Vergessen?</a>]");
+define('PRIMERA_MEMBER_PASSWORD', "Primera-Passwort (nicht Accountpasswort!): [<a href=\"http://www.primusportal.de/lost_password.php\" target=\"_blank\">Vergessen?</a>]");
 define('PRIMERA_MEMBER_AMOUNT', "Zu &uuml;berweisenden Betrag eingeben:");
 define('PRIMERA_MEMBER_MODE_INVALID', "Ung&uuml;ltiger Modus <span class=\"data\">%s</span> erkannt! Bitte links im Men&uuml; fortfahren.");
 define('PRIMERA_MEMBER_EMPTY_USERNAME', "Sie haben Ihren Primus-Usernamen nicht eingegeben.");
diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index 0094713e4f..0d38bec46c 100644
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -52,11 +52,11 @@ define('RALLYE_DESCR', "Kurze Beschreibung / Freier HTML-Code der Rallye");
 define('RALLYE_TEMPLATE', "Template (anstelle freien HTML-Codes)");
 define('RALLYE_PROBLEM_CREATE', "Problem beim Erzeugen der Rallye!");
 define('RALLYE_NO_RALLYES_SETUP', "Bitte f&uuml;gen Sie zuerst eine neue Rallye hinzu.");
-define('RALLYE_CONFIG_PRICES_1', "Preise einrichten f&uuml;r Rallye <U>");
-define('RALLYE_CONFIG_PRICES_2', "</U>");
+define('RALLYE_CONFIG_PRICES_1', "Preise einrichten f&uuml;r Rallye <u>");
+define('RALLYE_CONFIG_PRICES_2', "</u>");
 define('RALLYE_PRICE_LEVEL', "Platz eingeben (1, 2, 3, usw.)");
 define('RALLYE_PRICE_POINTS', "Preis in {!POINTS!}");
-define('RALLYE_PRICE_INFOS', "Preisbeschreibung (<FONT class=\"tiny\">Sie k&ouml;nnen auch nur die Beschreibung eingeben!</FONT>)");
+define('RALLYE_PRICE_INFOS', "Preisbeschreibung (<div class=\"tiny\">Sie k&ouml;nnen auch nur die Beschreibung eingeben!</div>)");
 define('RALLYE_PRICE_ALREADY_FOUND', "Sie haben bereits f&uuml;r diesen Platz einen Preis vergeben oder ist identisch mit anderen Preisen!");
 define('RALLYE_PRICE_LEVEL_SAVED', "Preis wurde hinzugef&uuml;gt.");
 define('RALLYE_EDIT_DEL_PRICES', "&Auml;ndern und L&ouml;schen von Rallye-Preisen");
@@ -102,8 +102,8 @@ define('RALLYE_PRICE', ". Platz");
 define('RALLYE_MEMBER_NOTIFY', "REF-RALLYE GESTARTET: ");
 define('RALLYE_ADMIN_NOTIFY', "Neue Ref-Rallye: ");
 define('RALLYE_ADMIN_USERS_404', "Zur ausgew&auml;hlten Rallye sind noch keine Mitglieder hinzugef&uuml;gt worden!");
-define('RALLYE_LIST_USERS_1', "Teilnehmende Mitglieder an der Rallye <U>");
-define('RALLYE_LIST_USERS_2', "</U>");
+define('RALLYE_LIST_USERS_1', "Teilnehmende Mitglieder an der Rallye <u>");
+define('RALLYE_LIST_USERS_2', "</u>");
 define('RALLYE_OLD_REFS', "Refs vor Rallye");
 define('RALLYE_NEW_REFS', "Neue Refs");
 define('RALLYE_STOP_AUTO_ADD_NOW', "Auto-Beitreten neuer Mitglieder deaktivieren");
@@ -130,7 +130,7 @@ define('RALLYE_GET_REFLINK', "Jetzt dran teilnehmen!");
 define('ADMIN_TASK_IS_RALLYE_EXPIRED', "Rallye wurde beendet");
 define('ADMIN_TASK_IS_RALLYE_PURGED', "Rallye wurde gel&ouml;scht");
 define('RALLYE_LIST_USERS', "Alle teilnehmenden Mitglieder auflisten.");
-define('RALLYE_REF_POINTS_NOTE', "Die {!POINTS!} in der Spalte <U>Verdienst durch Refs</U> geben den Verdienst in erster Ebene vor der Rallye an und wird sich bis Ende der Rallye nicht ver&auml;ndern.");
+define('RALLYE_REF_POINTS_NOTE', "Die {!POINTS!} in der Spalte <u>Verdienst durch Refs</u> geben den Verdienst in erster Ebene vor der Rallye an und wird sich bis Ende der Rallye nicht ver&auml;ndern.");
 define('RALLYE_MIN_USERS', "Gesamtzahl der Mitglieder, ab der Rallye automatisch endet.");
 define('RALLYE_MIN_PRICES', "Mindestens zu belegende Pl&auml;tze");
 define('RALLYE_MIN_USERS_MINI', "Mitgliederanzahl erreicht");
diff --git a/inc/language/register_de.php b/inc/language/register_de.php
index 05a19440bf..dab5406727 100644
--- a/inc/language/register_de.php
+++ b/inc/language/register_de.php
@@ -52,7 +52,7 @@ define('REGISTER_ZIP_REQUIRED', "Bitte geben Sie die Postleitzahl ein.");
 define('REGISTER_CITY_REQUIRED', "Bitte geben Sie den Wohnort ein.");
 define('CNTRY', "L&auml;ndercode");
 define('ADMIN_CFG_REGISTER_DEFAULT', "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein");
-define('ADMIN_CFG_REGISTER_DISPLAY_REFID', "Soll die Ref-ID angezeigt werden? <FONT class=\"admin_note\">(Nein = ID wird editierbar!)</FONT>");
+define('ADMIN_CFG_REGISTER_DISPLAY_REFID', "Soll die Ref-ID angezeigt werden? <div class=\"admin_note\">(Nein = ID wird editierbar!)</div>");
 
 //
 ?>
diff --git a/inc/language/repair_de.php b/inc/language/repair_de.php
index da5bdd0edd..9fb7e2d252 100644
--- a/inc/language/repair_de.php
+++ b/inc/language/repair_de.php
@@ -39,8 +39,8 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 define('ADMIN_REPAIR_CATS_NOTHING', "Keine Kategorie-Auswahlenn gefunden! Vermutlich sind keine Mitglieder registriert?");
-define('ADMIN_REPAIR_ENTRIES_FIXED_1', "Es wurden <STRONG>");
-define('ADMIN_REPAIR_ENTRIES_FIXED_2', "</STRONG> Eintr&auml;ge repariert!");
+define('ADMIN_REPAIR_ENTRIES_FIXED_1', "Es wurden <strong>");
+define('ADMIN_REPAIR_ENTRIES_FIXED_2', "</strong> Eintr&auml;ge repariert!");
 define('ADMIN_REPAIR_NOTHING_FIXED', "Es wurden keine Eintr&auml;ge repariert!");
 
 //
diff --git a/inc/language/rewrite_de.php b/inc/language/rewrite_de.php
index a8c590f2f2..903a1860da 100644
--- a/inc/language/rewrite_de.php
+++ b/inc/language/rewrite_de.php
@@ -43,7 +43,7 @@ define('MODULE_TITLE', "Modultitel");
 define('MODULE_SKIPPED', "Modul wird ausgeblendet");
 define('ADMIN_CONFIG_REWRITE_NOTE', "Stellen Sie hier die Module ein, die von der Rewrite-Engine nicht<br />
 auf die suchmaschienenoptimierten URLs umgeschrieben werden sollen.<br />
-Das Modul <U>admin</U> sollten Sie *KEINES FALLS* aus der Liste enfernen!");
+Das Modul <u>admin</u> sollten Sie *KEINES FALLS* aus der Liste enfernen!");
 
 //
 ?>
diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index 5fe6da34a3..7065464bbf 100644
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -63,16 +63,16 @@ define('SPONSOR_WARNING_INTERVAL', "Sendeinterval des Sponsorenberichtes");
 define('SPONSOR_ENTER_POINTS', "Guthaben an {!POINTS!} zum Starten");
 define('ADD_SPONSOR', "Sponsor hinzuf&uuml;gen");
 define('ADMIN_SPONSOR_COMPANY_NOTE', "Wenn Sie eine Privatperson anmelden wollen, lassen Sie bitte die folgenden drei Felder einfach leer!");
-define('SPONSOR_DATA_NOT_SAVED', "Sponsorendaten wurden <U>nicht</U> gespeichert.");
+define('SPONSOR_DATA_NOT_SAVED', "Sponsorendaten wurden <u>nicht</u> gespeichert.");
 define('ADMIN_SPONSOR_REALLY_ADD_SPONSOR', "Sponsor existiert bereits!");
-define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <B>{!__EMAIL!}</B>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
+define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <strong>{!__EMAIL!}</strong>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
 define('ADMIN_SPONSOR_ADDED', "Sponsor wurde hinzugef&uuml;gt.");
 define('ADMIN_SPONSOR_UPDATED', "Sponsordaten wurden aktualisiert.");
 define('ADMIN_SPONSOR_FAILED', "Konnte Daten nichtn speichern!");
 define('ADMIN_SPONSOR_NONE_PENDING', "Kein Sponsorenaccount wartet auf Freischaltung.");
 define('SPONSOR_CREATED', "Angelegt");
 define('SPONSOR_UNLOCK', "Sponsoren freischalten");
-define('ADMIN_SPONSOR_UNLOCK_NOTES', "Wichtig: Schalten Sie nur Sponsoren frei, wenn diese auch bezahlt haben! Das Script wird dann den Status auf <U>Bezahlt</U> setzen.");
+define('ADMIN_SPONSOR_UNLOCK_NOTES', "Wichtig: Schalten Sie nur Sponsoren frei, wenn diese auch bezahlt haben! Das Script wird dann den Status auf <u>Bezahlt</u> setzen.");
 define('ADMIN_SPONSOR_UNLOCK_TITLE', "Sponsorenaccounts freischalten");
 define('ADMIN_SPONSOR_NONE_SELECTED_UNLOCK', "Keinen Sponsor zum Freischalten ausgew&auml;hlt!");
 define('SPONSOR_NO_ADMIN', "Ihrer Bestellung wurde keinem Administrator zugewiesen!");
@@ -82,10 +82,10 @@ define('ACCOUNT_PENDING', "Wartend");
 define('ADMIN_LIST_SPONSOR_ACCOUNTS', "Alle Sponsoren auflisten");
 define('SPONSOR_POINTS_LEFT', "Restguthaben");
 define('ADMIN_LIST_SPONSOR_NOTES', "Klicken Sie auf die ID-Nummer, um weitere Details zu sehen und um weitere Aktionen am Sponsorenaccount durchf&uuml;hren zu k&ouml;nnen! Klicken Sie auf das Restguthaben an {!POINTS!}, um dem jeweiligen Sponsor mehr {!POINTS!} aufzubuchen.");
-define('ADMIN_SPONSOR_404_1', "Sponsorenaccount <U>");
-define('ADMIN_SPONSOR_404_2', "</U> nicht gefunden!");
-define('ADMIN_SPONSOR_REFS_404_1', "Der Sponsor <U>");
-define('ADMIN_SPONSOR_REFS_404_2', "</U> hat keine Referals!");
+define('ADMIN_SPONSOR_404_1', "Sponsorenaccount <u>");
+define('ADMIN_SPONSOR_404_2', "</u> nicht gefunden!");
+define('ADMIN_SPONSOR_REFS_404_1', "Der Sponsor <u>");
+define('ADMIN_SPONSOR_REFS_404_2', "</u> hat keine Referals!");
 define('ADMIN_SPONSOR_DETAILS', "Datenblatt eines Sponsors");
 define('ADMIN_SPONSOR_COMPANY_DATA', "Firmendaten des Sponsors");
 define('ADMIN_SPONSOR_PERSONA_DATA', "Pers&ouml;nliche Daten des Sponsors");
@@ -100,10 +100,10 @@ define('ADMIN_SPONSOR_ACTIONS', "Aktionen am Sponsorenaccount");
 define('SPONSOR_ID', "Sponsor-ID");
 define('SPONSOR_STATUS', "Sponsor-Status");
 define('SPONSOR_REFERRALS', "Sponsoren geworben");
-define('ADMIN_INVALID_MODE_1', "Ung&uuml;tiger Modus <U>");
-define('ADMIN_INVALID_MODE_2', "</U> angegeben!");
-define('ADMIN_TPL_404_1', "Modus-Template <U>");
-define('ADMIN_TPL_404_2', "</U> nicht gefunden!");
+define('ADMIN_INVALID_MODE_1', "Ung&uuml;tiger Modus <u>");
+define('ADMIN_INVALID_MODE_2', "</u> angegeben!");
+define('ADMIN_TPL_404_1', "Modus-Template <u>");
+define('ADMIN_TPL_404_2', "</u> nicht gefunden!");
 define('ADMIN_ADD_POINTS_TO_SPONSOR', "{!POINTS!} gutschreiben");
 define('ADMIN_SUB_POINTS_FROM_SPONSOR', "{!POINTS!} abziehen");
 define('ADMIN_SUM_SPONSOR_POINTS', "Summe {!POINTS!}");
@@ -114,14 +114,14 @@ define('ADMIN_SPONSPOR_NO_POINTS_TO_SUBTRACT', "Keine {!POINTS!} zum Abziehen ei
 define('ADMIN_SPONSOR_POINTS_ADDED', "{!POINTS!} wurden gutgeschrieben.");
 define('ADMIN_SPONSOR_POINTS_SUBTRACTED', "{!POINTS!} wurden abgezogen.");
 define('ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS', "Sie k&ouml;nnen keine auf Freischaltung wartende oder unbest&auml;tigte Accounts sperren/freigeben!");
-define('ADMIN_HEADER_DEL_SPONSOR_1', "Sponsorenaccount <U>");
-define('ADMIN_HEADER_DEL_SPONSOR_2', "</U> l&ouml;schen");
-define('ADMIN_TEXT_DEL_SPONSOR_1', "M&ouml;chten Sie den Sponsoren <B>");
-define('ADMIN_TEXT_DEL_SPONSOR_2', "</B> mit samt aller seiner Bestellungen unwiederruflich l&ouml;schen?");
-define('SPONSOR_DELETED_1', "Sponsorenaccount <U>");
-define('SPONSOR_DELETED_2', "</U> entfernt.");
+define('ADMIN_HEADER_DEL_SPONSOR_1', "Sponsorenaccount <u>");
+define('ADMIN_HEADER_DEL_SPONSOR_2', "</u> l&ouml;schen");
+define('ADMIN_TEXT_DEL_SPONSOR_1', "M&ouml;chten Sie den Sponsoren <strong>");
+define('ADMIN_TEXT_DEL_SPONSOR_2', "</strong> mit samt aller seiner Bestellungen unwiederruflich l&ouml;schen?");
+define('SPONSOR_DELETED_1', "Sponsorenaccount <u>");
+define('SPONSOR_DELETED_2', "</u> entfernt.");
 define('GUEST_SPONSOR_TITLE', "Anmeldung als Sponsor");
-define('GUEST_SPONSOR_TEASER_1', "Melden Sie sich als Sponsor von <STRONG>{!MAIN_TITLE!}</STRONG> an! Hier bekommen Sie f&uuml;r Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!");
+define('GUEST_SPONSOR_TEASER_1', "Melden Sie sich als Sponsor von <strong>{!MAIN_TITLE!}</strong> an! Hier bekommen Sie f&uuml;r Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!");
 define('GUEST_SPONSOR_TEASER_2', "Alles inklusiv: Ausf&uuml;hrliche Statistiken (auch per Mail im gew&uuml;nschten Zeitabstand) und einfache Verwaltung Ihrer {!POINTS!} mit nur wenigen Klicks!");
 define('GUEST_SPONSOR_TEASER_3', "Werden Sie Sponsor und melden Sie sich noch heute an!");
 define('SPONSOR_ENTER_COMPANY_DATA', "Daten zum Unternehmen");
@@ -137,7 +137,7 @@ define('SPONSOR_PAYTYPE', "Buchungspaket(e)");
 define('SPONSOR_PAYTYPE_VALUE', "Bestellwert");
 define('SPONSOR_PAYTYPE_COUNT', "Bestellmenge");
 define('GUEST_SPONSOR_RECEIVE_WARNINGS', "Bei Daten&auml;nderung eine Best&auml;tigung per Mail erhalten?");
-define('SPONSOR_ACCEPT_TERMS', "Ich/wir habe/n die [<B><A href=\"{!URL!}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</A></B>] gelesen und akzeptiert.");
+define('SPONSOR_ACCEPT_TERMS', "Ich/wir habe/n die [<strong><a href=\"{!URL!}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</a></strong>] gelesen und akzeptiert.");
 define('SPONSOR_TERMS_HEADER', "Allgemeine Gesch&auml;ftsbedingungen");
 
 // Add payment types
@@ -151,14 +151,14 @@ define('SPONSOR_PAYTYPE_RATE_HINT', "(z.B. 1 &euro; = x {!POINTS!})");
 define('SPONSOR_PAYTYPE_MIN_COUNT', "Bestellmenge");
 define('SPONSOR_PAYTYPE_CURRENCY', "W&auml;hrung");
 define('SPONSOR_ADD_PAYTYPES_NOTES', "Hinweise zu den Buchungspaketen");
-define('SPONSOR_PAYTYPE_NAME_NOTE', "Geben Sie eine passende Bezeichnung zum Buchungspaket ein (z.B. <B>Spar-Paket</B>)");
+define('SPONSOR_PAYTYPE_NAME_NOTE', "Geben Sie eine passende Bezeichnung zum Buchungspaket ein (z.B. <strong>Spar-Paket</strong>)");
 define('SPONSOR_PAYTYPE_RATE_NOTE', "Wie viele {!POINTS!} soll der Sponsor f&uuml;r z.B. 1 &euro; bekommen?");
-define('SPONSOR_PAYTYPE_MIN_COUNT_NOTE', "Und wie oft soll dieses Buchungspaket <B>mindestens</B> eingekauft werden? (meistens einmal)");
+define('SPONSOR_PAYTYPE_MIN_COUNT_NOTE', "Und wie oft soll dieses Buchungspaket <strong>mindestens</strong> eingekauft werden? (meistens einmal)");
 define('SPONSOR_PAYTYPE_CURRENCY_NOTE', "W&auml;hrung des Geldbetrages, die der Sponsor an Sie &uuml;berweisen soll.");
-define('SPONSOR_ADMIN_PAYTYPE_ALREADY_1', "Buchungspaket <U>");
-define('SPONSOR_ADMIN_PAYTYPE_ALREADY_2', "</U> bereits eingerichtet.");
-define('SPONSOR_ADMIN_PAYTYPE_ADDED_1', "Buchungspaket <U>");
-define('SPONSOR_ADMIN_PAYTYPE_ADDED_2', "</U> hinzugef&uuml;gt.");
+define('SPONSOR_ADMIN_PAYTYPE_ALREADY_1', "Buchungspaket <u>");
+define('SPONSOR_ADMIN_PAYTYPE_ALREADY_2', "</u> bereits eingerichtet.");
+define('SPONSOR_ADMIN_PAYTYPE_ADDED_1', "Buchungspaket <u>");
+define('SPONSOR_ADMIN_PAYTYPE_ADDED_2', "</u> hinzugef&uuml;gt.");
 define('SPONSOR_LIST_PAYMENT_TYPES_TITLE', "Buchungspakete auflisten, bearbeiten und l&ouml;schen");
 define('SPONSOR_PAYTYPE_MIN_COUNT2', "Minium");
 define('ADMIN_SPONSOR_PAYTYPE_EDIT', "Bearbeiten");
@@ -168,8 +168,8 @@ define('SPONSOR_DELETE_PAY_ENTRIES', "Buchungspakete l&ouml;schen");
 define('SPONSOR_PAY_ENTRIES_CHANGED', "Buchungspakete ge&auml;ndert.");
 define('SPONSOR_PAY_ENTRIES_REMOVED', "Buchungspakete gel&ouml;scht.");
 define('SPONSOR_PAYMENT_LIST_IS_EMPTY', "Noch keine Buchungspakete eingerichtet!");
-define('ADMIN_SPONSOR_UNKOWN_STATUS_1', "Unbekannter Status <U>");
-define('ADMIN_SPONSOR_UNKOWN_STATUS_2', "</U> wurde bei der Anmeldung zur&uuml;ckgeliefert!");
+define('ADMIN_SPONSOR_UNKOWN_STATUS_1', "Unbekannter Status <u>");
+define('ADMIN_SPONSOR_UNKOWN_STATUS_2', "</u> wurde bei der Anmeldung zur&uuml;ckgeliefert!");
 define('SPONSOR_REFERRAL', "Sponsoren-Referal");
 define('SPONSOR_REFID_WAS', "Sie wurden vom Sponsor geworben");
 define('SPONSOR_ACCOUNT_IS_PENDING', "EMail-Adresse best&auml;tigt! Sie haben soeben eine EMail mit weiteren Anweisungen erhalten.");
@@ -243,25 +243,25 @@ define('SPONSOR_POSITION_IS_EMPTY', "Sie haben keine Position eingegeben!");
 define('SPONSOR_TAX_IDENT_IS_EMPTY', "Sie haben keine Ust-Ident-Nr. eingegeben!");
 define('SPONSOR_REGISTER_SOMETHING_MISSING', "Die Sponsorenanmeldung konnte wegen der folgenden Punkte nicht durchgef&uuml;hrt werden");
 define('SPONSOR_PASSWORDS_MISMATCH', "Die beiden von Ihnen eingegebenen Passw&ouml;rter stimmen nicht &uuml;berein!");
-define('SPONSOR_TERMS_NOT_ACCEPTED', "Bitte akzeptieren Sie unsere [<B><A href=\"{!URL!}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</A></B>] !");
+define('SPONSOR_TERMS_NOT_ACCEPTED', "Bitte akzeptieren Sie unsere [<strong><a href=\"{!URL!}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</a></strong>] !");
 define('SPONSOR_NO_PAYTYPE_SELECTED', "Bitte w&auml;hlen Sie noch ein Buchungspaket aus!");
 define('SPONSOR_NO_WARNING_INTERVAL_SELECTED', "Bitte w&auml;hlen Sie noch den Zeitabstand zwischen zwei Sponsorenberichten aus!");
 define('SPONSOR_NO_RECEIVE_WARNINGS_SELECTED', "Bitte w&auml;hlen Sie noch aus, ob Sie bei jeder Aktion Best&auml;tigungsmails empfangen wollen oder nicht!");
 define('SPONSOR_EMAIL_IS_ALREADY_REGISTERED', "Die von Ihnen eingegebene Email-Adresse existiert bereits in unserer Datenbank!");
-define('SPONSOR_ALREADY_FOUND_1', "Ein Sponsor ist bereits mit der Email-Adresse <U>");
-define('SPONSOR_ALREADY_FOUND_2', "</U> bei uns angemeldet!");
+define('SPONSOR_ALREADY_FOUND_1', "Ein Sponsor ist bereits mit der Email-Adresse <u>");
+define('SPONSOR_ALREADY_FOUND_2', "</u> bei uns angemeldet!");
 define('SPONSOR_REGISTRATION_FAILED', "Anmeldung ist fehlgeschlagen!");
 define('SPONSOR_REGISTRATION_COMPLETED', "Anmeldung war erfolgreich! Es ist eine Mail zu Ihnen unterwegs, die weitere Anweisungen enth&auml;lt, um die Anmeldung abzuschliessen.");
-define('SPONSOR_UNKOWN_STATUS_1', "Bei der Anmeldung wurde ein unbekannter R&uuml;ckgabewert <U>");
-define('SPONSOR_UNKOWN_STATUS_2', "</U> erkannt. Bitte melden Sie dies dem Betreiber dieses {!MT_WORD2!}!<br />Vielen Dank.");
-define('SPONSOR_EMAIL_404_1', "Bei der Anmeldung ist uns ein Fehler unterlaufen: Ihr Sponsor-Account mit der EMail-Adresse <U>");
-define('SPONSOR_EMAIL_404_2', "</U> wurde nicht gefunden!");
+define('SPONSOR_UNKOWN_STATUS_1', "Bei der Anmeldung wurde ein unbekannter R&uuml;ckgabewert <u>");
+define('SPONSOR_UNKOWN_STATUS_2', "</u> erkannt. Bitte melden Sie dies dem Betreiber dieses {!MT_WORD2!}!<br />Vielen Dank.");
+define('SPONSOR_EMAIL_404_1', "Bei der Anmeldung ist uns ein Fehler unterlaufen: Ihr Sponsor-Account mit der EMail-Adresse <u>");
+define('SPONSOR_EMAIL_404_2', "</u> wurde nicht gefunden!");
 define('SPONSOR_ACCOUNT_404', "Sponsorenaccount nicht gefunden oder Link ist ung&uuml;tig. Oder haben Sie bereits den Best&auml;tigungslink angeklickt?");
-define('SPONSOR_ACCOUNT_PENDING_FAILED', "Bei der Umschaltung Ihres Sponorenaccounts auf <I>Wartend</I> trat ein unerwarteter Fehler auf!");
-define('SPONSOR_ACCOUNT_404_1', "Sponsorenaccount <U>");
-define('SPONSOR_ACCOUNT_404_2', "</U> nicht gefunden!");
-define('SPONSOR_ACCOUNT_FAILED_1', "Sponsorenaccount konnte nicht geladen werden: <U>");
-define('SPONSOR_ACCOUNT_FAILED_2', "</U>");
+define('SPONSOR_ACCOUNT_PENDING_FAILED', "Bei der Umschaltung Ihres Sponorenaccounts auf <em>Wartend</em> trat ein unerwarteter Fehler auf!");
+define('SPONSOR_ACCOUNT_404_1', "Sponsorenaccount <u>");
+define('SPONSOR_ACCOUNT_404_2', "</u> nicht gefunden!");
+define('SPONSOR_ACCOUNT_FAILED_1', "Sponsorenaccount konnte nicht geladen werden: <u>");
+define('SPONSOR_ACCOUNT_FAILED_2', "</u>");
 define('SPONSOR_ACCOUNT_EMAIL_FAILED', "Konnten Sponsorenaccount nicht freigeben! Bitte benachrichtigen Sie den Support!");
 
 // Login form
@@ -287,15 +287,15 @@ define('SPONSOR_LOGIN_FAILED_PENDING', "Ihr Account wartet noch auf Freischaltun
 define('SPONSOR_LOGIN_FAILED_LOCKED', "Ihr Account wurde gesperrt, vermutlich wegen Nichteinhaltung von Regeln!");
 define('SPONSOR_LOGIN_FAILED_EMAIL', "Sie haben Ihre Email-Adresse ge&auml;ndert und diese noch nicht best&auml;tigt!");
 define('SPONSPOR_COOKIE_SETUP_FAILED', "Es konnten keine Cookies gesetzt werden. Bitte Sicherheitseinstellungen in Ihrem Browser &uuml;berpr&uuml;fen!");
-define('SPONSOR_ONLY_AREA_ENTERED', "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [&nbsp;<STRONG><A href=\"{!URL!}/index.php\">Eingangsseite</A></STRONG>&nbsp;] zur&uuml;ck!");
+define('SPONSOR_ONLY_AREA_ENTERED', "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [&nbsp;<strong><a href=\"{!URL!}/index.php\">Eingangsseite</a></strong>&nbsp;] zur&uuml;ck!");
 define('SPONSOR_ACCOUNT_STATUS_FAILED', "Unerwarteter Zustand des Scriptes erreicht! Bitte Support benachrichtigen!");
 define('SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN', "Ihr Sponsorenaccount ist wieder freigegeben! Sie k&ouml;nnen sich nun erneut einloggen!");
 
 // Sponsor area
 define('SPONSOR_NO_MAIN_MENUS_ACTIVE', "Keine Hauptmen&uuml;s aktiviert!");
 define('SPONSOR_NO_SUB_MENUS_ACTIVE', "Keine Untermen&uuml;s aktiviert!");
-define('SPONSOR_CONTENT_404_1', "Konnte das Sponsor-Modul <U>");
-define('SPONSOR_CONTENT_404_2', "</U> auf dem Server nicht finden!");
+define('SPONSOR_CONTENT_404_1', "Konnte das Sponsor-Modul <u>");
+define('SPONSOR_CONTENT_404_2', "</u> auf dem Server nicht finden!");
 define('SPONSOR_WELCOME_TO', "Willkommen zum Sponsorenbereich!");
 define('SPONSOR_PASSWORD_NOTE', "Wollen Sie nur Ihre Daten, aber nicht das Passwort &auml;ndern, geben Sie Ihr aktuelles Passwort unter &quot;{--SPONSOR_ENTER_OLD_PASSWORD--}&quot; ein. Wollen Sie Ihr Passwort &auml;ndern, geben Sie Ihr derzeiges und zweimal das neue Passwort ein.");
 define('SPONSOR_POINTS_OVERVIEW', "Ihre {!POINTS!}-&Uuml;bersicht");
@@ -304,10 +304,10 @@ define('SPONSOR_FILL_UP_POINTS', "Jetzt {!POINTS!}-Guthaben auff&uuml;llen...");
 define('SPONSOR_ENTER_OLD_PASSWORD', "Geben Sie Ihr derzeitiges Passwort ein");
 define('SPONSOR_CHANGE_PASSWORD', "Neues Passwort einstellen");
 define('SPONSOR_ACCOUNT_DATA_SAVED', "Ihre Daten wurden gespeichert.");
-define('SPONSOR_ACCOUNT_EMAIL_CHANGED', "Sie haben Ihre EMail-Adresse ge&auml;ndert, Account wurde tempor&auml;r gesperrt. Bitte [<A href=\"{!URL!}/index.php\">hier klicken</A>], um in den Gastbereich zu gelangen.");
+define('SPONSOR_ACCOUNT_EMAIL_CHANGED', "Sie haben Ihre EMail-Adresse ge&auml;ndert, Account wurde tempor&auml;r gesperrt. Bitte [<a href=\"{!URL!}/index.php\">hier klicken</a>], um in den Gastbereich zu gelangen.");
 define('SPONSOR_SETTINGS_HEADER', "Einstellungen Ihres Sponsorenaccounts");
-define('SPONSOR_UNKNOWN_WHAT_1', "Scripte-Fehler: Unbekannte Sponsor-Aktion <U>");
-define('SPONSOR_UNKNOWN_WHAT_2', "</U> erkannt!");
+define('SPONSOR_UNKNOWN_WHAT_1', "Scripte-Fehler: Unbekannte Sponsor-Aktion <u>");
+define('SPONSOR_UNKNOWN_WHAT_2', "</u> erkannt!");
 define('SPONSOR_SETTINGS_SAVED', "Neue Einstellungen gespeichert.");
 
 // Error messages
@@ -317,9 +317,9 @@ define('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB', "Das von Ihnen und das in der
 define('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH', "Die von Ihnen eingegebenen neuen Passw&ouml;rter stimmen nicht &uuml;berein!");
 define('SPONSOR_PASSWORD_ONE_EMPTY', "Erstes einzugebenes Passwort ist leer!");
 define('SPONSOR_PASSWORD_TWO_EMPTY', "Zweites einzugebenes Passwort ist leer!");
-define('SPONSOR_PASSWORD_TOO_SHORT_1', "Eingegebenes Passwort entspricht nicht der Mindestl&auml;nge von <U>");
-define('SPONSOR_PASSWORD_TOO_SHORT_2', "</U> Zeichen!");
-define('SPONSOR_ACCOUNT_DATA_NOT_SAVED', "Ihre Daten wurden <U>nicht</U> gespeichert!");
+define('SPONSOR_PASSWORD_TOO_SHORT_1', "Eingegebenes Passwort entspricht nicht der Mindestl&auml;nge von <u>");
+define('SPONSOR_PASSWORD_TOO_SHORT_2', "</u> Zeichen!");
+define('SPONSOR_ACCOUNT_DATA_NOT_SAVED', "Ihre Daten wurden <u>nicht</u> gespeichert!");
 
 //
 ?>
diff --git a/inc/language/support_de.php b/inc/language/support_de.php
index f3be1f278e..6f7cba7cf1 100644
--- a/inc/language/support_de.php
+++ b/inc/language/support_de.php
@@ -45,8 +45,8 @@ define('SUPPORT_SUBJ_MEMBER_ORDER', "Ihr Anfrage an den Support: Mailbuchung");
 define('SUPPORT_SUBJ_MEMBER_REFLINK', "Ihr Anfrage an den Support: Referal-Link");
 define('SUPPORT_SUBJ_MEMBER_UNCONFIRMED', "Ihr Anfrage an den Support: Unbestaetigte Mails");
 define('ADMIN_TASK_IS_SUPPORT_MEMBER', "Mitglieder-Support");
-define('ADMIN_UNKNOWN_SUPPORT_MODE_1', "Unbekannter Support-Modus <STRONG>");
-define('ADMIN_UNKNOWN_SUPPORT_MODE_2', "</STRONG> erkannt!");
+define('ADMIN_UNKNOWN_SUPPORT_MODE_1', "Unbekannter Support-Modus <strong>");
+define('ADMIN_UNKNOWN_SUPPORT_MODE_2', "</strong> erkannt!");
 define('ADMIN_TASK_SUPPORT_MODE', "Support-Art");
 
 //
diff --git a/inc/language/task_de.php b/inc/language/task_de.php
index ac5c4c996b..b492bcaab5 100644
--- a/inc/language/task_de.php
+++ b/inc/language/task_de.php
@@ -58,8 +58,8 @@ define('TASK_ADMIN_MAIL_SEND', "Versendete Mails");
 define('TASK_ADMIN_MAIL_DELETED', "Bereinigte Mails");
 define('TASK_ADMIN_MAIL_BONUS_AP', "Bereinigte Bonus-Mails");
 define('TASK_ADMIN_MAIL_BONUS_SEND', "Versendete Bonus-Mails");
-define('TASK_ADMIN_UNKNOWN_MODE_1', "Unbekannter Modus <U>");
-define('TASK_ADMIN_UNKNOWN_MODE_2', "</U> erkannt!");
+define('TASK_ADMIN_UNKNOWN_MODE_1', "Unbekannter Modus <u>");
+define('TASK_ADMIN_UNKNOWN_MODE_2', "</u> erkannt!");
 define('ADMIN_OVERVIEW_TASK_YOUR_TYPE', "Ihre zugewiesen Aufgaben (ohne Updates)");
 define('ADMIN_OVERVIEW_TASK_UPDATES_TYPE', "Automatisch durchgef&uuml;hrte Updates");
 define('ADMIN_OVERVIEW_TASK_SOLVED_TYPE', "Ihre erledigten Aufgaben");
diff --git a/inc/language/theme_de.php b/inc/language/theme_de.php
index 82ce511060..47a684caa9 100644
--- a/inc/language/theme_de.php
+++ b/inc/language/theme_de.php
@@ -41,8 +41,8 @@ if (!defined('__SECURITY')) {
 define('ADMIN_THEME_NEW_FOUND_TITLE', "Neue Themes gefunden!");
 define('ADMIN_THEME_FILE_CTIME', "Theme erstellt");
 define('ADMIN_THEME_TOTAL_FOUND', "Themes gesamt gefunden");
-define('ADMIN_THEME_ALREADY_INSTALLED_1', "Alle <U>");
-define('ADMIN_THEME_ALREADY_INSTALLED_2', "</U> Themes bereits installiert!");
+define('ADMIN_THEME_ALREADY_INSTALLED_1', "Alle <u>");
+define('ADMIN_THEME_ALREADY_INSTALLED_2', "</u> Themes bereits installiert!");
 define('ADMIN_THEME_NOTHING_FOUND', "Keine Themes auf dem Server gefunden!");
 
 //
diff --git a/inc/language/transfer_de.php b/inc/language/transfer_de.php
index b08ae72b8c..197a14d506 100644
--- a/inc/language/transfer_de.php
+++ b/inc/language/transfer_de.php
@@ -44,7 +44,7 @@ define('ADMIN_TRANSFER_AGE', "Maximales Alter von Eintr&auml;gen");
 define('ADMIN_TRANSFER_TIMEOUT', "Sperrung der Einstellungen nach {!POINTS!}-&Uuml;berweisung");
 define('ADMIN_TRANSFER_BALANCE', "Restbetrag nach &Uuml;berweisung auf Account");
 define('ADMIN_TRANSFER_CODE', "L&auml;nge des Touring-Codes");
-define('ADMIN_TRANSFER_CODE_NOTE', "<STRONG>0</STRONG> deaktiviert den Touring-Code!");
+define('ADMIN_TRANSFER_CODE_NOTE', "<strong>0</strong> deaktiviert den Touring-Code!");
 define('ADMIN_AUTOPURGE_TRANSFER', "Veraltete Eintr&auml;ge automatisch l&ouml;schen? (purge)");
 define('TRANSFER_LIST_INCOMING', "Eingehende &Uuml;berweisungen");
 define('TRANSFER_LIST_OUTGOING', "Ausgehende &Uuml;berweisungen");
@@ -73,8 +73,8 @@ define('TRANSFER_MEMBER_SENDER_SUBJ', "{!POINTS!}-Ueberweisung an Mitglied");
 define('TRANSFER_ADMIN_AUTOPURGE', "Auto-Loeschung von Transfer-Eintraegen");
 define('TRANSFER_COMPLETED', "&Uuml;berweisung vollst&auml;ndig.");
 define('TRANSFER_CONTINUE_OVERVIEW', "Weiter zur &Uuml;bersichtsseite...");
-define('TRANSFER_LATEST_IS_1', "Einstellung gesperrt, letzte &Uuml;berweisung war am <STRONG>");
-define('TRANSFER_LATEST_IS_2', "</STRONG>");
+define('TRANSFER_LATEST_IS_1', "Einstellung gesperrt, letzte &Uuml;berweisung war am <strong>");
+define('TRANSFER_LATEST_IS_2', "</strong>");
 define('TRANSFER_LIST_ALL', "Gesamte &Uuml;berweisungsliste anzeigen");
 define('TRANSFER_NO_INCOMING_TRANSFERS', "Keine eingehenden &Uuml;berweisungen gefunden.");
 define('TRANSFER_NO_OUTGOING_TRANSFERS', "Keine ausgehenden &Uuml;berweisungen gefunden.");
diff --git a/inc/language/user_de.php b/inc/language/user_de.php
index 28aa38be9f..32be2e0342 100644
--- a/inc/language/user_de.php
+++ b/inc/language/user_de.php
@@ -45,11 +45,11 @@ define('USER_ADMIN_CONFIG_HEADER', "Konfiguration - Mitgliederliste");
 define('USER_ADMIN_LIMIT_USER', "Anzahl Mitglieder pro Seite");
 define('USER_ADMIN_ALPHA_USER', "Azanhl Buchstaben pro Zeile");
 define('USER_ACCOUNT_SAVED', "Mitgliedsaccount gespeichert.");
-define('USER_ACCOUNT_NOT_SAVED', "Mitgliedsaccount <U>nicht</U> gespeichert.");
-define('USER_ACCOUNT_LOCKED_1', "Mitgliedsaccount <U>");
-define('USER_ACCOUNT_LOCKED_2', "</U> wurde gesperrt.");
-define('USER_ACCOUNT_UNLOCKED_1', "Mitgliedsaccount <U>");
-define('USER_ACCOUNT_UNLOCKED_2', "</U> wurde freigegeben.");
+define('USER_ACCOUNT_NOT_SAVED', "Mitgliedsaccount <u>nicht</u> gespeichert.");
+define('USER_ACCOUNT_LOCKED_1', "Mitgliedsaccount <u>");
+define('USER_ACCOUNT_LOCKED_2', "</u> wurde gesperrt.");
+define('USER_ACCOUNT_UNLOCKED_1', "Mitgliedsaccount <u>");
+define('USER_ACCOUNT_UNLOCKED_2', "</u> wurde freigegeben.");
 
 //
 ?>
diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php
index d35364216f..aa893f93d9 100644
--- a/inc/libs/active_functions.php
+++ b/inc/libs/active_functions.php
@@ -43,7 +43,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST () {
 	if ((EXT_IS_ACTIVE("active")) && (EXT_IS_ACTIVE("online"))) {
 		// Init content
 		$content = array(
-			'menu' => "<A class=\"menu_blur\" href=\"".URL."/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</A>",
+			'menu' => "<a class=\"menu_blur\" href=\"".URL."/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</a>",
 			'what' => "active"
 		);
 
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index b137dc6c33..e94377ac9d 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -179,7 +179,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 		// No entries found!
 		$OUT = "<TR>
   <TD colspan=\"3\" align=\"center\" height=\"30\" class=\"bottom2\">
-    <STRONG class=\"guest_failed\">".BONUS_NO_RANKS_1.$data.BONUS_NO_RANKS_2."</STRONG>
+    <div class=\"guest_failed\">".BONUS_NO_RANKS_1.$data.BONUS_NO_RANKS_2."</div>
   </TD>
 </TR>\n";
 		define('__YOUR_RANKING_LINE', "");
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 18419e3aa7..1c3e657729 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -86,7 +86,7 @@ function HTML_INSERT_URLS($text)
 		}
 
 		// Now replace the URL against anchor container and pray...
-		$text = substr($text, 0, strpos($text, $check2))."<A href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</A>".substr($text, strpos($text, $check2) + strlen($check));
+		$text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
 
 		// Finally remove the url from testing string (or we have a loop and maybe server overload!)
 		$test = substr($test, strpos($test, $check) + strlen($check));
@@ -143,7 +143,7 @@ function HTML_INSERT_URLS($text)
 		}
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2."<A href=\"mailto:".$check."\">".$check."</A>";
+		$PARTS[] = $check2."<a href=\"mailto:".$check."\">".$check."</a>";
 
 		// Remove email from testing string (see above why...)
 		$test = substr($test, strlen($check));
diff --git a/inc/libs/order_functions.php b/inc/libs/order_functions.php
index 50cde4274d..89c1181eb5 100644
--- a/inc/libs/order_functions.php
+++ b/inc/libs/order_functions.php
@@ -44,7 +44,7 @@ function ORDER_SELECT_OPTION_LIST($default) {
 	foreach ($LIST as $item) {
 		$selected = "";
 		if ($item == $default) $selected = " selected=\"selected\"";
-		$OUT .= "<OPTION value=\"".$item."\"".$selected.">{--ORDER_SELECT_COLUMN_".strtoupper($item)."--}</OPTION>\n";
+		$OUT .= "<option value=\"".$item."\"".$selected.">{--ORDER_SELECT_COLUMN_".strtoupper($item)."--}</option>\n";
 	}
 
 	// Return the output
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index eab3ad8fc0..f524c2ae25 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -38,49 +38,41 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function PAYOUT_OUTPUT_PAYOUT_LIST($points)
-{
+function PAYOUT_OUTPUT_PAYOUT_LIST ($points) {
 	// Replace german decimal comma with CPU's decimal dot
 	$points = strval(REVERT_COMMA($points));
-	if ($points > 0)
-	{
+	if ($points > 0) {
 		// Pay this out!
 		$result = SQL_QUERY_ESC("SELECT id, type, rate, min_points
 FROM "._MYSQL_PREFIX."_payout_types
 WHERE %s >= min_points
 ORDER BY type", array($points), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0)
-		{
-			OUTPUT_HTML("<br /><DIV align=\"center\">
-<DIV align=\"center\"><STRONG>".PAYOUT_NOW.":</STRONG></DIV><br />
-<UL>");
+		if (SQL_NUMROWS($result) > 0) {
+			OUTPUT_HTML("<br /><div align=\"center\">
+<div align=\"center\"><strong>".PAYOUT_NOW.":</strong></div><br />
+<ul>");
 			// Now let's check
-			while (list($id, $type, $rate, $mpoi) = SQL_FETCHROW($result))
-			{
+			while (list($id, $type, $rate, $mpoi) = SQL_FETCHROW($result)) {
 				$type = COMPILE_CODE($type);
-				if ($points >= $mpoi)
-				{
+				if ($points >= $mpoi) {
 					// Ok we found one
 					$P = $points * $rate - 0.5;
-					OUTPUT_HTML("<LI>".PAYOUT_IN.": <STRONG><A href=\"".URL."/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</A></STRONG></LI>");
+					OUTPUT_HTML("<li>".PAYOUT_IN.": <strong><a href=\"".URL."/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</a></strong></li>");
 				}
 			}
 
 			// Free memory
 			SQL_FREERESULT($result);
-			OUTPUT_HTML("</UL></DIV>");
-		}
-		 else
-		{
+			OUTPUT_HTML("</ul></div>");
+		} else {
 			// No payout types setup so far
-			OUTPUT_HTML("<P><FONT class=\"guest_failed\">".PAYOUT_NO_PAYOUT_TYPES."</FONT></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">".PAYOUT_NO_PAYOUT_TYPES."</div");
 		}
-	}
-	 else
-	{
+	} else {
 		// Points is empty
-		OUTPUT_HTML("<P><FONT class=\"guest_failed\">".PAYOUT_NO_POINTS_ENTERED."</FONT></P>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">".PAYOUT_NO_POINTS_ENTERED."</div");
 	}
 }
-//
+
+// [EOF]
 ?>
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 08e8cf341b..c6ad2db005 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -249,14 +249,14 @@ LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 		$OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
 </TR>\n";
 		$SW = 3 - $SW;
@@ -623,19 +623,19 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) {
 		$OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2".$ADD."\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['infos'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
 </TR>\n";
 		$SW = 3 - $SW;
@@ -717,15 +717,15 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 	if (!empty($ral[0]))
 	{
 		// Generate selection box for all found templates
-		$OUT  = "<SELECT name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+		$OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
+  <option value=\"\">".SELECT_NONE."</option>\n";
 		foreach ($ral as $rallye)
 		{
-		     $OUT .= "  <OPTION value=\"".$rallye."\"";
+		     $OUT .= "  <option value=\"".$rallye."\"";
 			if ($default == $rallye) $OUT .= " selected default";
-			$OUT .= ">".$rallye."</OPTION>\n";
+			$OUT .= ">".$rallye."</option>\n";
 		}
-		$OUT .= "</SELECT>\n";
+		$OUT .= "</select>\n";
 	}
 	 else
 	{
@@ -765,9 +765,9 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 				if ($cnt > 0) break;
 			}
 		}
-		//* DEBUG: */ echo "<PRE>";
+		//* DEBUG: */ echo "<pre>";
 		//* DEBUG: */ print_r($cacheArray['refsystem']);
-		//* DEBUG: */ echo "</PRE>";
+		//* DEBUG: */ echo "</pre>";
 		//* DEBUG: */ die();
 
 		if ($cnt > 0) {
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 93623b45ea..34a6c0990e 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -43,7 +43,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
 	$result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
 	while(list($name, $required) = SQL_FETCHROW($result)) {
 		$value = "";
-		if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
+		if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
 		$eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
 		eval($eval);
 	} // END - while
@@ -52,10 +52,10 @@ function REGISTER_FILL_MUST_CONSTANTS()
 	SQL_FREERESULT($result);
 
 	// Also fill other constants
-	define('MUST_GENDER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-	define('MUST_ADDY'  , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-	define('MUST_BIRTH' , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-	define('MUST_MARKER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
+	define('MUST_GENDER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
+	define('MUST_ADDY'  , "<div class=\"guest_failed\">&nbsp;(*)</div>");
+	define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
+	define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
 }
 //
 function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
@@ -94,7 +94,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 			// Empty entry found
 			$array[$name] = "";
 			$OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
-			OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><br /><br />");
+			OUTPUT_HTML("<strong><span class=\"register_failed\">".$OUT."</span></strong><br /><br />");
 		}
 	}
 
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 85ba173427..1b8056b99e 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -331,7 +331,7 @@ ORDER BY sort", array($action), __FILE__, __LINE__);
 				while(list($what, $title_sub) = SQL_FETCHROW($result_sub))
 				{
 					// Check if current selected menu is matching the loaded one
-					if ($current == $what) $title_sub = "<STRONG>".$title_sub."</STRONG>";
+					if ($current == $what) $title_sub = "<strong>".$title_sub."</strong>";
 
 					// Prepare data for the sub template
 					$content = array(
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index b496e1df1f..f0e1ed2cd7 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -65,7 +65,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 		$value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'");
 
 		if ($value > 0) {
-			define('__TASK_UPDATE_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</A>");
+			define('__TASK_UPDATE_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>");
 		} else {
 			define('__TASK_UPDATE_VALUE', "0");
 		}
@@ -80,7 +80,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
 
 	if ($value > 0) {
-		define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</A>");
+		define('__CONFIRMED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>");
 	} else {
 		define('__CONFIRMED_VALUE', "0");
 	}
@@ -89,7 +89,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
 
 	if ($value > 0) {
-		define('__UNCONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=chk_regs\">".$value."</A>");
+		define('__UNCONFIRMED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>");
 	} else {
 		define('__UNCONFIRMED_VALUE', "0");
 	}
@@ -98,7 +98,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
 
 	if ($value > 0) {
-		define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</A>");
+		define('__LOCKED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>");
 	} else {
 		define('__LOCKED_VALUE', "0");
 	}
@@ -109,7 +109,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("0", "task_system", "id", "assigned_admin", true, " AND `status` != 'DELETED'");
 
 	if ($value > 0) {
-		define('__TASK_NEW_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</A>");
+		define('__TASK_NEW_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>");
 	} else {
 		define('__TASK_NEW_VALUE', "0");
 	}
@@ -120,7 +120,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("CLOSED", "task_system", "id", "status", true);
 
 	if ($value > 0) {
-		define('__TASK_CLOSED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</A>");
+		define('__TASK_CLOSED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>");
 	} else {
 		define('__TASK_CLOSED_VALUE', "0");
 	}
@@ -131,7 +131,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("DELETED", "task_system", "id", "status", true);
 
 	if ($value > 0) {
-		define('__TASK_DELETED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</A>");
+		define('__TASK_DELETED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>");
 	} else {
 		define('__TASK_DELETED_VALUE', "0");
 	}
@@ -142,7 +142,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("SOLVED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_CURRENT_ADMIN_ID()));
 
 	if ($value > 0) {
-		define('__TASK_SOLVED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</A>");
+		define('__TASK_SOLVED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>");
 	} else {
 		define('__TASK_SOLVED_VALUE', "0");
 	}
@@ -153,7 +153,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'");
 
 	if ($value > 0) {
-		define('__TASK_YOUR_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task\">".$value."</A>");
+		define('__TASK_YOUR_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task\">".$value."</a>");
 	} else {
 		define('__TASK_YOUR_VALUE', "0");
 	}
@@ -164,7 +164,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("ADMIN", "pool", "id", "data_type", true);
 
 	if ($value > 0) {
-		define('__MAIL_ADMIN_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=unlock_emails\">".$value."</A>");
+		define('__MAIL_ADMIN_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>");
 	} else {
 		define('__MAIL_ADMIN_VALUE', "0");
 	}
@@ -175,7 +175,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("TEMP", "pool", "id", "data_type", true);
 
 	if ($value > 0) {
-		define('__MAIL_TEMP_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</A>");
+		define('__MAIL_TEMP_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
 	} else {
 		define('__MAIL_TEMP_VALUE', "0");
 	}
@@ -186,7 +186,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	$value = GET_TOTAL_DATA("SEND", "pool", "id", "data_type", true);
 
 	if ($value > 0) {
-		define('__MAIL_SEND_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=email_archiv\">".$value."</A>");
+		define('__MAIL_SEND_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>");
 	} else {
 		define('__MAIL_SEND_VALUE', "0");
 	}
@@ -199,7 +199,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 		$value = GET_TOTAL_DATA("DELETED", "pool", "id", "data_type", true);
 
 		if ($value > 0) {
-			define('__MAIL_DELETED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</A>");
+			define('__MAIL_DELETED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
 		} else {
 			define('__MAIL_DELETED_VALUE', "0");
 		}
@@ -212,18 +212,18 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 			$value = GET_TOTAL_DATA("DELETED", "bonus", "id", "data_type", true);
 
 			if ($value > 0) {
-				define('__MAIL_BONUS_AP_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</A>");
+				define('__MAIL_BONUS_AP_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
 			} else {
 				define('__MAIL_BONUS_AP_VALUE', "0");
 			}
 		} elseif (EXT_IS_ACTIVE("bonus")) {
 			define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
 		} else {
-			define('__MAIL_BONUS_AP_VALUE', "<FONT class=\"admin_note\">".ADMIN_EXT_BONUS_404."</FONT>");
+			define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_BONUS_404."</div>");
 		}
 	} else {
-		define('__MAIL_BONUS_AP_VALUE', "<FONT class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</FONT>");
-		define('__MAIL_DELETED_VALUE', "<FONT class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</FONT>");
+		define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</div>");
+		define('__MAIL_DELETED_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</div>");
 	}
 
 	//
@@ -234,7 +234,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 		$value = GET_TOTAL_DATA("SEND", "bonus", "id", "data_type", true, " AND is_notify='N'");
 
 		if ($value > 0) {
-			define('__MAIL_BONUS_SEND_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</A>");
+			define('__MAIL_BONUS_SEND_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
 		} else {
 			define('__MAIL_BONUS_SEND_VALUE', "0");
 		}
@@ -555,7 +555,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 		if ($key < $MAX) $content['bottom'] = "bottom2";
 		if (($value > 0) && (!empty($WHATs[$key]))) {
 			if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE;
-			$content['row_link'] = "<A href=\"".URL."/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</A>";
+			$content['row_link'] = "<a href=\"".URL."/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
 		} else {
 			$content['row_link'] = 0;
 		}
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index f7df80bbc0..a39bdff3a8 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -68,9 +68,9 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	// Construct selection form for the box template
 	$OUT = "";
 	foreach ($THEMES['theme_unix'] as $key => $theme) {
-		$OUT .= "  <OPTION value=\"".$theme."\"";
+		$OUT .= "  <option value=\"".$theme."\"";
 		if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
-		$OUT .= ">".$THEMES['theme_name'][$key]."</OPTION>\n";
+		$OUT .= ">".$THEMES['theme_name'][$key]."</option>\n";
 	} // END - foreach
 
 	// Return generated selection
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 76d85f5876..fd534b8128 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -51,12 +51,12 @@ function alpha($sortby, $colspan, $return=false) {
 	while (list($counter, $ltr) = each($alphabet)) {
 		if ($_GET['letter'] == $ltr) {
 			// Current letter is letter from URL
-			$OUT .= "<STRONG>".$ltr."</STRONG>";
+			$OUT .= "<strong>".$ltr."</strong>";
 		} else {
 			// Output link to letter
-			$OUT .= "<A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+			$OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
 			if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
-			$OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</A>";
+			$OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</a>";
 		}
 
 		if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -110,9 +110,9 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
 
 	foreach ($list as $sort => $title) {
 		if ($sortby == $sort) {
-			$OUT .= "<STRONG>".$title."</STRONG>&nbsp;|&nbsp;";
+			$OUT .= "<strong>".$title."</strong>&nbsp;|&nbsp;";
 		} else {
-			$OUT .= "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";
+			$OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";
 		}
 	} // END - foreach
 
@@ -150,13 +150,13 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 	$OUT = "";
 	for ($page = 1; $page <= $PAGES; $page++) {
 		if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
-			$OUT .= "<STRONG>-";
+			$OUT .= "<strong>-";
 		} else {
 			if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
 			if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
 
 			// Base link
-			$OUT .= "<A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+			$OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
 
 			// Add status or mode
 			if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
@@ -169,9 +169,9 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 		$OUT .= $page;
 
 		if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
-			$OUT .= "-</STRONG>";
+			$OUT .= "-</strong>";
 		} else 	{
-			$OUT .= "</A>";
+			$OUT .= "</a>";
 		}
 
 		if ($page < $PAGES) $OUT .= "&nbsp;|&nbsp;";
@@ -448,7 +448,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
 		}
 	} else {
 		// ID or email is wrong
-		LOAD_TEMPLATE("admin_settings_saved", false, "<SPAN class=\"guest_failed\">".GUEST_WRONG_ID_EMAIL."</SPAN>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"guest_failed\">".GUEST_WRONG_ID_EMAIL."</span>");
 	}
 
 	// Return the error code
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 9bb05dc9ec..0635460a52 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -197,7 +197,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 	if (!empty($_GET['register'])) {
 		// Registration of first admin is done
-		if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
+		if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin\">".ADMIN_REGISTER_DONE."</div>");
 	} // END - if
 
 	// Check if the admin has submitted data or not
@@ -235,7 +235,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 		case "pass": // Wrong password
 			$_POST['ok'] = $ret;
-			$ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+			$ret = WRONG_PASS." [<a href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</a>]\n";
 			DESTROY_ADMIN_SESSION();
 			break;
 
@@ -329,7 +329,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		}
 	} else {
 		// Something went wrong here...
-		OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</div>");
 
 		// Add fatal message
 		addFatalMessage(CANNOT_UNREG_SESS);
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index fe98128a1e..95e56d6bd0 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -247,12 +247,12 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
 		$tmp = $file.".tmp";
 
 		// Open the source file
-		$fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
+		$fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
 
 		// Is the resource valid?
 		if (is_resource($fp)) {
 			// Open temporary file
-			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
+			$fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
 
 			// Is the resource again valid?
 			if (is_resource($fp_tmp)) {
@@ -291,16 +291,16 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
 				@unlink($tmp);
 				define('_FATAL', false);
 			} elseif (!$found) {
-				OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
+				OUTPUT_HTML("<strong>CHANGE:</strong> 404!");
 				define('_FATAL', true);
 			} else {
-				OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
+				OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
 				define('_FATAL', true);
 			}
 		}
 	} else {
 		// File not found, not readable or writeable
-		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
+		OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
 	}
 }
 
@@ -437,23 +437,23 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 				}
 				$OUT .= "<TR>
 	<TD class=\"admin_menu\" colspan=\"2\">
-		<NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
+		<NOBR>&nbsp;<strong>&middot;</strong>&nbsp;";
 				if (($menu == $act) && (empty($wht)))
 				{
-					$OUT .= "<STRONG>";
+					$OUT .= "<strong>";
 				}
 				 else
 				{
-					$OUT .= "[<A href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
+					$OUT .= "[<a href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
 				}
 				$OUT .= $title;
 				if (($menu == $act) && (empty($wht)))
 				{
-					$OUT .= "</STRONG>";
+					$OUT .= "</strong>";
 				}
 				 else
 				{
-					$OUT .= "</A>]";
+					$OUT .= "</a>]";
 				}
 				$OUT .= "</NOBR></TD>
 </TR>\n";
@@ -483,16 +483,16 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 							$menuDesription[$wht_sub] = $desc_what;
 							$OUT .= "<TR>
 	<TD class=\"admin_menu\" colspan=\"2\">
-		<NOBR>&nbsp;<STRONG>--&gt;</STRONG>&nbsp;";
+		<NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
 							if ($readable)
 							{
 								if ($wht == $wht_sub)
 								{
-									$OUT .= "<STRONG>";
+									$OUT .= "<strong>";
 								}
 								 else
 								{
-									$OUT .= "[<A href=\"".URL."/modules.php?module=admin&amp;what=".$wht_sub."\">";
+									$OUT .= "[<a href=\"".URL."/modules.php?module=admin&amp;what=".$wht_sub."\">";
 								}
 							}
 							 else
@@ -504,16 +504,16 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 							{
 								if ($wht == $wht_sub)
 								{
-									$OUT .= "</STRONG>";
+									$OUT .= "</strong>";
 								}
 								 else
 								{
-									$OUT .= "</A>]";
+									$OUT .= "</a>]";
 								}
 							}
 							 else
 							{
-								$OUT .= "</I>";
+								$OUT .= "</em>";
 							}
 							$OUT .= "</NOBR></TD>
 </TR>\n";
@@ -574,13 +574,13 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 	$OUT = "";
 
 	// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-	if ($add_all) $OUT = "      <OPTION value=\"all\">".ALL_MEMBERS."</OPTION>\n";
-	 elseif ($none) $OUT = "      <OPTION value=\"0\">".SELECT_NONE."</OPTION>\n";
+	if ($add_all) $OUT = "      <option value=\"all\">".ALL_MEMBERS."</option>\n";
+	 elseif ($none) $OUT = "      <option value=\"0\">".SELECT_NONE."</option>\n";
 	while (list($id, $sname, $fname) = SQL_FETCHROW($result))
 	{
-		$OUT .= "      <OPTION value=\"".bigintval($id)."\"";
+		$OUT .= "      <option value=\"".bigintval($id)."\"";
 		if ($def == $id) $OUT .= " selected=\"selected\"";
-		$OUT .= ">".$sname." ".$fname." (".bigintval($id).")</OPTION>\n";
+		$OUT .= ">".$sname." ".$fname." (".bigintval($id).")</option>\n";
 	}
 
 	// Free memory
@@ -608,19 +608,19 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
 	 array($MODE), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Load menu as selection
-		$OUT = "<SELECT name=\"".$MODE."_menu";
+		$OUT = "<select name=\"".$MODE."_menu";
 		if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
 		$OUT .= "\" size=\"1\" class=\"admin_select\">
-	<OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+	<option value=\"\">".SELECT_NONE."</option>\n";
 		while (list($menu, $title) = SQL_FETCHROW($result)) {
-			$OUT .= "  <OPTION value=\"".$menu."\"";
+			$OUT .= "  <option value=\"".$menu."\"";
 			if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
-			$OUT .= ">".$title."</OPTION>\n";
+			$OUT .= ">".$title."</option>\n";
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
-		$OUT .= "</SELECT>\n";
+		$OUT .= "</select>\n";
 	} else {
 		// No menus???
 		$OUT = ADMIN_PROBLEM_NO_MENU;
@@ -776,9 +776,9 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 		return $title;
 	} // END - if
 
-	//* DEBUG: */ echo "A:".$title."<br />";
+	//* DEBUG: */ echo "a:".$title."<br />";
 	// Return link
-	return "<A href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
+	return "<a href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";
 }
 //
 function ADMIN_CHECK_MENU_MODE() {
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 46c2ed7f31..a26c4d3059 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -141,7 +141,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				if ($type == "SUPPORT_MEMBER") {
 					$mode = substr($text, 0, strpos($text, ":"));
 					$text = substr($text, strpos($text, ":") + 1);
-					$ADD = "<LI>".ADMIN_TASK_SUPPORT_MODE.": <STRONG>".$mode."</STRONG></LI>";
+					$ADD = "<li>".ADMIN_TASK_SUPPORT_MODE.": <strong>".$mode."</strong></li>";
 				} // END - if
 
 				if ($uid > 0) {
@@ -150,7 +150,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					if (SQL_NUMROWS($result_user) == 1) {
 						list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
 						SQL_FREERESULT($result_user);
-						$ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+						$ADD = "<li>".ADMIN_MEMBER_UID.": <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
 					} // END - if
 				} // END - if
 
@@ -241,7 +241,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						));
 					} else {
 						// Task is closed so nothing is todo
-						$OUT .= "<FONT class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</FONT>\n";
+						$OUT .= "<div class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</div>\n";
 
 						// Close task but not already closes or deleted or update tasks
 						if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
@@ -253,7 +253,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
 				case "EXTENSION_UPDATE": // Extension update
 					// Extension updates are installed automatically
-					$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</FONT>\n";
+					$OUT .= "<div class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</div>\n";
 
 					// Close task
 					if (($status != "CLOSED") && ($status != "DELETED")) {
@@ -267,7 +267,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					{
 					default: // @TODO Unknown support mode
 						DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-						$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."</FONT>\n";
+						$OUT .= "<div class=\"admin_failed medium\">".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."</div>\n";
 						break;
 					}
 					break;
@@ -289,11 +289,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 							$OUT .= LOAD_TEMPLATE("admin_payout_overview_form", true, $content);
 						} else {
 							// Problem obtaining payout ID
-							$OUT .= "<FONT class=\"admin_failed medium\">".PAYOUT_OBTAIN_ID_FAILED."</FONT>\n";
+							$OUT .= "<div class=\"admin_failed medium\">".PAYOUT_OBTAIN_ID_FAILED."</div>\n";
 						}
 					} else {
 						// Extension is not installed
-						$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</FONT>\n";
+						$OUT .= "<div class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</div>\n";
 					}
 					break;
 
@@ -314,11 +314,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 							$OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content);
 						} else {
 							// Problem obtaining wernis ID
-							$OUT .= "<FONT class=\"admin_failed medium\">".WERNIS_OBTAIN_ID_FAILED."</FONT>\n";
+							$OUT .= "<div class=\"admin_failed medium\">".WERNIS_OBTAIN_ID_FAILED."</div>\n";
 						}
 					} else {
 						// Extension is not installed
-						$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_WERNIS_NOT_INSTALLED."</FONT>\n";
+						$OUT .= "<div class=\"admin_failed medium\">".ADMIN_WERNIS_NOT_INSTALLED."</div>\n";
 					}
 					break;
 
@@ -341,13 +341,13 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						$OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content);
 					} else {
 						// Already unsubscribed
-						$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</FONT>\n";
+						$OUT .= "<div class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</div>\n";
 					}
 					break;
 
 				default: // Unknown task type
 					DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
-					$OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</FONT>\n";
+					$OUT .= "<div class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</div>\n";
 					break;
 				}
 				$OUT .= "  </TD>
@@ -389,16 +389,16 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 			$infos = "---";
 			if ($admin == "0") {
 				// No admin currently is assigned
-				$admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
+				$admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
 			} else {
 				// Load admin's data
 				$login = GET_ADMIN_LOGIN($admin);
 				if ($login != "***") {
 					// Admin found
-					$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+					$admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
 				} else {
 					// Maybe deleted?
-					$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+					$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
 				}
 			}
 
@@ -419,7 +419,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				// Member found otherwise it's a system task
 				$uid = ADMIN_USER_PROFILE_LINK($uid);
 			} else {
-				$uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
+				$uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
 			}
 
 			// Prepare content
diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index f96c1e1dc3..3232be3b56 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -108,13 +108,13 @@ if ($_GET['u_id'] == "all") {
 			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_ADDED);
 		} else {
 			// Opps, missing form here
-			define('__USER_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
+			define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 			define('__UID'       , bigintval($_GET['u_id']));
 			LOAD_TEMPLATE("admin_add_points");
 		}
 	} else {
 		// User not found!
-		OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed
diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 6672890f33..8c2bc8fc26 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -131,15 +131,15 @@ if (!isset($_POST['ok']))
 			}
 		}
 	}
-	$OUT = "    <SELECT class=\"admin_select\" name=\"sort\" size=\"1\">
-      <OPTION value=\"0\">".IS_FIRST_MENU."</OPTION>\n";
+	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
+      <option value=\"0\">".IS_FIRST_MENU."</option>\n";
   	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
 			foreach ($m as $key2 => $m2)
 			{
-				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
+				$OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
 				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
@@ -147,15 +147,15 @@ if (!isset($_POST['ok']))
 						$OUT .= " (".$titles[$k].")";
 					}
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 		}
 		 else
 		{
-			$OUT .= "      <OPTION value=\"".$m."\">".$titles[$key]."</OPTION>\n";
+			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
 		}
 	}
-	$OUT .= "</SELECT>";
+	$OUT .= "</select>";
 
 	define('__BELOW_SELECTION' , $OUT);
 	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("admin", "what", "name"));
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 7ec9a43c84..5b25d34b39 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -256,17 +256,17 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
 			{
 				// Is highest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 			 elseif ($cnt == $max)
 			{
 				// Is lowest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
 			}
 			 elseif ($sort > 0)
 			{
 				// Anything else between highest and lowest
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 
 			if (empty($act)) $act = "&nbsp;";
diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index f1402e7410..98098a7631 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -57,18 +57,18 @@ if (isset($_POST['edit']))
 			$OUT = ""; $aid = 0; $aid2 = 0;
 			while (list($aid, $id) = SQL_FETCHROW($result))
 			{
-				$OUT .= "<SELECT name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
-<OPTION value=\"0\"";
+				$OUT .= "<select name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
+<option value=\"0\"";
 				if ($aid == "0") $OUT .= " selected default";
-				$OUT .=">".ADMINS_ALL_ADMINS."</OPTION>\n";
+				$OUT .=">".ADMINS_ALL_ADMINS."</option>\n";
 				if (EXT_IS_ACTIVE("userlog"))
 				{
-					$OUT .= "<OPTION value=\"-1\"";
+					$OUT .= "<option value=\"-1\"";
 					if ($aid == "-1") $OUT .= " selected default";
-					$OUT .= ">".ADMINS_TO_USERLOG."</OPTION>\n";
+					$OUT .= ">".ADMINS_TO_USERLOG."</option>\n";
 				}
 				$OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
-				$OUT .= "</SELECT><br />\n";
+				$OUT .= "</select><br />\n";
 				$aid2 = $aid; $id2 = $id;
 			}
 
@@ -157,17 +157,17 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 			if ($aid > 0)
 			{
 				// Admin assigned
-				$admin_link = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</A>";
+				$admin_link = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";
 			}
 			 elseif ($aid == 0)
 			{
 				// All admins
-				$admin_link = "<I>".ADMINS_ALL_ADMINS."</I>";
+				$admin_link = "<em>".ADMINS_ALL_ADMINS."</em>";
 			}
 			 elseif (($aid == -1) && (EXT_IS_ACTIVE("usrlog")))
 			{
 				// To userlog
-				$admin_link = "<I>".ADMINS_TO_USERLOG."</I>";
+				$admin_link = "<em>".ADMINS_TO_USERLOG."</em>";
 			}
 			$content = array(
 				'sw'   => $SW,
diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php
index 234d0029c7..f8d1b32ab8 100644
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.php
@@ -57,7 +57,7 @@ if (SQL_NUMROWS($result) > 0) {
 			'gender' => TRANSLATE_GENDER($gender),
 			'sname'  => $sname,
 			'fname'  => $fname,
-			'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+			'email'  => "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</a>",
 			'ip'     => $IP,
 			'ref'    => $ref,
 			'hash'   => $hash,
diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index feb20a53ec..d9f518f01d 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -118,10 +118,10 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 		$login = GET_ADMIN_LOGIN($admin);
 		if ($login != "***") {
 			// Admin found
-			$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+			$admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
 		} else {
 			// Maybe deleted?
-			$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+			$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
 		}
 
 		// Prepare data for the row template
@@ -235,12 +235,12 @@ VALUES ('%s','%s','%s','%s')",
 			if ($login != "***")
 			{
 				// Admin found
-				$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+				$admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
 			}
 			 else
 			{
 				// Maybe deleted?
-				$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+				$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
 			}
 
 			// Prepare data for the row template
diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 11bbbd58d7..60538f8411 100644
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -89,12 +89,12 @@ if (isset($_POST['ok'])) {
 	if (getConfig('turbo_rates') == "") $RANKS = array(round(getConfig('turbo_bonus') / 2), round(getConfig('turbo_bonus') / 4));
 
 	// Generate list
-	$OUT = "<OL start=\"2\">\n";
+	$OUT = "<ol start=\"2\">\n";
 	$cnt = 0;
 	foreach ($RANKS as $k => $rate) {
 		if (!empty($rate)) 	{
 			// Print only when something is in
-			$OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
+			$OUT .= "  <li><INPUT type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\">&nbsp;<div class=\"admin_notes\">(".POINTS.")</div?</li>\n";
 		}
 		$cnt++;
 	}
@@ -104,9 +104,9 @@ if (isset($_POST['ok'])) {
 
 	// Add more empty fields
 	for ($i = $cnt; $i < $max; $i++) {
-		$OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
+		$OUT .= "  <li><INPUT type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\">&nbsp;<div class=\"admin_notes\">(".POINTS.")</div?</li>\n";
 	}
-	$OUT .= "</OL>\n";
+	$OUT .= "</ol>\n";
 	define('__TRATES_LIST', $OUT);
 
 	define('__LOGIN_TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS(getConfig('login_timeout')    , "login_timeout"    , "WDh"));
diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 76ae8db5ac..d4677e86d6 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -55,7 +55,7 @@ if (isset($_POST['add'])) {
 		$content = CATEGORY_ADDED;
 	} else {
 		// Category does already exists
-		$content = "<SPAN class=\"admin_failed\">".CATEGORY_ALREADY_EXISTS."</SPAN>";
+		$content = "<span class=\"admin_failed\">".CATEGORY_ALREADY_EXISTS."</span>";
 	}
 
 	// Free memory
@@ -173,7 +173,7 @@ if (isset($_POST['add'])) {
 
 			// Put cat descriptions into variable for the selection box
 			if (strlen($cat) > 20) $cat = substr($cat, 0, 17)."...";
-			$CATS .= "      <OPTION value=\"".$sort."\">".$cat."</OPTION>\n";
+			$CATS .= "      <option value=\"".$sort."\">".$cat."</option>\n";
 
 			// Load row template and switch color
 			$OUT .= LOAD_TEMPLATE("admin_config_cats_row", true, $content);
diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 674a428890..bd9d47eebb 100644
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -54,7 +54,7 @@ if (isset($_POST['add_max'])) {
 		$content = MAX_VALUE_SAVED;
 	} else {
 		// Value does alread exists!
-		$content = "<SPAN class=\"admin_failed\">".MAX_VALUE_ALREADY."</SPAN>";
+		$content = "<span class=\"admin_failed\">".MAX_VALUE_ALREADY."</span>";
 	}
 
 	// Free memory
diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index d9b8a9adde..92092beb2c 100644
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -53,7 +53,7 @@ case "settings": // Settings related to the index page
 	if (isset($_POST['ok'])) {
 		// Save settings
 		ADMIN_SAVE_SETTINGS($_POST);
-		OUTPUT_HTML("<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</A>");
+		OUTPUT_HTML("<a href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</a>");
 	} else {
 		// Prepare data for the template
 		$content = array_fill(-1, 60, "");
@@ -77,15 +77,13 @@ WHERE action='main' AND what != '' AND what IS NOT NULL AND locked='N'
 ORDER BY sort ASC", __FILE__, __LINE__);
 
 	$SW = 2; $OUT = ""; $atitle = "";
-	while (list($id, $wht, $wtitle) = SQL_FETCHROW($result))
-	{
-		$LINK = "<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$wht."\">"._IS_NEW_HOME."</A>";
-		if ($wht == getConfig('index_home'))
-		{
+	while (list($id, $wht, $wtitle) = SQL_FETCHROW($result)) {
+		$LINK = "<a href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$wht."\">"._IS_NEW_HOME."</a>";
+		if ($wht == getConfig('index_home')) {
 			// Is current home
-			$LINK   = "<STRONG class=\"admin_note\">"._IS_CURRENT_HOME."</STRONG>";
-			$atitle = "<STRONG class=\"admin_note\">".$atitle."</STRONG>";
-			$wtitle = "<STRONG class=\"admin_note\">".$wtitle."</STRONG>";
+			$LINK   = "<div class=\"admin_note\">"._IS_CURRENT_HOME."</div>";
+			$atitle = "<div class=\"admin_note\">".$atitle."</div>";
+			$wtitle = "<div class=\"admin_note\">".$wtitle."</div>";
 		}
 
 		// Add row...
@@ -109,5 +107,6 @@ ORDER BY sort ASC", __FILE__, __LINE__);
 	LOAD_TEMPLATE("admin_config_home");
 	break;
 }
+
 //
 ?>
diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php
index 2ea9b1b18d..20e1b5537b 100644
--- a/inc/modules/admin/what-config_mediadata.php
+++ b/inc/modules/admin/what-config_mediadata.php
@@ -80,7 +80,7 @@ if (isset($_POST['ok']))
 	if (getConfig('mt_start') > 0)
 	{
 		// Only show start
-		define('__MT_START', "<STRONG>".MAKE_DATETIME(getConfig('mt_start'), "3")."</STRONG>");
+		define('__MT_START', "<strong>".MAKE_DATETIME(getConfig('mt_start'), "3")."</strong>");
 	}
 	 else
 	{
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 5a1e816364..d2cd854f80 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -128,7 +128,7 @@ ORDER BY module", __FILE__, __LINE__);
 		if (($mod == "index") || ($mod == "login"))
 		{
 			// Add link to detail statistics
-			$mod = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</A></STRONG>";
+			$mod = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";
 		}
 
 		// Prepare array for the template
diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 9b79974df7..5d3b3b19a4 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -91,11 +91,11 @@ if (isset($_POST['ok'])) {
 		define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('resend_profile_update') , "resend_profile_update", "MWD"));
 	} else {
 		// Normal input boxes
-		define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('online_timeout')."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-		define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('url_tlock')     ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-		define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('profile_lock')  ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-		define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".getConfig('profile_update')."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('resend_profile_update') ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+		define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('online_timeout')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
+		define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('url_tlock')     ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
+		define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('profile_lock')  ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
+		define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".getConfig('profile_update')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
+		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('resend_profile_update') ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
 	}
 
 	if (getConfig('order_multi_page') == "N") {
diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 0ae20d5a8c..2eb58b66b0 100644
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -212,13 +212,15 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
 // Does your members request payouts?
 if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
 	// Members has requested payouts
-	SQL_FREERESULT($result_mem);
-	OUTPUT_HTML("<P><A href=\"".URL."/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</A></P>");
+	LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</a></P>");
 } elseif ($display) {
 	// No member requests so far
-	OUTPUT_HTML("<P><STRONG>".ADMIN_PAYOUT_NO_MEMBER_REQUESTS."</STRONG></P>");
+	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_PAYOUT_NO_MEMBER_REQUESTS);
 }
 
+// Free result
+SQL_FREERESULT($result_mem);
+
 // Add new paypout type
 if ($display) LOAD_TEMPLATE("admin_payout_add_new");
 
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index f81988eb11..57a98b1103 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -154,7 +154,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
 			REBUILD_CACHE("config", "config");
 		} else {
 			// Prepare failed-message
-			$message = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+			$message = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
 		}
 
 		// Remove SQL queries
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index d9ed51b381..ace5287823 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -143,7 +143,7 @@ VALUES ('%s','%s','%s','%s')",
 		 else
 		{
 			// Nothing selected
-			$content = RALLYE_NO_PRICES_SELECTED_1."<A href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</A>".RALLYE_NO_PRICES_SELECTED_3;
+			$content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
 			LOAD_TEMPLATE("admin_settings_saved", false, $content);
 		}
 	}
@@ -189,13 +189,13 @@ VALUES ('%s','%s','%s','%s')",
 		 else
 		{
 			// Nothing selected
-			$content = RALLYE_NO_PRICES_SELECTED_1."<A href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</A>".RALLYE_NO_PRICES_SELECTED_3;
+			$content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
 			LOAD_TEMPLATE("admin_settings_saved", false, $content);
 		}
 	}
 	 else
 	{
-		// A rallye was selected, so check if there are already prices assigned...
+		// a rallye was selected, so check if there are already prices assigned...
 		$result = SQL_QUERY_ESC("SELECT id, price_level, points, info FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s ORDER BY price_level",
 		 array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
 
@@ -252,7 +252,7 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
 		while (list($id, $aid, $start, $end, $title, $alogin, $active) = SQL_FETCHROW($result))
 		{
 			$select = "<INPUT type=\"checkbox\" name=\"sel[".$id."]\" class=\"admin_normal\" value=\"1\">";
-			if ($active == "Y") $select = "<STRONG class=\"big\">".$id."</STRONG>";
+			if ($active == "Y") $select = "<div class=\"big\">".$id."</div>";
 
 			// Prepare data for the row template
 			$content = array(
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 56fd39be7b..a14bcb665e 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -137,7 +137,7 @@ WHERE s.pool_id=%s LIMIT 1",
 			$cnt += SQL_AFFECTEDROWS();
 
 			// Load template for link
-			LOAD_TEMPLATE("admin_settings_saved", false, "<A href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</A>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");
 		} // END - if
 
 		// Free the result
diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 5992aa0657..502b9b594c 100644
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -51,10 +51,10 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
 
 		// Delete user account
 		DELETE_USER_ACCOUNT(bigintval($_GET['u_id']), $_POST['reason']);
-		OUTPUT_HTML("<STRONG class=\"admin_green\">".ADMIN_DEL_COMPLETED."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".ADMIN_DEL_COMPLETED."</div>");
 	} else {
 		// Account does not exists!
-		OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 	}
 } elseif (!empty($_POST['no'])) {
 	// Do not delete him...
@@ -81,7 +81,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
 		LOAD_TEMPLATE("admin_del_user");
 	} else {
 		// Account does not exists!
-		OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 	}
 }
 
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 71d9a7b5e4..212b60b15a 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -76,7 +76,7 @@ WHERE id=%s LIMIT 1",
 		if (SQL_AFFECTEDROWS() == 1) {
 			$content = SETTINGS_SAVED;
 		} else {
-			$content = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+			$content = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
 		}
 
 		// Display message
@@ -109,7 +109,7 @@ WHERE id=%s LIMIT 1",
 	}
 } else {
 	// No mail orders left in pool
-	OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+	OUTPUT_HTML("<span class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</span>");
 }
 
 //
diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 6b3dedbdbe..8e496ed325 100644
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -187,7 +187,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 			} // END - if
 		} elseif (FILE_READABLE(sprintf("%stemplates/%s/html/admin/%s.tpl", PATH, GET_LANGUAGE(), $TPL))) {
 			// Create mailto link
-			define('__SPONSOR_VALUE', "<A href=\"mailto:".__EMAIL."\">".__SURNAME." ".__FAMILY."</A>");
+			define('__SPONSOR_VALUE', "<a href=\"mailto:".__EMAIL."\">".__SURNAME." ".__FAMILY."</a>");
 
 			// Load mode template
 			LOAD_TEMPLATE($TPL);
diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 2f399f0923..18bc6f76d9 100644
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -149,7 +149,7 @@ WHERE userid=%s LIMIT 1",
  else
 {
 	// Account does not exists!
-	OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+	LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 }
 
 //
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 8888a50385..cde9710ce3 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0)
 		if ($unconfirmed > 0)
 		{
 			// Add link to list_unconfirmed what-file
-			$unconfirmed = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</A></STRONG>";
+			$unconfirmed = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";
 		}
 
 		// Prepare data for the row template
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index effc1b8c72..9a29cf3d6f 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -134,7 +134,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 		$pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
 		if ($pool['unconfirmed'] > 0) {
 			// Add link to list_unconfirmed what-file
-			$pool['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</A></STRONG>";
+			$pool['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
 		} elseif ($pool['unconfirmed'] < 0) {
 			// Sometimes rarely displayed minus values will be "fixed" to zero
 			$pool['unconfirmed'] = 0;
@@ -193,7 +193,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 			// Add link?
 			if ($bonus['unconfirmed'] > 0) {
 				// Add link to list_unconfirmed what-file
-				$bonus['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</A></STRONG>";
+				$bonus['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
 			} // END - if
 
 			// Prepare content
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 293a28558d..8a9d923f5f 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -270,7 +270,7 @@ ORDER BY ext_name", __FILE__, __LINE__);
 		LOAD_TEMPLATE("admin_extensions");
 	} else {
 		// No extensions are registered
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
+		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</div>");
 	}
 	break;
 
diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 916d5be373..6880b91955 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -134,15 +134,15 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 		}
 	}
 
-	$OUT = "    <SELECT class=\"admin_select\" name=\"sort\" size=\"1\">
-      <OPTION value=\"0\">".IS_FIRST_MENU."</OPTION>";
+	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
+      <option value=\"0\">".IS_FIRST_MENU."</option>";
   	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
 			foreach ($m as $key2 => $m2)
 			{
-				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
+				$OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
 				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
@@ -150,15 +150,15 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 						$OUT .= " (".$titles[$k].")";
 					}
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 		}
 		 else
 		{
-			$OUT .= "      <OPTION value=\"".$m."\">".$titles[$key]."</OPTION>\n";
+			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
 		}
 	}
-	$OUT .= "</SELECT>";
+	$OUT .= "</select>";
 
 	define('__BELOW_SELECTION' , $OUT);
 	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("guest", "what", "name"));
diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index a949834f66..b4161cb7c9 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -300,17 +300,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
 			{
 				// Is highest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 			 elseif ($cnt == $max)
 			{
 				// Is lowest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
 			}
 			 elseif ($sort > 0)
 			{
 				// Anything else between highest and lowest
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 			if (empty($act)) $act = "&nbsp;";
 			if (empty($wht))   $wht   = "&nbsp;";
diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 855f4236c0..1fd7e00feb 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -72,7 +72,7 @@ if (SQL_NUMROWS($result) > 0)
 			'gender'   => TRANSLATE_GENDER($gender),
 			'sname'    => $sname,
 			'fname'    => $fname,
-			'email'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+			'email'    => "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</a>",
 			'joined'   => MAKE_DATETIME($joined, "2"),
 			'last'     => MAKE_DATETIME($last, "2"),
 			'notified' => MAKE_DATETIME($notified, "2"),
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 61ef7cfb55..4340ef0a9f 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -73,8 +73,8 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 			$WIN1 = ""; $WIN2 = "";
 			if ($cnt <= getConfig('beg_ranks')) {
 				// Maybe he can win his active beg?
-				$WIN1 = "<STRONG>";
-				$WIN2 = "</STRONG>";
+				$WIN1 = "<strong>";
+				$WIN2 = "</strong>";
 			} // END - if
 
 			// Prepare content
@@ -105,7 +105,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 			define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
 		} else {
 			// Display message "no manual withdraw possible"
-			define('__BEG_WITHDRAW_FORM', "<FONT class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</FONT>");
+			define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</div>");
 		}
 
 		// Prepare constant for timemark
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 6796a44b64..b540d55e8a 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -91,8 +91,8 @@ ORDER BY points DESC, last_online DESC, userid",
 			$WIN1 = ""; $WIN2 = "";
 			if ($cnt <= getConfig('bonus_ranks')) {
 				// Maybe he can win his active bonus?
-				$WIN1 = "<STRONG>";
-				$WIN2 = "</STRONG>";
+				$WIN1 = "<strong>";
+				$WIN2 = "</strong>";
 			}
 
 			// Prepare content
@@ -119,7 +119,7 @@ ORDER BY points DESC, last_online DESC, userid",
 			define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
 		} else {
 			// Display message "no manual withdraw possible"
-			define('__BONUS_WITHDRAW_FORM', "<FONT class=\"admin_failed\">".ADMIN_BONUS_ALREADY_WITHDRAW."</FONT>");
+			define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BONUS_ALREADY_WITHDRAW."</div>");
 		}
 
 		// Prepare constant for timemark
diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 239af59c82..096f1423fe 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -51,10 +51,10 @@ if (!empty($_GET['u_id'])) {
 		SQL_FREERESULT($result);
 
 		// Prepare constants
-		define('__CATS_BASE'   , "<A href=\"".URL."/modules.php?module=admin&amp;u_id=");
+		define('__CATS_BASE'   , "<a href=\"".URL."/modules.php?module=admin&amp;u_id=");
 		define('__UID'         , bigintval($_GET['u_id']));
 		define('__MEMBER_LINKS', MEMBER_ACTION_LINKS(__UID));
-		define('__EMAIL'       , "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
+		define('__EMAIL'       , "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 
 		// Ok, list categories of this user
 		$result_cats = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats ORDER BY sort", __FILE__, __LINE__);
@@ -68,8 +68,8 @@ if (!empty($_GET['u_id'])) {
 				 array(bigintval($_GET['u_id']), bigintval($cid)), __FILE__, __LINE__);
 
 				// Set selection
-				$SELECTED = "<FONT color=\"red\">".NO."</FONT>";
-				if (SQL_NUMROWS($result_user) == 1) $SELECTED = "<FONT color=\"green\">".YES."</FONT>";
+				$SELECTED = "<FONT color=\"red\">".NO."</div>";
+				if (SQL_NUMROWS($result_user) == 1) $SELECTED = "<FONT color=\"green\">".YES."</div>";
 
 				// Prepare array for the row template
 				$content = array(
diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php
index 36d767fde3..05abd6c53e 100644
--- a/inc/modules/admin/what-list_doubler.php
+++ b/inc/modules/admin/what-list_doubler.php
@@ -72,7 +72,7 @@ case "overview": // General overview page
 	{
 		// Something was payed out
 		$SUM_ALREADY += $cnt;
-		define('__DOUBLER_ALREADY_DIRECT_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct\">".$cnt."</A>");
+		define('__DOUBLER_ALREADY_DIRECT_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct\">".$cnt."</a>");
 	}
 	$result = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_doubler WHERE completed='Y' AND is_ref='Y'", __FILE__, __LINE__);
 	list($cnt) = SQL_FETCHROW($result);
@@ -87,9 +87,9 @@ case "overview": // General overview page
 	{
 		// Something was payed out
 		$SUM_ALREADY += $cnt;
-		define('__DOUBLER_ALREADY_REF_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref\">".$cnt."</A>");
+		define('__DOUBLER_ALREADY_REF_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref\">".$cnt."</a>");
 	}
-	define('__DOUBLER_ALREADY_ALL_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all\">".$SUM_ALREADY."</A>");
+	define('__DOUBLER_ALREADY_ALL_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all\">".$SUM_ALREADY."</a>");
 
 	// And the same for waiting pouts (direct and referal)
 	$result = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_doubler WHERE completed='N' AND is_ref='N'", __FILE__, __LINE__);
@@ -105,7 +105,7 @@ case "overview": // General overview page
 	{
 		// Something was payed out
 		$SUM_WAITING += $cnt;
-		define('__DOUBLER_WAITING_DIRECT_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct\">".$cnt."</A>");
+		define('__DOUBLER_WAITING_DIRECT_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct\">".$cnt."</a>");
 	}
 	$result = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_doubler WHERE completed='N' AND is_ref='Y'", __FILE__, __LINE__);
 	list($cnt) = SQL_FETCHROW($result);
@@ -120,9 +120,9 @@ case "overview": // General overview page
 	{
 		// Something was payed out
 		$SUM_WAITING += $cnt;
-		define('__DOUBLER_WAITING_REF_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref\">".$cnt."</A>");
+		define('__DOUBLER_WAITING_REF_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref\">".$cnt."</a>");
 	}
-	define('__DOUBLER_WAITING_ALL_LINK', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all\">".$SUM_WAITING."</A>");
+	define('__DOUBLER_WAITING_ALL_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all\">".$SUM_WAITING."</a>");
 
 	// All data is loaded here...
 	break;
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 2b81e0620a..dbcd8e50a2 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -100,14 +100,14 @@ if (!empty($_GET['u_id'])) {
 						$result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
 							array(bigintval($id)), __FILE__, __LINE__);
 						$type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
-						$LINK = "<A href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</A>";
+						$LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
 						break;
 
 					case "BONUS":
 						$result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
 							array(bigintval($id2)), __FILE__, __LINE__);
 						$type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
-						$LINK = "<A href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</A>";
+						$LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
 						break;
 
 					default: // Problem in application detected!
@@ -152,7 +152,7 @@ if (!empty($_GET['u_id'])) {
 				// Remember list in constant for the template
 				define('__SNAME_VALUE', $sname);
 				define('__FNAME_VALUE', $fname);
-				define('__EMAIL_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>");
+				define('__EMAIL_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</a>");
 				define('__EMAIL_LIST' , $OUT);
 				define('__NUMS_VALUE' , $nums);
 				define('__UID'        , bigintval($_GET['u_id']));
diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index a7e3bbf1ba..93cfcb49e6 100644
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -86,7 +86,7 @@ if ((EXT_IS_ACTIVE("bonus")) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
 			// Add link?
 			if ($bonus['unconfirmed'] > 0) {
 				// Add link to list_unconfirmed what-file
-				$bonus['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</A></STRONG>";
+				$bonus['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
 			} // END - if
 
 			// Prepare content
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 0acf3c9a4b..ec36f237a7 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -71,7 +71,7 @@ if (!empty($_GET['pid'])) {
 		SQL_FREERESULT($result);
 
 		// Konstante bauen
-		define('PAYOUT_USERDATA_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</A>");
+		define('PAYOUT_USERDATA_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</a>");
 
 		if (($_GET['do'] == "accept") && (!empty($email))) {
 			// Ok, now we can output the form or execute accepting
@@ -150,7 +150,7 @@ if (!empty($_GET['pid'])) {
 					}
 				} else {
 					// Cannot load payout id
-					OUTPUT_HTML("<STRONG class=\"admin_failed\">".PAYOUT_FAILED_OBTAIN_PAYOUT_ID."</STRONG>");
+					LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".PAYOUT_FAILED_OBTAIN_PAYOUT_ID."</div>");
 				}
 			} else {
 				// Load template
@@ -207,11 +207,11 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
 		while (list($pid, $uid, $total, $account, $bank, $type, $tstamp, $status, $allow, $url, $alt, $banner) = SQL_FETCHROW($result)) {
 			if ($status == "NEW") {
 				// Generate links for direct accepting and rejecting
-				$status = "<A href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$pid."\">".PAYOUT_ACCEPT_PAYOUT."</A>&nbsp;|&nbsp;<A href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$pid."\">".PAYOUT_REJECT_PAYOUT."</A>";
+				$status = "<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$pid."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$pid."\">".PAYOUT_REJECT_PAYOUT."</a>";
 			} else {
 				// Translate status
 				$status = constant('PAYOUT_STATUS_'.strtoupper($status).'');
-				$status = "<FONT class=\"admin_failed\">".$status."</FONT>";
+				$status = "<div class=\"admin_failed\">".$status."</div>";
 			}
 
 			// Nothing entered must be secured in member/what-payputs.php !
@@ -237,7 +237,7 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
 				}
 
 				// Admins can addionally test the URL for framekillers
-				$bank = "<A href=\"".FRAMETESTER($url)."\" target=\"_blank\">".CLICK_HERE."</A>";
+				$bank = "<a href=\"".FRAMETESTER($url)."\" target=\"_blank\">".CLICK_HERE."</a>";
 			} else {
 				// e-currency payout request
 				if (empty($account)) $account = "---";
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 23a3c32c59..554efeaefe 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -233,7 +233,7 @@ if (isset($_POST['edit']))
 
 			// Output row
 			$Bl = ""; $Br = "";
-			if (($opoints > 0) && ($cnt > 0)) { $Bl = "<STRONG>"; $Br = "</STRONG>"; }
+			if (($opoints > 0) && ($cnt > 0)) { $Bl = "<strong>"; $Br = "</strong>"; }
 			if (($old > 0) || ($cnt > 0))
 			{
 				// Insert link to referal list
@@ -300,7 +300,7 @@ ORDER BY start_time DESC",
 			if ($joined > 0)
 			{
 				// List joined users
-				$joined = "<A href=\"".URL."/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$id."\" title=\"".RALLYE_LIST_USERS."\">".$joined."</A>";
+				$joined = "<a href=\"".URL."/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$id."\" title=\"".RALLYE_LIST_USERS."\">".$joined."</a>";
 			}
 
 			// Alter some variables
@@ -340,7 +340,7 @@ ORDER BY start_time DESC",
 			{
 			case "Y":
 				// Rallye is active so do not edit it!
-				$content['select'] = "<STRONG class=\"big\">".$id."</STRONG>";
+				$content['select'] = "<div class=\"big\">".$id."</strong>";
 				$content['active_title'] = RALLYE_DEACTIVATE_NOW;
 				$content['active'] = 0;
 				break;
diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index 3ba95d8168..9abdf00480 100644
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -81,7 +81,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
 				array($uid), __FILE__, __LINE__);
 
 			// Output info message
-			OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<BR><BR>");
+			OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<br /><br />");
 		}
 
 		// Are there some levels (VERY BAD IF NONE!)
@@ -146,7 +146,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
 									'refs_link'  => "0",
 									'surname'    => $data['surname'],
 									'family'     => $data['family'],
-									'email'      => "[<A href=\"".CREATE_EMAIL_LINK($data['email'], "user_data")."\">".$data['email']."</A>]",
+									'email'      => "[<a href=\"".CREATE_EMAIL_LINK($data['email'], "user_data")."\">".$data['email']."</a>]",
 									'status'     => TRANSLATE_STATUS($data['status']),
 									'registered' => MAKE_DATETIME($data['joined'], "3"),
 								);
@@ -198,7 +198,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
 						'refs_link'  => "0",
 						'surname'    => $levels['surname'],
 						'family'     => $levels['family'],
-						'email'      => "[<A href=\"".CREATE_EMAIL_LINK($levels['email'], "user_data")."\">".$levels['email']."</A>]",
+						'email'      => "[<a href=\"".CREATE_EMAIL_LINK($levels['email'], "user_data")."\">".$levels['email']."</a>]",
 						'status'     => TRANSLATE_STATUS($levels['status']),
 						'registered' => MAKE_DATETIME($levels['joined'], "3"),
 					);
diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 3845af644a..8d46591038 100644
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -131,7 +131,7 @@ WHERE refid='%s' ORDER BY id",
 			SQL_FREERESULT($result);
 		} else {
 			// No refs made so far
-			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_REFS_404_1."<A href=\"".URL."/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</A>".ADMIN_SPONSOR_REFS_404_2);
+			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_REFS_404_1."<a href=\"".URL."/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</a>".ADMIN_SPONSOR_REFS_404_2);
 		}
 	} else {
 		// Sponsor not found
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 8370a1c19d..dff8a1df47 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -132,7 +132,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			if ($admin == "0")
 			{
 				// No admin currently is assigned
-				$admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
+				$admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
 			}
 			 else
 			{
@@ -141,12 +141,12 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				if ($login != "***")
 				{
 					// Admin found
-					$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+					$admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
 				}
 				 else
 				{
 					// Maybe deleted?
-					$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+					$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
 				}
 			}
 
@@ -169,7 +169,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				$uid = ADMIN_USER_PROFILE_LINK($uid);
 			} else {
 				// Is a system task!
-				$uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
+				$uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
 			}
 
 			// Prepare content
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index a6bdba6c38..85b939cc80 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -130,7 +130,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 					'uid'    => $uid,
 					'link'   => $LINK,
 					'id'     => $ID,
-					'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>",
+					'email'  => "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>",
 					'status' => TRANSLATE_STATUS($status),
 				);
 
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 9b15ec8843..ddec04ffa8 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -90,7 +90,7 @@ if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL
-$BASE = "[<A href=\"".URL."/modules.php?module=admin";
+$BASE = "[<a href=\"".URL."/modules.php?module=admin";
 
 if (!empty($_GET['u_id'])) {
 	// Secure the user ID
@@ -112,11 +112,11 @@ LIMIT 1",
 		$LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
 
 		// Add links to the numbers
-		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
-		if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</A>]";
+		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</a>]";
+		if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</a>]";
 		if (empty($DATA['last_module'])) $DATA['last_module'] = "---";
-		if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</A>]";
-		if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</A>]";
+		if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</a>]";
+		if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</a>]";
 
 		// Calculate timestamp for birthday
 		$stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']);
@@ -140,7 +140,7 @@ LIMIT 1",
 		$DATA['status']            = TRANSLATE_STATUS($DATA['status']);
 		$DATA['last_online']       = MAKE_DATETIME($DATA['last_online'], "0");
 		$DATA['used_points']       = TRANSLATE_COMMA($DATA['used_points']);
-		if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</A>]";
+		if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</a>]";
 		$DATA['joined']            = MAKE_DATETIME($DATA['joined'], "0");
 		$DATA['last_update']       = MAKE_DATETIME($DATA['last_update'], "0");
 		$DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
@@ -299,10 +299,10 @@ LIMIT 1",
 
 			// Get number of unconfirmed mails
 			$LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", "userid", true);
-			if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+			if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</a>]";
 
 			// Set link to sent mails if present
-			if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</A>]";
+			if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</a>]";
 
 			// Add nickname
 			if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
@@ -320,7 +320,7 @@ LIMIT 1",
 			$content['sw']     = $SW;
 			$content['uid']    = ADMIN_USER_PROFILE_LINK($content['userid']);
 			$content['gender'] = TRANSLATE_GENDER($content['gender']);
-			$content['email']  = "[<A href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</A>]";
+			$content['email']  = "[<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>]";
 			$content['addr']   = $content['REMOTE_ADDR'];
 			$content['links']  = $LINKS;
 			$content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 67c9db27b6..f6e5c99c82 100644
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -82,7 +82,7 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
 	// Error received so prepare error code
 	$code = explode(" ", $result[0]['id']);
 	$code = $code[0];
-	$code = explode("<br>", $code);
+	$code = explode("<br />", $code);
 	$code = $code[0];
 
 	// Output message
diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index adcc4407a2..96d40ae5b0 100644
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -96,7 +96,7 @@ if (!empty($_GET['id'])) {
 				}
 
 				// Create email link
-				define('__EMAIL_LINK', "<A href=\"mailto:".$email."\">".__GENDER." ".__SURNAME." ".__FAMILY."</A>");
+				define('__EMAIL_LINK', "<a href=\"mailto:".$email."\">".__GENDER." ".__SURNAME." ".__FAMILY."</a>");
 
 				// Display form
 				LOAD_TEMPLATE("admin_lock_sponsor");
diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index a658027875..7781051d71 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -156,7 +156,7 @@ if (!empty($_GET['u_id'])) {
 				LOAD_TEMPLATE("admin_lock_user");
 			} else {
 				// Account does not exists!
-				OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 			}
 		}
 
@@ -167,14 +167,14 @@ if (!empty($_GET['u_id'])) {
 		} elseif ($ACT) {
 			// An action was performed...
 			if (!empty($MSG)) {
-				LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_green\">".$MSG."</STRONG>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$MSG."</div>");
 			} else {
-				LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_green\">".ADMIN_USER_UPDATED."</STRONG>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".ADMIN_USER_UPDATED."</div>");
 			}
 		}
 	} else {
 		// Account does not exists!
-		OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
 	}
 } else {
 	// List all users
diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index ff8ffde4cb..7291af2c21 100644
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -137,15 +137,15 @@ if (!isset($_POST['ok']))
 		}
 	}
 
-	$OUT = "<SELECT class=\"admin_select\" name=\"sort\" size=\"1\">
-      <OPTION value=\"\">".IS_FIRST_MENU."</OPTION>";
+	$OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
+      <option value=\"\">".IS_FIRST_MENU."</option>";
   	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
 			foreach ($m as $key2 => $m2)
 			{
-				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
+				$OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
 				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
@@ -153,15 +153,15 @@ if (!isset($_POST['ok']))
 						$OUT .= " (".$titles[$k].")";
 					}
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 		}
 		 else
 		{
-			$OUT .= "      <OPTION value=\"".$m."\">".$titles[$key]."</OPTION>\n";
+			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
 		}
 	}
-	$OUT .= "</SELECT>";
+	$OUT .= "</select>";
 
 	define('__BELOW_SELECTION' , $OUT);
 	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("member", "what", "name"));
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index e560bf92e4..4a73f65a08 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -277,17 +277,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
 			{
 				// Is highest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 			 elseif ($cnt == $max)
 			{
 				// Is lowest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
 			}
 			 elseif ($sort > 0)
 			{
 				// Anything else between highest and lowest
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
 			}
 			if (empty($act))   $act   = "&nbsp;";
 			if (empty($wht))   $wht   = "&nbsp;";
diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 0bb91c5709..062937607b 100644
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -60,7 +60,7 @@ foreach ($DATA['tables'] as $row_array)
 
 	if ($row_array[4] > 0) {
 		$OPT = OPTIMIZE_STATUS_OPTIMIZED;
-		$B1 = "<STRONG>"; $B2 = "<STRONG>";
+		$B1 = "<strong>"; $B2 = "<strong>";
 		$gain_tabs++;
 	} elseif (count(explode(" ", $row_array[2])) == 0) {
 		$OPT = constant('OPTIMIZE_STATUS_'.strtoupper($row_array[2]).'');
diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index d6b4f9df30..f744849d10 100644
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -77,10 +77,10 @@ if (isset($_POST['ok'])) {
 	if (count($SQLs) > 0) {
 		// Run all queries
 		RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
-		$content = "<SPAN class=\"admin_failed\">".SETTINGS_SAVED."</SPAN>";
+		$content = "<span class=\"admin_failed\">".SETTINGS_SAVED."</span>";
 	} else {
 		// Nothing has changed!
-		$content = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+		$content = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
 	}
 
 	// Output template
diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 7de1f9d38e..68abbb0486 100644
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -87,7 +87,7 @@ VALUES ('%s','%s','%s')",
 	if (SQL_AFFECTEDROWS() == 1) {
 		$content = SETTINGS_SAVED;
 	} else {
-		$content = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+		$content = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
 	}
 	LOAD_TEMPLATE("admin_settings_saved", false, $content);
 } elseif (($SEL > 0) && (isset($_POST['edit']))) {
diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php
index a1674730d4..66e6dae316 100644
--- a/inc/modules/admin/what-repair_cats.php
+++ b/inc/modules/admin/what-repair_cats.php
@@ -66,11 +66,11 @@ if (SQL_NUMROWS($result) > 0) {
 		$content = ADMIN_REPAIR_ENTRIES_FIXED_1.$REMOVED.ADMIN_REPAIR_ENTRIES_FIXED_2;
 	} else {
 		// Nothing repaired
-		$content = "<FONT class=\"admin_failed\">".ADMIN_REPAIR_NOTHING_FIXED."</FONT>";
+		$content = "<div class=\"admin_failed\">".ADMIN_REPAIR_NOTHING_FIXED."</div>";
 	}
 } else {
 	// No category selections found, no members registered?
-	$content = "<STRONG class=\'admin_failed\">".ADMIN_REPAIR_CATS_NOTHING."</STRONG>";
+	$content = "<div class=\'admin_failed\">".ADMIN_REPAIR_CATS_NOTHING."</div>";
 }
 
 // Load template
diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php
index 4380734071..0f160adf3f 100644
--- a/inc/modules/admin/what-stats_mods.php
+++ b/inc/modules/admin/what-stats_mods.php
@@ -92,7 +92,7 @@ if (($_GET['mod'] == "index") || ($_GET['mod'] == "login"))
 		if (($mod == "index") || ($mod == "login"))
 		{
 			// Add link to detail statistics
-			$mod = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</A></STRONG>";
+			$mod = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";
 		}
 		// Prepare array for the template
 		$content = array(
diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 21ec6166ee..a09a2a31c1 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -95,14 +95,12 @@ if ($_GET['u_id'] == "all")
 	// User ID found in URL so we use this give him some credits
 	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
 	 array(bigintval($_GET['u_id'])),__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+	if (SQL_NUMROWS($result) == 1) {
 		// Selected user does exist
 		list($sname, $fname, $email) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
-		if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
-		{
+		if ((isset($_POST['ok'])) && (!empty($_POST['points']))) {
 			// Ok, add to used points and send an email to him...
 			SUB_POINTS("admin_single", bigintval($_GET['u_id']), $_POST['points']);
 
@@ -118,23 +116,17 @@ if ($_GET['u_id'] == "all")
 
 			// Output message
 			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_SUBTRACTED);
-		}
-		 else
-		{
+		} else {
 			// Opps, missing form here
-			define('__USER_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
+			define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 			define('__UID', bigintval($_GET['u_id']));
 			LOAD_TEMPLATE("admin_sub_points");
 		}
-	}
-	 else
-	{
+	} else {
 		// User not found!
-		OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</strong>");
 	}
-}
- else
-{
+} else {
 	// Output selection form with all confirmed user accounts listed
 	ADD_MEMBER_SELECTION_BOX("0", true);
 }
diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index e29ae53c25..a7e9eee70f 100644
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -119,9 +119,11 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 		foreach ($THEMES['fname'] as $idx => $name) {
 			// Generate download link
 			$LINK = SERVER_URL."/themes/theme-".$name.".zip";
+
+			// @TODO Move this HTML code to a template "admin_theme_row"
 			$OUT .= "<TR>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".($idx + 1).".</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\"><A href=\"".$LINK."\">".$name."</A></TD>
+  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\"><a href=\"".$LINK."\">".$name."</a></TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".MAKE_DATETIME($THEMES['fctime'][$idx], "2")."</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".TRANSLATE_COMMA(round($THEMES['fsize'][$idx] / 1.024) / 1000)." ".KBYTES."</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">".$THEMES['ver'][$idx]." (".$THEMES['cver'][$idx].")</TD>
@@ -129,7 +131,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 <TR>
   <TD class=\"switch_sw".$SW." bottom2\">&nbsp;</TD>
   <TD colspan=\"4\" class=\"switch_sw".$SW." bottom2\">
-    <FONT class=\"tiny\">".$THEMES['infos'][$idx]."</FONT>
+    <div class=\"tiny\">".$THEMES['infos'][$idx]."</div>
   </TD>
 </TR>\n";
 			$TSIZE += $THEMES['fsize'][$idx];
@@ -147,7 +149,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 	}
 } else {
 	// No theme where found
-	LOAD_TEMPLATE("admin_theme_404");
+	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_THEME_NOTHING_FOUND);
 }
 
 //
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index ef64b51412..0feb999a63 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -106,7 +106,7 @@ if (SQL_NUMROWS($result) > 0) {
 
 		// Is the loaded theme name != current theme name?
 		$LINK = $unix;
-		if ($unix != GET_CURR_THEME()) $LINK = "<A href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</A>";
+		if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</a>";
 
 		// Prepare data for the row template
 		$content = array(
@@ -116,7 +116,7 @@ if (SQL_NUMROWS($result) > 0) {
 			'link'      => $LINK,
 			'name'      => $name,
 			'is_act'    => TRANSLATE_YESNO($active),
-			'email'     => "<A href=\"mailto:".$THEME_EMAIL."?Subject=[Theme:] ".$THEME_NAME." (".$unix.")"."\">".$THEME_AUTHOR."</A>",
+			'email'     => "<a href=\"mailto:".$THEME_EMAIL."?Subject=[Theme:] ".$THEME_NAME." (".$unix.")"."\">".$THEME_AUTHOR."</a>",
 			'url_link'  => DEREFERER($THEME_URL),
 			'url_title' => $THEME_URL,
 			'ver'       => $ver,
diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 871e94ac42..c56245e4ee 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -123,13 +123,13 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Check if current theme is already imported or not
 	if (THEME_CHECK_EXIST($unix)) {
 		// Already installed
-		$FOUND = "<FONT class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</FONT>";
+		$FOUND = "<div class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</div>";
 	} else {
 		// Theme not installed
-		$FOUND = "<FORM action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
+		$FOUND = "<form action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
   <INPUT type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"".ADMIN_INSTALL_THEME."\">
   <INPUT type=\"hidden\" name=\"theme\" value=\"".$unix."\">
-</FORM>";
+</form>";
 	}
 
 	// Add row
@@ -137,10 +137,10 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">".$unix."</TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <A href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</A>
+    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</a>
   </TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <A href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</A>
+    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
   </TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</TD>
   <TD class=\"switch_sw".$SW." bottom2\" align=\"center\">
diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index efff80d7fb..94306fe016 100644
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -123,7 +123,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 // Is a newer version available?
 if (empty($ONLINE['version'])) {
 	// Disconnected?
-	LOAD_TEMPLATE("admin_settings_saved", false, "<FONT class=\"admin_failed\">".ADMIN_CANNOT_CHECK_VERSION." (".$ONLINE['code'].")</FONT>");
+	LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_CANNOT_CHECK_VERSION." (".$ONLINE['code'].")</div>");
 } elseif (($ONLINE['version'] != FULL_VERSION) || ($ONLINE['revision'] != CURR_SVN_REVISION)) {
 	// New full-version available (all previous released patches are included in this version!)
 	define('__ONLINE_VERSION', $ONLINE['version']);
diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php
index ca6809212e..e45270f04e 100644
--- a/inc/modules/admin/what-user_online.php
+++ b/inc/modules/admin/what-user_online.php
@@ -49,24 +49,24 @@ OUTPUT_HTML("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"cen
 <TR><TD colspan=\"5\" height=\"7\" class=\"seperator admin_title\">&nbsp;</TD></TR>
 <TR>
   <TD colspan=\"3\" class=\"admin_title\" align=\"center\">
-    <STRONG>".USER_NOW_ONLINE."</STRONG>
+    <strong>".USER_NOW_ONLINE."</strong>
   </TD>
 </TR>
 <TR><TD colspan=\"5\" height=\"7\" class=\"seperator admin_title\">&nbsp;</TD></TR>
 <TR>
-  <TD width=\"85%\" class=\"top2 bottom2\" align=\"right\"><FONT class=\"medium\">".GUESTS_ONLINE.":</FONT></TD>
+  <TD width=\"85%\" class=\"top2 bottom2\" align=\"right\"><div class=\"medium\">".GUESTS_ONLINE.":</div></TD>
   <TD width=\"5%\" class=\"top2 bottom2\">&nbsp;</TD>
-  <TD width=\"10%\" class=\"top2 bottom2\"><B>".SQL_NUMROWS($result_guests)."</B></TD>
+  <TD width=\"10%\" class=\"top2 bottom2\"><strong>".SQL_NUMROWS($result_guests)."</strong></TD>
 </TR>
 <TR>
-  <TD width=\"85%\" class=\"bottom2\" align=\"right\"><FONT class=\"medium\">".MEMBERS_ONLINE.":</FONT></TD>
+  <TD width=\"85%\" class=\"bottom2\" align=\"right\"><div class=\"medium\">".MEMBERS_ONLINE.":</div></TD>
   <TD width=\"5%\" class=\"bottom2\">&nbsp;</TD>
-  <TD width=\"10%\" class=\"bottom2\"><B>".SQL_NUMROWS($result_members)."</B></TD>
+  <TD width=\"10%\" class=\"bottom2\"><strong>".SQL_NUMROWS($result_members)."</strong></TD>
 </TR>
 <TR>
-  <TD width=\"85%\" align=\"right\"><FONT class=\"medium\">".ADMINS_ONLINE.":</FONT></TD>
+  <TD width=\"85%\" align=\"right\"><div class=\"medium\">".ADMINS_ONLINE.":</div></TD>
   <TD width=\"5%\">&nbsp;</TD>
-  <TD width=\"10%\"><B>".SQL_NUMROWS($result_admins)."</B></TD>
+  <TD width=\"10%\"><strong>".SQL_NUMROWS($result_admins)."</strong></TD>
 </TR>
 </TABLE><br />");
 
@@ -98,7 +98,7 @@ if (SQL_NUMROWS($result) > 0)
   <TD align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">");
 		if ($userid > 0)
 		{
-			OUTPUT_HTML("<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".$userid."\">".$userid."</A>");
+			OUTPUT_HTML("<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".$userid."\">".$userid."</a>");
 		}
 		else
 		{
@@ -106,7 +106,7 @@ if (SQL_NUMROWS($result) > 0)
 		}
 		if ($refid > 0)
 		{
-			$refid = "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".$refid."\">".$refid."</A>";
+			$refid = "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".$refid."\">".$refid."</a>";
 		}
 		OUTPUT_HTML("</TD>
   <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$ip."</TD>
diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 947753f18a..7ac28c72c7 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -102,7 +102,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
 		break;
 
 	case "test_top":
-		OUTPUT_HTML("<STRONG class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</SPAN>");
+		OUTPUT_HTML("<div class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</span>");
 		break;
 
 	case "back": // Back buttom
diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 810f1ab52b..e0e3a0768d 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -60,7 +60,7 @@ if ($num_themes > 1) {
 	$OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
 	// If there is no theme installed and there's an admin notify him!
-	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<FONT class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</FONT>");
+	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
 }
 
 // Remember
diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 0d0b12a4dd..728d080be9 100644
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -175,9 +175,9 @@ define('__REF_CLICKS', $clicks);
 //
 
 // Initialize Variables
-$OUT_EXTRA   = ""; $rowNameS_EXTRA   = 2;
-$OUT_POINTS  = ""; $rowNameS_POINTS  = 2;
-$OUT_USER    = ""; $rowNameS_USER    = 6;
+$OUT_EXTRA   = ""; $ROWS_EXTRA   = 2;
+$OUT_POINTS  = ""; $ROWS_POINTS  = 2;
+$OUT_USER    = ""; $ROWS_USER    = 6;
 $OUT_SPECIAL = ""; // We don't need row count here
 
 if (EXT_IS_ACTIVE("beg")) {
@@ -191,7 +191,7 @@ if (EXT_IS_ACTIVE("beg")) {
 		'value' => $extra
 	);
 	$OUT_EXTRA .= LOAD_TEMPLATE("mediadata_extra_row", true, $content);
-	$rowNameS_EXTRA++;
+	$ROWS_EXTRA++;
 }
 
 if (EXT_IS_ACTIVE("doubler")) {
@@ -251,7 +251,7 @@ WHERE d.holiday_active='Y'",
 		'value' => $holiday
 	);
 	$OUT_USER .= LOAD_TEMPLATE("mediadata_extra_row", true, $content);
-	$rowNameS_USER++;
+	$ROWS_USER++;
 }
 
 if (EXT_IS_ACTIVE("transfer")) {
@@ -303,9 +303,9 @@ define('__EXTRA_MEDIADATA'  , $OUT_EXTRA);
 define('__POINTS_MEDIADATA' , $OUT_POINTS);
 define('__USER_MEDIADATA'   , $OUT_USER);
 define('__SPECIAL_MEDIADATA', $OUT_SPECIAL);
-define('__ROWSPAN_EXTRA'    , $rowNameS_EXTRA);
-define('__ROWSPAN_POINTS'   , $rowNameS_POINTS);
-define('__ROWSPAN_USER'     , $rowNameS_USER);
+define('__ROWSPAN_EXTRA'    , $ROWS_EXTRA);
+define('__ROWSPAN_POINTS'   , $ROWS_POINTS);
+define('__ROWSPAN_USER'     , $ROWS_USER);
 
 // Patch level and it's timespamp
 define('__PATCH_LEVEL', getConfig('patch_level'));
diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index fc616fb5ac..1687cac3fd 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-OUTPUT_HTML("<DIV align=\"center\">");
+OUTPUT_HTML("<div align=\"center\">");
 
 // Check for possible running rallyes
 $ADMIN = " AND d.is_active='Y'";
@@ -73,10 +73,10 @@ if (SQL_NUMROWS($result) == 1)
 	}
 	 else
 	{
-		define('__RALLYE_EXTRAS', "<A href=\"".URL."/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</A>");
+		define('__RALLYE_EXTRAS', "<a href=\"".URL."/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</a>");
 	}
 	// Set admin line (currently set to impressum, later to contact form)
-	define('__RALLYE_ADMIN', "<A href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</A>");
+	define('__RALLYE_ADMIN', "<a href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
 
 	// Set title
 	define('__RALLYE_TITLE', COMPILE_CODE($title));
@@ -121,7 +121,7 @@ if (SQL_NUMROWS($result) == 1)
 	if ($expired)
 	{
 		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
-		define('__RALLYE_TOP_USERS', "<DIV align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</DIV>");
+		define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</div>");
 		define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
 	}
 	 else
@@ -140,6 +140,6 @@ if (SQL_NUMROWS($result) == 1)
 	LOAD_TEMPLATE("guest_no_rallyes");
 }
 //
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
 //
 ?>
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index f17a36cb82..e7318bdfd3 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -365,45 +365,45 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
 } else {
 	if ($_POST['agree'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".HAVE_TO_AGREE."</span></strong><br /><br />");
 	} // END - if
 
 	if ($_POST['addy'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_EMAIL."</span></strong><br /><br />");
 		$_POST['addy'] = "";
 	} elseif ($_POST['addy'] == "?") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".EMAIL_ALREADY_DB."</span></strong><br /><br />");
 		$_POST['addy'] = "";
 	}
 
 	if ($_POST['surname'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_SURNAME."</span></strong><br /><br />");
 		$_POST['surname'] = "";
 	} // END - if
 
 	if ($_POST['family_name'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_FAMILY."</span></strong><br /><br />");
 		$_POST['family_name'] = "";
 	} // END - if
 
 	if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</span></strong><br /><br />");
 	} elseif ($_POST['pass1'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_PASS1."</span></strong><br /><br />");
 	} elseif ($_POST['pass2'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".ENTER_PASS2."</span></strong><br /><br />");
 	}
 
 	if ($SHORT_PASS) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</span></strong><br /><br />");
 	} // END - if
 
 	if ($IP_TIMEOUT) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</span></strong><br /><br />");
 	} // END - if
 
 	if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<strong><span class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</span></strong><br /><br />");
 	} // END - if
 
 	// Generate birthday selection
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index cb67895a30..3de41a33a0 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -297,7 +297,7 @@ ORDER BY pay_name", __FILE__, __LINE__);
 			$OUT .= "<TR>
   <TD class=\"bottom2 switch_sw".$SW."\" height=\"50\" style=\"padding-left: 2px; padding-right: 2px\">
     <INPUT type=\"radio\" name=\"pay_type\" class=\"guest_normal\" value=\"".bigintval($id)."\">&nbsp;".$name."<br />
-    <DIV align=\"right\">(".$min." ".$curr." = ".TRANSLATE_COMMA($rate * $min)." ".POINTS.")</DIV>
+    <div align=\"right\">(".$min." ".$curr." = ".TRANSLATE_COMMA($rate * $min)." ".POINTS.")</div>
   </TD>
 </TR>\n";
 			$SW = 3 - $SW;
@@ -364,14 +364,14 @@ ORDER BY pay_name", __FILE__, __LINE__);
 
 			// Errors found
 			$OUT = "<P align=\"center\">
-  <STRONG><FONT class=\"guest_failed\">".SPONSOR_REGISTER_SOMETHING_MISSING.":</FONT></STRONG><br />
+  <strong><div class=\"guest_failed\">".SPONSOR_REGISTER_SOMETHING_MISSING.":</div></strong><br />
 </P>
-<OL>\n";
+<ol>\n";
 			foreach ($FORM_ERRORS as $error) {
-				$OUT .= "<LI>".$error."</LI>\n";
+				$OUT .= "<li>".$error."</li>\n";
 			} // END - if
 
-			$OUT .= "</OL><br />\n";
+			$OUT .= "</ol><br />\n";
 			define('__SPONSOR_FORM_ERRORS', $OUT);
 			define('__SPONSOR_REFID', $_POST['refid']);
 		} else {
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index c7cfbdd3bc..b6aaca1d60 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -173,7 +173,7 @@ case "MODULES": // TOP10 module clicks
 		// Output header
 		OUTPUT_HTML("<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
 <TR>
-  <TD align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><STRONG>".GUEST_TOPTEN_STATS."</STRONG></TD>
+  <TD align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><strong>".GUEST_TOPTEN_STATS."</strong></TD>
 </TR>");
 	}
 
@@ -213,14 +213,14 @@ case "MODULES": // TOP10 module clicks
 	{
 		// Output footer
 		OUTPUT_HTML("<TR>
-  <TD align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><A href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</A></TD>
+  <TD align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><a href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</a></TD>
 </TR>
 </TABLE>");
 	}
 	break;
 
 case "INACTIVE": // Deactivated stats
-	LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG>".GUEST_STATS_DEACTIVATED."</STRONG>");
+	LOAD_TEMPLATE("admin_settings_saved", false, "<strong>".GUEST_STATS_DEACTIVATED."</strong>");
 	break;
 }
 
diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index eb6491c642..f97690f2f7 100644
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -46,7 +46,7 @@ require_once(PATH."inc/rdf.class.php");
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-OUTPUT_HTML("<DIV style=\"padding-left: 10px; padding-right: 10px\">");
+OUTPUT_HTML("<div style=\"padding-left: 10px; padding-right: 10px\">");
 $rdf = new fase4_rdf;
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(PATH."inc/cache/");
@@ -76,7 +76,7 @@ if ((getConfig('proxy_host') != "") && (getConfig('proxy_port') > 0)) {
 $rdf->parse_RDF("http://www.wds66.com/rss.xml");
 $rdf->finish();
 // DISABLED: $rdf->clear_cache();
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
 
 //
 ?>
diff --git a/inc/modules/index.php b/inc/modules/index.php
index eae4c4c111..742fc6c5aa 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -57,7 +57,7 @@ if (!empty($_GET['msg'])) {
 	// Which message shall we output?
 	switch ($_GET['msg']) {
 		case CODE_LOGOUT_DONE      : $msg = LOGOUT_DONE; break;
-		case CODE_LOGOUT_FAILED    : $msg = "<SPAN class=\"guest_failed\">".LOGOUT_FAILED."</SPAN>"; break;
+		case CODE_LOGOUT_FAILED    : $msg = "<span class=\"guest_failed\">".LOGOUT_FAILED."</span>"; break;
 		case CODE_DATA_INVALID     : $msg = MAIL_DATA_INVALID; break;
 		case CODE_POSSIBLE_INVALID : $msg = MAIL_POSSIBLE_INVALID; break;
 		case CODE_ACCOUNT_LOCKED   : $msg = MEMBER_ACCOUNT_LOCKED_UNC; break;
diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 9e39e3e1f8..1135235c6a 100644
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -63,7 +63,7 @@ if ($num_themes > 1) {
 	$OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
 	// If there is no theme installed and there's an admin notify him!
-	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<FONT class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</FONT>");
+	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
 }
 
 // Remember
diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index cdd6f8a8fb..df2c5a3fca 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -79,7 +79,7 @@ case "show": // Show his data
 	if ((($DATA[13] + getConfig('profile_lock')) > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0))
 	{
 		// You cannot change your account
-		define('CHANGE', "<FONT class=\"member_failed\">".MEMBER_PROFILE_LOCKED_1.MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0").MEMBER_PROFILE_LOCKED_2."</FONT>");
+		define('CHANGE', "<div class=\"member_failed\">".MEMBER_PROFILE_LOCKED_1.MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0").MEMBER_PROFILE_LOCKED_2."</div>");
 	}
 	 else
 	{
@@ -174,11 +174,11 @@ FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 
 		if (EXT_IS_ACTIVE("country")) {
 			// Generate selection box
-			$OUT  = "<SELECT name=\"country_code\" class=\"member_select\" size=\"1\">\n";
+			$OUT  = "<select name=\"country_code\" class=\"member_select\" size=\"1\">\n";
 			$whereStatement = "WHERE is_active='Y'";
 			if (IS_ADMIN()) $whereStatement = "";
 			$OUT .= ADD_OPTION_LINES("countries", "id", "descr", $DATA[3], "code", $whereStatement);
-			$OUT .= "</SELECT>";
+			$OUT .= "</select>";
 			define('__COUNTRY_CONTENT', $OUT);
 		} else {
 			// Ouput default input box
diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 490ab2a768..272938728a 100644
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -83,7 +83,7 @@ if ($VALID) {
 
 	// Do we have already submit the form?
 	if (!empty($_POST['nickname'])) {
-		OUTPUT_HTML("<STRONG class=\"member_failed\">".NICKNAME_IS_INVALID."</STRONG><P></P>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".NICKNAME_IS_INVALID."</div");
 	} // END - if
 
 	// Load Template
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index eb5511c230..8d13c9051e 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -620,9 +620,9 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					// Pre-output categories
 					$CAT = "";
 					foreach ($CATS['id'] as $key => $value) {
-						$CAT .= "      <OPTION value=\"".$value."\"";
+						$CAT .= "      <option value=\"".$value."\"";
 						if (($OLD_ORDER) && ($cat == $value)) $CAT .= " selected=\"selected\"";
-						$CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
+						$CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</option>\n";
 					} // END - foreach
 
 					// Mail type
@@ -631,9 +631,9 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						$P = TRANSLATE_COMMA($typeS[$key][1]);
 						if (is_array($value)) {
 							// Output option line
-							$type .= "      <OPTION value=\"".$typeS[$key][0]."\"";
+							$type .= "      <option value=\"".$typeS[$key][0]."\"";
 							if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= " selected=\"selected\"";
-							$type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</OPTION>\n";
+							$type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</option>\n";
 						} // END - if
 					} // END - foreach
 
@@ -700,15 +700,15 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				}
 			} else {
 				// No mail types defined
-				OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
+				OUTPUT_HTML("<strong><span class=\"member_failed\">".MEMBER_NO_PAYMENTS."</span></strong>");
 			}
 		} else {
 			// No points left!
-			OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
+			OUTPUT_HTML("<strong><span class=\"member_failed\">".MEMBER_NO_POINTS."</span></strong>");
 		}
 	} else {
 		// No cateogries are defined yet
-		OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+		OUTPUT_HTML("<strong><span class=\"member_failed\">".MEMBER_NO_CATS."</span></strong>");
 	}
 } elseif ($mmails == "0") {
 	// Please set more than 0 mails per day!
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index a95a877735..0aebb866e3 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -107,7 +107,7 @@ ORDER BY p.payout_timestamp DESC",
 			{
 				// Translate status
 				$status = constant('PAYOUT_MEMBER_STATUS_'.strtoupper($status).'');
-				$status = "<FONT class=\"member_failed\">".$status."</FONT>";
+				$status = "<div class=\"member_failed\">".$status."</div>";
 
 				// Nothing entered must be secured in member/what-payputs.php !
 				if ($allow == "Y")
@@ -123,7 +123,7 @@ ORDER BY p.payout_timestamp DESC",
 						// Textlink
 						$account = $alt;
 					}
-					$bank = "<A href=\"".DEREFERER($url)."\" target=\"_blank\">".CLICK_HERE."</A>";
+					$bank = "<a href=\"".DEREFERER($url)."\" target=\"_blank\">".CLICK_HERE."</a>";
 				}
 				 else
 				{
diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 05e609467b..673401e1c4 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 
-OUTPUT_HTML("<DIV align=\"center\">");
+OUTPUT_HTML("<div align=\"center\">");
 
 // Check for possible running rallyes
 $ADMIN = " AND d.is_active='Y'";
@@ -75,10 +75,10 @@ if (SQL_NUMROWS($result) == 1)
 	}
 	 else
 	{
-		define('__RALLYE_EXTRAS', "<A href=\"".URL."/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</A>");
+		define('__RALLYE_EXTRAS', "<a href=\"".URL."/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</a>");
 	}
 	// Set admin line (currently set to impressum, later to contact form)
-	define('__RALLYE_ADMIN', "<A href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</A>");
+	define('__RALLYE_ADMIN', "<a href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
 
 	// Set title
 	define('__RALLYE_TITLE', COMPILE_CODE($title));
@@ -123,7 +123,7 @@ if (SQL_NUMROWS($result) == 1)
 	if ($expired)
 	{
 		define('__RALLYE_PRICES', RALLYE_LIST_WINNERS($id));
-		define('__RALLYE_TOP_USERS', "<DIV align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</DIV>");
+		define('__RALLYE_TOP_USERS', "<div align=\"center\" class=\"big\">".__RALLYE_EXTRAS."</div>");
 		define('__RALLYE_CAN_WIN_THIS', RALLYE_OUR_WINNERS_ARE);
 	}
 	 else
@@ -142,6 +142,6 @@ if (SQL_NUMROWS($result) == 1)
 	LOAD_TEMPLATE("guest_no_rallyes");
 }
 //
-OUTPUT_HTML("</DIV>");
+OUTPUT_HTML("</div>");
 //
 ?>
diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index eaf8e39298..bb9fe814be 100644
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -48,8 +48,8 @@ $result = SQL_QUERY_ESC("SELECT ref_clicks FROM `"._MYSQL_PREFIX."_user_data` WH
 list($c) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
-OUTPUT_HTML("<FONT class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<br />
-<STRONG><A href=\"".URL."/ref.php?refid=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</A></STRONG><br />
+OUTPUT_HTML("<div class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<br />
+<strong><a href=\"".URL."/ref.php?refid=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</a></strong><br />
 <br />");
 
 if (EXT_IS_ACTIVE("nickname")) {
@@ -59,17 +59,17 @@ if (EXT_IS_ACTIVE("nickname")) {
 	if (!empty($nick)) {
 		// Display nickname link
 		OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<br />
-<STRONG><A href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</A></STRONG><br />
+<strong><a href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</a></strong><br />
 <br />");
 	} else {
 		// Display link to nickname form
-		OUTPUT_HTML("<STRONG class=\"guest_note\">".NO_NICKNAME_SET."</STRONG><br />
-<A class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</A>");
+		OUTPUT_HTML("<div class=\"guest_note\">".NO_NICKNAME_SET."</strong><br />
+<a class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</a>");
 	}
 }
 
 // Clicks on your reflink
-OUTPUT_HTML(YOUR_REFCLICKS.": <STRONG>".$c."</STRONG> ".CLICKS."</FONT><br /><br />");
+OUTPUT_HTML(YOUR_REFCLICKS.": <strong>".$c."</strong> ".CLICKS."</div><br /><br />");
 $whereStatement = " WHERE visible='Y'";
 if (IS_ADMIN()) $whereStatement = "";
 $result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM "._MYSQL_PREFIX."_refbanner", __FILE__, __LINE__);
diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index bca190b2af..0fbc6c94c6 100644
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -109,10 +109,10 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
   </TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <A href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</A>
+    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</a>
   </TD>
   <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <A href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</A>
+    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
   </TD>
   <TD class=\"switch_sw".$SW." bottom2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</TD>
 </TR>\n";
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index abb2c5677e..e1516ea152 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load data
 $result = SQL_QUERY_ESC("SELECT opt_in FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+	array($GLOBALS['userid']), __FILE__, __LINE__);
 list($opt_in) = SQL_FETCHROW($result);
 
 // Free memory
@@ -68,17 +68,13 @@ case "new": // Start new transfer
 	// Remember maximum value for template
 	define('__TRANSFER_MAX_VALUE', round($total - getConfig('transfer_balance') - 0.5));
 
-	if (isset($_POST['ok']))
-	{
+	if (isset($_POST['ok'])) {
 		// Add new transfer
-		if (getConfig('transfer_code') > 0)
-		{
+		if (getConfig('transfer_code') > 0) {
 			// Check for code
 			$code = GEN_RANDOM_CODE(getConfig('transfer_code'), $_POST['code_chk'], $GLOBALS['userid'], __TRANSFER_MAX_VALUE);
 			$valid_code = ($code == $_POST['code']);
-		}
-		 else
-		{
+		} else {
 			// Zero length (= disabled) is always valid!
 			$valid_code = true;
 		}
@@ -97,24 +93,22 @@ case "new": // Start new transfer
 
 		// Check for nickname extension and set additional data
 		$nick = false; $ADD = ", userid";
-		if (EXT_IS_ACTIVE("nickname"))
-		{
+		if (EXT_IS_ACTIVE("nickname")) {
 			$ADD = ", nickname";
 			$nick = true;
 		}
+
 		// Re-check receivers and own personal data
 		$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid IN ('%s','%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
-		 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
+			array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
 		$valid_data = (SQL_NUMROWS($result) == 2);
 
-		if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient)
-		{
+		if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient) {
 			// Let's start the transfer and load user data
 			list($uid1, $gender1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
 			list($uid2, $gender2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			if ($uid1 == $GLOBALS['userid'])
-			{
+			if ($uid1 == $GLOBALS['userid']) {
 				// Data row 1 is sender's data
 				define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender1));
 				define('__SENDER_NICK'    , $nick1);
@@ -131,9 +125,7 @@ case "new": // Start new transfer
 				// Prepare variables for testing
 				$TEST_NICK_SENDER = $nick1;
 				$TEST_NICK_REC = $nick2;
-			}
-			 else
-			{
+			} else {
 				// Data row 2 is sender's data
 				define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender2));
 				define('__SENDER_NICK'    , $nick2);
@@ -151,32 +143,28 @@ case "new": // Start new transfer
 				$TEST_NICK_SENDER = $nick2;
 				$TEST_NICK_REC = $nick1;
 			}
+
 			// Sender's UID is always currently stored in cookie userid...
 			define('__SENDER_UID'     , $GLOBALS['userid']);
 			define('__RECIPIENT_UID'  , $_POST['to_uid']);
 
 			$SENDER = __SENDER_UID;
 			$RECIPIENT = __RECIPIENT_UID;
-			if ($nick)
-			{
-				if (($TEST_NICK_SENDER != __SENDER_UID) && (!empty($TEST_NICK_SENDER)))
-				{
+			if ($nick) {
+				if (($TEST_NICK_SENDER != __SENDER_UID) && (!empty($TEST_NICK_SENDER))) {
 					$SENDER = __SENDER_NICK;
 				}
-				if (($TEST_NICK_REC != __RECIPIENT_UID) && (!empty($TEST_NICK_REC)))
-				{
+
+				if (($TEST_NICK_REC != __RECIPIENT_UID) && (!empty($TEST_NICK_REC))) {
 					$RECIPIENT = __RECIPIENT_NICK;
 				}
 			}
 
 			// Remember transfer reason and fancy date/time in constants
 			define('__TRANSFER_REASON', $_POST['reason']);
-			if (function_exists('CREATE_FANCY_TIME'))
-			{
+			if (function_exists('CREATE_FANCY_TIME')) {
 				define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age')));
-			}
-			 else
-			{
+			} else {
 				define('__TRANSFER_EXPIRES', round(getConfig('transfer_age')/60/60/24)." ".DAYS);
 			}
 
@@ -210,107 +198,84 @@ case "new": // Start new transfer
 			SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points");
 
 			// Transfer is completed
-			LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<br /><A href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</A>");
-		}
-		 elseif (!$valid_code)
-		{
+			LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<br /><a href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</a>");
+		} elseif (!$valid_code) {
 			// Invalid Touring code!
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_CODE."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_CODE."</div>");
 			unset($_POST['ok']);
-		}
-		 elseif (!$valid_pass)
-		{
+		} elseif (!$valid_pass) {
 			// Wrong password entered
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_PASSWORD."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_PASSWORD."</div>");
 			unset($_POST['ok']);
-		}
-		 elseif (!$valid_amount)
-		{
+		} elseif (!$valid_amount) {
 			// Too much points entered
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_POINTS."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_POINTS."</div>");
 			unset($_POST['ok']);
-		}
-		 elseif (!$valid_reason)
-		{
+		} elseif (!$valid_reason) {
 			// No transfer reason entered
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_REASON."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_REASON."</div>");
 			unset($_POST['ok']);
-		}
-		 elseif (!$valid_recipient)
-		{
+		} elseif (!$valid_recipient) {
 			// No recipient selected
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_RECIPIENT."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_RECIPIENT."</div>");
 			unset($_POST['ok']);
-		}
-		 elseif (!$valid_data)
-		{
+		} elseif (!$valid_data) {
 			// No recipient selected
-			OUTPUT_HTML("<P><STRONG class=\"member_note\">".TRANSFER_INVALID_DATA."</STRONG></P>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_DATA."</div>");
 			unset($_POST['ok']);
 		}
 	}
-	if (!isset($_POST['ok']))
-	{
+
+	if (!isset($_POST['ok'])) {
 		// Load member list
-		if (EXT_IS_ACTIVE("nickname"))
-		{
+		if (EXT_IS_ACTIVE("nickname")) {
 			// Load userid and nickname
 			$result = SQL_QUERY_ESC("SELECT userid, nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",
 			 array($GLOBALS['userid']), __FILE__, __LINE__);
-		}
-		 else
-		{
+		} else {
 			// Load only userid
 			$result = SQL_QUERY_ESC("SELECT userid, userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",
 			 array($GLOBALS['userid']), __FILE__, __LINE__);
 		}
-		if (SQL_NUMROWS($result) > 0)
-		{
+
+		if (SQL_NUMROWS($result) > 0) {
 			// Load list
-			$OUT  = "<SELECT name=\"to_uid\" size=\"1\" class=\"member_select\">
-  <OPTION value=\"0\">".SELECT_NONE."</OPTION>\n";
-			while (list($uid, $nick) = SQL_FETCHROW($result))
-			{
-				$OUT .= "<OPTION value=\"".$uid."\"";
+			$OUT  = "<select name=\"to_uid\" size=\"1\" class=\"member_select\">
+  <option value=\"0\">".SELECT_NONE."</option>\n";
+			while (list($uid, $nick) = SQL_FETCHROW($result)) {
+				$OUT .= "<option value=\"".$uid."\"";
 				if ((isset($_POST['to_uid'])) && ($_POST['to_uid'] == $uid)) $OUT .= " selected=\"selected\"";
 				$OUT .= ">";
-				if (($nick != $uid) && (!empty($nick)))
-				{
+				if (($nick != $uid) && (!empty($nick))) {
 					// Output nickname
 					$OUT .= $nick;
-				}
-				 else
-				{
+				} else {
 					// Output userid
 					$OUT .= $uid;
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
-			$OUT .= "</SELECT>\n";
+			$OUT .= "</select>\n";
 			define('__TRANSFER_TO_DISABLED', "");
 
 			// Free memory
 			SQL_FREERESULT($result);
-		}
-		 else
-		{
+		} else {
 			// No one else is opt-in
 			$OUT = TRANSFER_NO_ONE_ELSE_OPT_IN;
 			define('__TRANSFER_TO_DISABLED', " disabled");
 		}
+
 		// Transfer output to constant for the template
 		define('__TRANSFER_USERID_SELECTION', $OUT);
 
 		// Generate Code
-		if (getConfig('transfer_code') > 0)
-		{
+		if (getConfig('transfer_code') > 0) {
 			$rand = mt_rand(0, 99999);
 			$code = GEN_RANDOM_CODE(getConfig('transfer_code'), $rand, $GLOBALS['userid'], __TRANSFER_MAX_VALUE);
 			$img = GENERATE_IMAGE($code, false);
 			define('__TRANSFER_IMAGE_INPUT', "<INPUT type=\"hidden\" name=\"code_chk\" value=\"".$rand."\"><INPUT type=\"text\" name=\"code\" class=\"member_normal\" size=\"5\" maxlength=\"7\"".__TRANSFER_TO_DISABLED.">&nbsp;".$img);
-		}
-		 else
-		{
+		} else {
 			$code = "00000";
 			define('__TRANSFER_IMAGE_INPUT', TRANSFER_NO_CODE);
 		}
@@ -354,27 +319,25 @@ case "list_out": // List only outgoing transactions
 	// Run the SQL command
 	$total = 0;
 	$result = SQL_QUERY_ESC($SQL, array($GLOBALS['userid']), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+	if (SQL_NUMROWS($result) > 0) {
 		$OUT = ""; $SW = 2;
-		while (list($tid, $uid, $points, $reason, $stamp) = SQL_FETCHROW($result))
-		{
+		while (list($tid, $uid, $points, $reason, $stamp) = SQL_FETCHROW($result)) {
 			if ($type == "OUT") $points = "$points-";
 			$OUT .= "<TR>
   <TD class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row1\">".$tid."</FONT>
+    <div class=\"transfer_row1\">".$tid."</div>
   </TD>
   <TD class=\"transfer_row2 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</FONT>
+    <div class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</div>
   </TD>
   <TD class=\"transfer_row3 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row3\">".$uid."</FONT>
+    <div class=\"transfer_row3\">".$uid."</div>
   </TD>
   <TD class=\"transfer_row4 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row4\">".$reason."</FONT>
+    <div class=\"transfer_row4\">".$reason."</div>
   </TD>
   <TD class=\"transfer_row5 switch_sw".$SW." bottom2\">
-    <FONT class=\"transfer_row5\">".$points."</FONT>
+    <div class=\"transfer_row5\">".$points."</div>
   </TD>
 </TR>\n";
 			$total += $points;
@@ -383,9 +346,7 @@ case "list_out": // List only outgoing transactions
 
 		// Free memory
 		SQL_FREERESULT($result);
-	}
-	 else
-	{
+	} else {
 		// Nothing for in or out
 		$OUT = "<TR>
   <TD colspan=\"5\" align=\"center\" class=\"bottom2\" height=\"70\">
@@ -423,8 +384,7 @@ KEY(party_uid)
 	// Let's begin with the incoming list
 	$result = SQL_QUERY_ESC("SELECT trans_id, from_uid, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_in WHERE userid=%s ORDER BY id LIMIT %s",
 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHROW($result))
-	{
+	while ($DATA = SQL_FETCHROW($result)) {
 		$DATA[] = "IN";
 		$DATA = implode("','", $DATA);
 		$res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
@@ -436,8 +396,7 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 	// As the last table transfer data from outgoing table to temporary
 	$result = SQL_QUERY_ESC("SELECT trans_id, to_uid, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_out WHERE userid=%s ORDER BY id LIMIT %s",
 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHROW($result))
-	{
+	while ($DATA = SQL_FETCHROW($result)) {
 		$DATA[] = "OUT";
 		$DATA = implode("','", $DATA);
 		$res_temp = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_transfers_tmp (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
@@ -447,29 +406,27 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 	SQL_FREERESULT($result);
 
 	$total = 0;
-	if (SQL_NUMROWS($result) > 0)
-	{
+	if (SQL_NUMROWS($result) > 0) {
 		// Output rows
 		$OUT = ""; $SW = 2;
 		$result = SQL_QUERY("SELECT party_uid, trans_id, points, reason, time_trans, trans_type FROM "._MYSQL_PREFIX."_transfers_tmp ORDER BY time_trans DESC", __FILE__, __LINE__);
-		while(list($uid, $idx, $points, $reason, $stamp, $type) = SQL_FETCHROW($result))
-		{
+		while(list($uid, $idx, $points, $reason, $stamp, $type) = SQL_FETCHROW($result)) {
 			if ($type == "OUT") $points = "-$points";
 			$OUT .= "<TR>
   <TD class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row1\">".$idx."</FONT>
+    <div class=\"transfer_row1\">".$idx."</div>
   </TD>
   <TD class=\"transfer_row2 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</FONT>
+    <div class=\"transfer_row2\">".MAKE_DATETIME($stamp, "3")."</div>
   </TD>
   <TD class=\"transfer_row3 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row3\">".$uid."</FONT>
+    <div class=\"transfer_row3\">".$uid."</div>
   </TD>
   <TD class=\"transfer_row4 switch_sw".$SW." bottom2 right2\">
-    <FONT class=\"transfer_row4\">".$reason."</FONT>
+    <div class=\"transfer_row4\">".$reason."</div>
   </TD>
   <TD class=\"transfer_row5 switch_sw".$SW." bottom2\">
-    <FONT class=\"transfer_row5\">".$points."</FONT>
+    <div class=\"transfer_row5\">".$points."</div>
   </TD>
 </TR>\n";
 			$total += $points;
@@ -478,9 +435,7 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 
 		// Free memory
 		SQL_FREERESULT($result);
-	}
-	 else
-	{
+	} else {
 		// Nothing for in and out
 		$OUT = "<TR>
   <TD colspan=\"5\" align=\"center\" class=\"bottom2\" height=\"70\">
@@ -518,12 +473,9 @@ case "": // Overview page
 	SQL_FREERESULT($result);
 
 	$total=$dmy;
-	if ($dmy > 0)
-	{
-		define('__TRANSFER_IN_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$dmy."</A>");
-	}
-	 else
-	{
+	if ($dmy > 0) {
+		define('__TRANSFER_IN_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$dmy."</a>");
+	} else {
 		define('__TRANSFER_IN_LINK', $dmy);
 	}
 
@@ -533,22 +485,16 @@ case "": // Overview page
 	SQL_FREERESULT($result);
 
 	$total+=$dmy;
-	if ($dmy > 0)
-	{
-		define('__TRANSFER_OUT_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_out\">".$dmy."</A>");
-	}
-	 else
-	{
+	if ($dmy > 0) {
+		define('__TRANSFER_OUT_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_out\">".$dmy."</a>");
+	} else {
 		define('__TRANSFER_OUT_LINK', $dmy);
 	}
 
 	// Total transactions
-	if ($total > 0)
-	{
-		define('__TRANSFER_ALL_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_all\">".$total."</A>");
-	}
-	 else
-	{
+	if ($total > 0) {
+		define('__TRANSFER_ALL_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_all\">".$total."</a>");
+	} else {
 		define('__TRANSFER_ALL_LINK', $total);
 	}
 
@@ -561,7 +507,7 @@ case "": // Overview page
 		$opt_in = $_POST['opt_in'];
 
 		// "Settings saved..."
-		OUTPUT_HTML("<P><STRONG class=\"member_done\">".SETTINGS_SAVED."</STRONG></P>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_done\">".SETTINGS_SAVED."</div>");
 	}
 
 	switch ($opt_in)
@@ -569,7 +515,7 @@ case "": // Overview page
 	case "Y":
 		define('__TRANSFER_ALLOW_Y', " checked=\"checked\"");
 		define('__TRANSFER_ALLOW_N', "");
-		define('__TRANSFER_NEW_LINK', "<A href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</A>");
+		define('__TRANSFER_NEW_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</a>");
 		break;
 
 	case "N":
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 5d0c6c8a48..2caef50a73 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -71,9 +71,12 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 	// Output message to user and die
 	if (EXT_IS_ACTIVE("debug")) {
 		// Debug extension found! :-)
+		// @TODO Can this be rewritten to mxchange_die() ?
 		die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
 	} else {
 		// No debug extension found
+		// @TODO Find a way to rewrite debug_print_backtrace() so we can maybe
+		// @TODO (?) rewrite this to mxchange_die()
 		print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
 		debug_print_backtrace();
 		die("</pre>Thank you for your help finding bugs.");
@@ -105,7 +108,7 @@ register_shutdown_function('__SHUTDOWN_HOOK');
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
 	// No login entered and outside installation mode
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ";
+	echo "<strong>".LANG_WARNING.":</strong> ";
 	if (isBooleanConstantAndTrue('mxchange_installed')) {
 		// You have changed my configuration file!
 		die(DIE_CONFIG_CHANGED_YOU);
@@ -115,7 +118,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
 	}
 } elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
 	// No database password entered!!!
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
+	echo "<div>".LANG_WARNING.":</div> ".WARN_NULL_PASSWORD;
 }
 
 // Set dummy $_CONFIG array
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 82ebd0721b..f3a7aba824 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -264,7 +264,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
 	}
 	if ((!isset($NAV_DEPTH)) && (!$return)) {
 		$NAV_DEPTH = 0;
-		$prefix = "<DIV class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</A></STRONG>";
+		$prefix = "<div class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<strong><a class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</a></strong>";
 	} else {
 		if (!$return) $NAV_DEPTH++;
 		$prefix = "";
@@ -293,7 +293,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
 			return $ret;
 		} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
 			// Output HTML code
-			$OUT = $prefix."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
+			$OUT = $prefix."<strong><a class=\"you_are_here\" href=\"".URL."/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</a></strong>\n";
 
 			// Can we close the you-are-here navigation?
 			//* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
@@ -373,26 +373,26 @@ function ADD_MENU ($MODE, $act, $wht) {
 					$test = (FILE_READABLE($test_inc));
 					if ($test) {
 						if ((!empty($wht)) && (($wht == $sub_what))) {
-							$content = "<STRONG>";
+							$content = "<strong>";
 						}
 
 						// Navigation link
-						$content .= "<A name=\"menu\" class=\"menu_blur\" href=\"".URL."/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";
+						$content .= "<a name=\"menu\" class=\"menu_blur\" href=\"".URL."/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";
 					} else {
-						$content .= "<I>";
+						$content .= "<em>";
 					}
 
 					// Menu title
 					$content .= getConfig('menu_blur_spacer') . $sub_title;
 
 					if ($test) {
-						$content .= "</A>";
+						$content .= "</a>";
 					} else {
-						$content .= "</I>";
+						$content .= "</em>";
 					}
 
 					if ((!empty($wht)) && (($wht == $sub_what))) {
-						$content .= "</STRONG>";
+						$content .= "</strong>";
 					}
 					$wht = $sub_what; $cnt++;
 					// Prepare array
@@ -513,11 +513,11 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
 			$OUT = "";
   			while (list($value, $comment) = SQL_FETCHROW($result))
 			{
-				$OUT .= "      <OPTION value=\"".$value."\"";
+				$OUT .= "      <option value=\"".$value."\"";
 				if ($_POST['max_mails'] == $value) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$value." ".PER_DAY;
 				if (!empty($comment)) $OUT .= " (".$comment.")";
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 			define('__MAX_RECEIVE_OPTIONS', $OUT);
 
@@ -539,11 +539,11 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
 			$OUT = "";
   			while (list($value, $comment) = SQL_FETCHROW($result))
 			{
-				$OUT .= "      <OPTION value=\"".$value."\"";
+				$OUT .= "      <option value=\"".$value."\"";
 				if ($default == $value) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$value." ".PER_DAY;
 				if (!empty($comment)) $OUT .= " (".$comment.")";
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 			define('__MAX_RECEIVE_OPTIONS', $OUT);
 			SQL_FREERESULT($result);
@@ -802,25 +802,25 @@ function SEND_MODE_MAILS($mod, $modes) {
 					$sub_mem = MEMBER_CHANGED_DATA;
 
 					// Output success message
-					$content = "<SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN>";
+					$content = "<span class=\"member_done\">".MYDATA_MAIL_SENT."</span>";
 					break;
 
 				default:
 					DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-					$content = "<SPAN class=\"member_failed\">".UNKNOWN_MODULE."</SPAN>";
+					$content = "<span class=\"member_failed\">".UNKNOWN_MODULE."</span>";
 					break;
 				} // END - switch
 			} else {
 				// Could not load profile data
-				$content = "<SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN>";
+				$content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
 			}
 		} else {
 			// Passwords mismatch
-			$content = "<SPAN class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</SPAN>";
+			$content = "<span class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</span>";
 		}
 	} else {
 		// Could not load profile
-		$content = "<SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN>";
+		$content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
 	}
 
 	// Send email to user if required
@@ -839,7 +839,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 			$content = CANNOT_SEND_ADMIN_MAILS;
 		} else {
 			// No mail to admin
-			$content = "<SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN>";
+			$content = "<span class=\"member_done\">".MYDATA_MAIL_SENT."</span>";
 		}
 	} // END - if
 
@@ -1455,9 +1455,9 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
 		if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) {
 			// Both are arrays
 			foreach ($id as $idx => $value) {
-				$ret .= "<OPTION value=\"".$value."\"";
+				$ret .= "<option value=\"".$value."\"";
 				if ($default == $value) $ret .= " selected checked";
-				$ret .= ">".$name[$idx]."</OPTION>\n";
+				$ret .= ">".$name[$idx]."</option>\n";
 			} // END - foreach
 		} // END - if
 	} else {
@@ -1472,17 +1472,17 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
 			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
 			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
 				if (empty($special)) $add = "";
-				$ret .= "<OPTION value=\"".$value."\"";
+				$ret .= "<option value=\"".$value."\"";
 				if ($default == $value) $ret .= " selected checked";
 				if (!empty($add)) $add = " (".$add.")";
-				$ret .= ">".$title.$add."</OPTION>\n";
+				$ret .= ">".$title.$add."</option>\n";
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// No data found
-			$ret = "<OPTION value=\"x\">".SELECT_NONE."</OPTION>\n";
+			$ret = "<option value=\"x\">".SELECT_NONE."</option>\n";
 		}
 	}
 
@@ -1831,7 +1831,7 @@ WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_H
 		$OUT = "";
 		foreach ($CATS['id'] as $key => $value) {
 			if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."...";
-			$OUT .= "      <OPTION value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
+			$OUT .= "      <option value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</option>\n";
 		}
 	} else {
 		// No cateogries are defined yet
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 5fa5a82e0f..9af04721bd 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -176,9 +176,9 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 				// Update bonus pool
 				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
 					array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
-				//* DEBUG: */ echo "*L:".__LINE__."<PRE>";
+				//* DEBUG: */ echo "*L:".__LINE__."<pre>";
 				//* DEBUG: */ print_r($dummy);
-				//* DEBUG: */ echo "</PRE>\n!!!<br />";
+				//* DEBUG: */ echo "</pre>\n!!!<br />";
 				break;
 			}
 		}
diff --git a/inc/security.php b/inc/security.php
index d33e5e7dcd..6e7c022ffc 100644
--- a/inc/security.php
+++ b/inc/security.php
@@ -40,10 +40,10 @@ echo "<HTML>
 <TITLE>Protected file ".basename($_SERVER['PHP_SELF'])." - ACCESS DENIED!</TITLE>
 </HEAD>
 <BODY bgcolor=\"#880000\" text=\"#FFFFFF\">
-<DIV align=\"center\">
+<div align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\">
 <TR>
-  <TD align=\"center\"><U><STRONG><BIG><BIG>A&nbsp;C&nbsp;C&nbsp;E&nbsp;S&nbsp;S&nbsp;&nbsp;&nbsp;D&nbsp;E&nbsp;N&nbsp;I&nbsp;E&nbsp;D&nbsp;!</BIG></BIG></STRONG></U></TD>
+  <TD align=\"center\"><u><strong><BIG><BIG>A&nbsp;C&nbsp;C&nbsp;E&nbsp;S&nbsp;S&nbsp;&nbsp;&nbsp;D&nbsp;E&nbsp;N&nbsp;I&nbsp;E&nbsp;D&nbsp;!</BIG></BIG></strong></u></TD>
 </TR>
 <TR><TD height=\"10\"></TD></TR>
 <TR>
@@ -54,11 +54,11 @@ echo "<HTML>
 <TR><TD height=\"10\"></TD></TR>
 <TR>
   <TD align=\"center\">
-    <STRONG>".GET_REMOTE_ADDR()."</STRONG>
+    <strong>".GET_REMOTE_ADDR()."</strong>
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
 </BODY>
 </HTML>\n";
 exit();
diff --git a/mailid_top.php b/mailid_top.php
index 46b7a95310..4246555689 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -327,22 +327,22 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 									break;
 								}
 							}
-							 else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</STRONG>");
+							 else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</div>");
 						}
-						 else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</STRONG>");
+						 else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</div>");
 					}
-					 else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</STRONG>");
+					 else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</div>");
 				} else {
 					SQL_FREERESULT($result);
-					OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</STRONG>");
+					OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</div>");
 				}
 			} else {
 				SQL_FREERESULT($result);
-				OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</STRONG>");
+				OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</div>");
 			}
 		} else {
 			SQL_FREERESULT($result);
-			OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</STRONG>");
+			OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</div>");
 		}
 
 		// Insert footer if no image
diff --git a/modules.php b/modules.php
index e05a1b25ed..b94a2a0414 100644
--- a/modules.php
+++ b/modules.php
@@ -74,7 +74,7 @@ if (IS_MEMBER()) {
 		} // END - if
 	} else {
 		// Hmmm, logged in and no valid userid?
-		$username = "<I>"._UNKNOWN."</I>";
+		$username = "<em>"._UNKNOWN."</em>";
 
 		// Destroy session
 		destroy_user_session();
diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl
index cd235a2667..e64f2ca780 100644
--- a/templates/de/html/admin/admin_add_bank_package.tpl
+++ b/templates/de/html/admin/admin_add_bank_package.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_bank_package" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=add_bank_package" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2" height="30" colspan="3" align="center">
-		<STRONG>{--ADMIN_ADD_BANK_PACKAGE_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_ADD_BANK_PACKAGE_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="8" colspan="3" class="seperator">&nbsp;</TD>
@@ -20,8 +20,8 @@
 		<TD align="right" valign="top" style="padding-top: 2px">
 		{--ADMIN_BANK_PACKAGE_DESCRIPTION--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA class="admin_normal" name="description" rows="5"
-			cols="28"></TEXTAREA></TD>
+		<TD><textarea class="admin_normal" name="description" rows="5"
+			cols="28"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator">&nbsp;</TD>
@@ -48,12 +48,12 @@
 	<TR>
 		<TD align="right">{--ADMIN_BANK_PACKAGE_OUTPUT_MODE--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT class="admin_select" name="output_system_mode"
+		<TD><select class="admin_select" name="output_system_mode"
 			size="1">
-			<OPTION value="LOGIN">{--BANK_OUTPUT_MODE_LOGIN--}</OPTION>
-			<OPTION value="EMAIL">{--BANK_OUTPUT_MODE_EMAIL--}</OPTION>
-			<OPTION value="DISABLED">{--BANK_OUTPUT_MODE_DISABLED--}</OPTION>
-		</SELECT></TD>
+			<option value="LOGIN">{--BANK_OUTPUT_MODE_LOGIN--}</option>
+			<option value="EMAIL">{--BANK_OUTPUT_MODE_EMAIL--}</option>
+			<option value="DISABLED">{--BANK_OUTPUT_MODE_DISABLED--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator">&nbsp;</TD>
@@ -109,8 +109,8 @@
 		<TD align="right" valign="top" style="padding-top: 2px">
 		{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA class="admin_normal" name="free_account_stuff"
-			rows="5" cols="28"></TEXTAREA></TD>
+		<TD><textarea class="admin_normal" name="free_account_stuff"
+			rows="5" cols="28"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator">&nbsp;</TD>
@@ -129,7 +129,7 @@
 		{--ADMIN_BANK_PACKAGE_ACTIVE--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><INPUT class="admin_normal" type="radio"
-			name="package_active" value="Y" default checked>&nbsp;{--YES--}<BR />
+			name="package_active" value="Y" default checked>&nbsp;{--YES--}<br />
 		<INPUT class="admin_normal" type="radio" name="package_active"
 			value="N">&nbsp;{--NO--}</TD>
 	</TR>
@@ -143,6 +143,6 @@
 			value="{--ADMIN_ADD_BANK_PACKAGE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_BANK_FOOTER_NOTE--}</DIV>
+<div class="admin_note">{--ADMIN_BANK_FOOTER_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_add_banner.tpl b/templates/de/html/admin/admin_add_banner.tpl
index 9988d7bc6a..c19778cdfe 100644
--- a/templates/de/html/admin/admin_add_banner.tpl
+++ b/templates/de/html/admin/admin_add_banner.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=refbanner"
+<form action="{!URL!}/modules.php?module=admin&amp;what=refbanner"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="410">
 	<TR>
 		<TD class="admin_title bottom2" colspan="3" align="center" height="30">
-		<STRONG>{--ADMIN_ADD_BANNER--}</STRONG></TD>
+		<strong>{--ADMIN_ADD_BANNER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="seperator" colspan="5" height="7">&nbsp;</TD>
@@ -31,10 +31,10 @@
 	<TR>
 		<TD align="right" width="200">{--ADMIN_SELECT_BANNER_ACTIVE--}</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD><SELECT name="visible" size="1" class="admin_select">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
-		</SELECT></TD>
+		<TD><select name="visible" size="1" class="admin_select">
+			<option value="Y">{--YES--}</option>
+			<option value="N">{--NO--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD class="seperator bottom2" colspan="5" height="7">&nbsp;</TD>
@@ -46,4 +46,4 @@
 			value="{--ADMIN_SUBMIT_BANNER--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl
index d50b82a18d..2e59535d92 100644
--- a/templates/de/html/admin/admin_add_cat.tpl
+++ b/templates/de/html/admin/admin_add_cat.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_cats"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_cats"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2 seperator" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" align="center" colspan="3"><STRONG>{--ADD_NEW_CATEGORY--}</STRONG>
+		<TD class="admin_title bottom2" align="center" colspan="3"><strong>{--ADD_NEW_CATEGORY--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -13,7 +13,7 @@
 	</TR>
 	<TR>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD align="right" width="200"><STRONG>{--ENTER_CATNAME--}:</STRONG>
+		<TD align="right" width="200"><strong>{--ENTER_CATNAME--}:</strong>
 		</TD>
 		<TD class="seperator" width="7">&nbsp;</TD>
 		<TD><INPUT type="text" name="catname" size="30" maxlength="255"
@@ -25,13 +25,13 @@
 	</TR>
 	<TR>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD align="right" width="200"><STRONG>{--SELECT_PARENT--}</STRONG>
+		<TD align="right" width="200"><strong>{--SELECT_PARENT--}</strong>
 		</TD>
 		<TD class="seperator" width="7">&nbsp;</TD>
-		<TD><SELECT name="parent" size="1" class="admin_select">
+		<TD><select name="parent" size="1" class="admin_select">
 			{--CATS--}
-			<OPTION value="-1">{--IS_TOP_CATEGORY--}</OPTION>
-		</SELECT></TD>
+			<option value="-1">{--IS_TOP_CATEGORY--}</option>
+		</select></TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -39,7 +39,7 @@
 	</TR>
 	<TR>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD align="right" width="200"><STRONG>{--CAT_IS_VISIBLE--}</STRONG>
+		<TD align="right" width="200"><strong>{--CAT_IS_VISIBLE--}</strong>
 		</TD>
 		<TD class="seperator" width="7">&nbsp;</TD>
 		<TD>{--YES--}: <INPUT type="radio" name="visible" value="Y"
@@ -59,4 +59,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl
index bc11b9bd51..7b8b8d9e41 100644
--- a/templates/de/html/admin/admin_add_country.tpl
+++ b/templates/de/html/admin/admin_add_country.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_country"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_country"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="430">
 	<TR>
 		<TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ADMIN_ADD_COUNTRY_CODE--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ADMIN_ADD_COUNTRY_CODE--}</strong>
 		</TD>
 		<TD class="admin_title bottom2" width="10">&nbsp;</TD>
 	</TR>
@@ -37,10 +37,10 @@
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD align="right" width="200">{--ADMIN_COUNTRY_CODE_ACTIVE--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD><SELECT name="is_active" size="1" class="admin_select">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
-		</SELECT></TD>
+		<TD><select name="is_active" size="1" class="admin_select">
+			<option value="Y">{--YES--}</option>
+			<option value="N">{--NO--}</option>
+		</select></TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -55,4 +55,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl
index 063a721c99..0e67a67be7 100644
--- a/templates/de/html/admin/admin_add_max.tpl
+++ b/templates/de/html/admin/admin_add_max.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_email"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_email"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="admin_table dashed">
 	<TR>
 		<TD colspan="5" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_ADD_MAX_VALUE--}</STRONG></TD>
+		<strong>{--ADMIN_ADD_MAX_VALUE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="seperator" colspan="5" height="3">&nbsp;</TD>
@@ -48,4 +48,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl
index 3b055e67fb..d359912601 100644
--- a/templates/de/html/admin/admin_add_payment.tpl
+++ b/templates/de/html/admin/admin_add_payment.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=payments&do=add"
+<form action="{!URL!}/modules.php?module=admin&amp;what=payments&do=add"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="410">
 	<TR>
 		<TD class="admin_title bottom2" colspan="3" align="center" height="30">
-		<STRONG>{--ADD_NEW_PAYMENT--}</STRONG></TD>
+		<strong>{--ADD_NEW_PAYMENT--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" height="7" class="seperator">&nbsp;</TD>
@@ -53,4 +53,4 @@
 			value="{--ADD_PAYMENT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl
index 502ffb7ece..f7a2d1012f 100644
--- a/templates/de/html/admin/admin_add_points.tpl
+++ b/templates/de/html/admin/admin_add_points.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_points&amp;u_id={!__UID!}" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=add_points&amp;u_id={!__UID!}" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="admin_table dashed">
 	<TR>
@@ -6,8 +6,8 @@
 	</TR>
 	<TR>
 		<TD class="admin_title" colspan="3" align="center">
-		{--ADMIN_ADD_POINTS_TO_USER--}:<BR />
-		<STRONG>{!__USER_VALUE!}</STRONG></TD>
+		{--ADMIN_ADD_POINTS_TO_USER--}:<br />
+		<strong>{!__USER_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD>
@@ -27,8 +27,8 @@
 	<TR>
 		<TD align="right">{--ENTER_ADD_REASON--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="reason" class="admin_normal" rows="5"
-			cols="20"></TEXTAREA></TD>
+		<TD><textarea name="reason" class="admin_normal" rows="5"
+			cols="20"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator">&nbsp;</TD>
@@ -44,4 +44,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl
index bfc1ed48ed..2993191d15 100644
--- a/templates/de/html/admin/admin_add_points_all.tpl
+++ b/templates/de/html/admin/admin_add_points_all.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=add_points&amp;u_id=all"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
@@ -27,8 +27,8 @@
 	<TR>
 		<TD align="right">{--ENTER_ADD_REASON--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="reason" class="admin_normal" rows="5"
-			cols="20"></TEXTAREA></TD>
+		<TD><textarea name="reason" class="admin_normal" rows="5"
+			cols="20"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" colspan="3" class="seperator">&nbsp;</TD>
@@ -43,4 +43,4 @@
 			value="{--ADMIN_ADD_POINTS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl
index 2aba962302..d69dc9e3f9 100644
--- a/templates/de/html/admin/admin_add_rallye.tpl
+++ b/templates/de/html/admin/admin_add_rallye.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_rallye"
+<form action="{!URL!}/modules.php?module=admin&amp;what=add_rallye"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" height="30" class="admin_title bottom2">
-		<STRONG>{--ADMIN_RALLYE_ADD_NEW_TITLE--}:</STRONG></TD>
+		<strong>{--ADMIN_RALLYE_ADD_NEW_TITLE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -24,8 +24,8 @@
 	<TR>
 		<TD align="right" valign="top">{--RALLYE_DESCR--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><TEXTAREA name="descr" cols="30" rows="6"
-			class="admin_normal"></TEXTAREA></TD>
+		<TD align="center"><textarea name="descr" cols="30" rows="6"
+			class="admin_normal"></textarea></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -45,7 +45,7 @@
 		<TD width="200" align="right" valign="top">{--RALLYE_START_DAY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="290" align="center">{--_START_DAY--}.
-		{--_START_MONTH--}. {--_START_YEAR--}<BR />
+		{--_START_MONTH--}. {--_START_YEAR--}<br />
 		{--_START_HOUR--}: {--_START_MIN--}: {--_START_SEC--}</TD>
 	</TR>
 	<TR>
@@ -58,7 +58,7 @@
 		<TD align="right" valign="top">{--RALLYE_END_DAY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">{--_END_DAY--}. {--_END_MONTH--}.
-		{--_END_YEAR--}<BR />
+		{--_END_YEAR--}<br />
 		{--_END_HOUR--}: {--_END_MIN--}: {--_END_SEC--}</TD>
 	</TR>
 	<TR>
@@ -70,10 +70,10 @@
 	<TR>
 		<TD align="right">{--RALLYE_IS_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><SELECT name="active" size="1"
+		<TD align="center"><select name="active" size="1"
 			class="admin_select">
 			{--_ACTIVE_OPTIONS--}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -81,10 +81,10 @@
 	<TR>
 		<TD align="right">{--RALLYE_AUTO_ADD_USER--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><SELECT name="auto_add" size="1"
+		<TD align="center"><select name="auto_add" size="1"
 			class="admin_select">
 			{--_AUTO_ADD_OPTIONS--}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -92,10 +92,10 @@
 	<TR>
 		<TD align="right">{--RALLYE_SEND_NOTIFY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><SELECT name="notify" size="1"
+		<TD align="center"><select name="notify" size="1"
 			class="admin_select">
 			{--_NOTIFY_OPTIONS--}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -125,4 +125,4 @@
 			value="{--ADD_RALLYE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl
index ea87defd79..b2e6bf6f63 100644
--- a/templates/de/html/admin/admin_add_rallye_prices.tpl
+++ b/templates/de/html/admin/admin_add_rallye_prices.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" height="30" class="admin_title bottom2">
-		<STRONG>{--RALLYE_CONFIG_PRICES_1--}$content{--RALLYE_CONFIG_PRICES_2--}:</STRONG>
+		<strong>{--RALLYE_CONFIG_PRICES_1--}$content{--RALLYE_CONFIG_PRICES_2--}:</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -48,4 +48,4 @@
 			value="{--ADD_RALLYE_PRICE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_reflvl.tpl b/templates/de/html/admin/admin_add_reflvl.tpl
index b1edda9c8b..c2440edf22 100644
--- a/templates/de/html/admin/admin_add_reflvl.tpl
+++ b/templates/de/html/admin/admin_add_reflvl.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_points&sub=ref&do=add"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ADD_NEW_REFDEPTH--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ADD_NEW_REFDEPTH--}</strong>
 		</TD>
 		<TD class="admin_title bottom2" width="10">&nbsp;</TD>
 	</TR>
@@ -43,4 +43,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl
index 90b2e46e78..ec120e51e8 100644
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_sponsor" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=add_sponsor" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="530">
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
 <TR>
   <TD class="bottom2" width="10" height="40">&nbsp;</TD>
   <TD class="bottom2" colspan="3" align="center">
-    <FONT class="admin_note">{--ADMIN_SPONSOR_COMPANY_NOTE--}</FONT>
+    <div class="admin_note">{--ADMIN_SPONSOR_COMPANY_NOTE--}</div>
   </TD>
   <TD class="bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -54,7 +54,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -66,11 +66,11 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="gender" class="admin_select" size="1">
-      <OPTION value="M">{--GENDER_M--}</OPTION>
-	 <OPTION value="F">{--GENDER_F--}</OPTION>
-	 <OPTION value="C">{--GENDER_C--}</OPTION>
-    </SELECT>
+    <select name="gender" class="admin_select" size="1">
+      <option value="M">{--GENDER_M--}</option>
+	 <option value="F">{--GENDER_F--}</option>
+	 <option value="C">{--GENDER_C--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -102,7 +102,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_CONTACT_DATA--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_CONTACT_DATA--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -207,7 +207,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_PASSWORDS--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_PASSWORDS--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -228,7 +228,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_WARNINGS_POINTS--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_WARNINGS_POINTS--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -240,10 +240,10 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="receive_warnings" class="admin_select" size="1">
-      <OPTION value="Y">{--YES--}</OPTION>
-	 <OPTION value="N">{--NO--}</OPTION>
-    </SELECT>
+    <select name="receive_warnings" class="admin_select" size="1">
+      <option value="Y">{--YES--}</option>
+	 <option value="N">{--NO--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -255,15 +255,15 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="warning_interval" class="admin_select" size="1">
-      <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
-    </SELECT>
+    <select name="warning_interval" class="admin_select" size="1">
+      <option value="0">{--SELECT_NONE--}</option>
+      <option value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -289,4 +289,4 @@
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl
index da5404e42b..9443e2ad68 100644
--- a/templates/de/html/admin/admin_add_sponsor_already.tpl
+++ b/templates/de/html/admin/admin_add_sponsor_already.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_sponsor&amp;force=1" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=add_sponsor&amp;force=1" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="520">
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" align="center">
-    <STRONG>{--ADMIN_SPONSOR_REALLY_ADD_SPONSOR--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_REALLY_ADD_SPONSOR--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -25,4 +25,4 @@
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl
index 536872178a..2fc4a44393 100644
--- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl
+++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl
@@ -1,19 +1,19 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="560" align="center" class="admin_table dashed">
 <TR>
   <TD class="admin_title bottom2" colspan="3" align="center" height="30">
-    <STRONG>{--ADMIN_ADD_SPONSOR_PAYTYPE_TITLE--}:</STRONG>
+    <strong>{--ADMIN_ADD_SPONSOR_PAYTYPE_TITLE--}:</strong>
   </TD>
 </TR>
 <TR><TD height="8" colspan="3" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD width="350" align="right">{--SPONSOR_PAYTYPE_NAME--}:<BR /><FONT class="tiny">{--SPONSOR_PAYTYPE_NAME_HINT--}</FONT></TD>
+  <TD width="350" align="right">{--SPONSOR_PAYTYPE_NAME--}:<br /><div class="tiny">{--SPONSOR_PAYTYPE_NAME_HINT--}</div></TD>
   <TD width="10" class="seperator">&nbsp;</TD>
   <TD width="200"><INPUT type="text" name="pay_name" size="10" maxlength="255" class="admin_normal"></TD>
 </TR>
 <TR><TD height="8" colspan="3" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD width="350" align="right">{--SPONSOR_PAYTYPE_RATE--}:<BR /><FONT class="tiny">{--SPONSOR_PAYTYPE_RATE_HINT--}</FONT></TD>
+  <TD width="350" align="right">{--SPONSOR_PAYTYPE_RATE--}:<br /><div class="tiny">{--SPONSOR_PAYTYPE_RATE_HINT--}</div></TD>
   <TD width="10" class="seperator">&nbsp;</TD>
   <TD width="200"><INPUT type="text" name="pay_rate" size="7" maxlength="25" class="admin_normal" value="0.00000"></TD>
 </TR>
@@ -37,14 +37,14 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-<DIV align="center">
-  <FONT class="admin_note tiny">
-    <U><STRONG>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</STRONG></U><BR />
-    <BR />
-    <STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_NAME_NOTE--}<BR />
-    <STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_RATE_NOTE--}<BR />
-    <STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}<BR />
-    <STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_CURRENCY_NOTE--}<BR />
-  </FONT>
-</DIV>
+</form>
+<div align="center">
+  <div class="admin_note tiny">
+    <u><strong>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</strong></u><br />
+    <br />
+    <strong>{--SPONSOR_PAYTYPE_NAME--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_NAME_NOTE--}<br />
+    <strong>{--SPONSOR_PAYTYPE_RATE--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_RATE_NOTE--}<br />
+    <strong>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}<br />
+    <strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong>&nbsp;{--SPONSOR_PAYTYPE_CURRENCY_NOTE--}<br />
+  </div>
+</div>
diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl
index a08f605ae9..b7374e661a 100644
--- a/templates/de/html/admin/admin_admin_add.tpl
+++ b/templates/de/html/admin/admin_admin_add.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admin_add" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=admin_add" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 	<TR>
 		<TD height="8" colspan="5"></TD>
@@ -19,8 +19,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_WHAT_NAME--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD class="admin_table" align="center">{!__WHAT_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
+		<TD class="admin_table" align="center">{!__WHAT_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_WHAT_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -30,8 +30,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_PARENT_MENU--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD class="admin_table" align="center">{!__ACTION_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
+		<TD class="admin_table" align="center">{!__ACTION_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_ACTION_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -41,8 +41,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--ENTER_DESCR--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD class="admin_table" align="center"><TEXTAREA name="descr"
-			rows="10" cols="30" class="admin_normal"></TEXTAREA></TD>
+		<TD class="admin_table" align="center"><textarea name="descr"
+			rows="10" cols="30" class="admin_normal"></textarea></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -74,4 +74,4 @@
 		<TD class="admin_table" height="8" colspan="5"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_admins_add.tpl b/templates/de/html/admin/admin_admins_add.tpl
index 55e7574076..9fc0c88509 100644
--- a/templates/de/html/admin/admin_admins_add.tpl
+++ b/templates/de/html/admin/admin_admins_add.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_add"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_add"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_ADD_NEW_ADMIN--}:</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_ADD_NEW_ADMIN--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
@@ -52,4 +52,4 @@
 			value="{--ADMIN_ADMINS_ADD_ADMIN--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_admins_add_acl.tpl b/templates/de/html/admin/admin_admins_add_acl.tpl
index b40ae27bef..25c2fb8786 100644
--- a/templates/de/html/admin/admin_admins_add_acl.tpl
+++ b/templates/de/html/admin/admin_admins_add_acl.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_ADD_ACL--}:</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_ADD_ACL--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
@@ -12,10 +12,10 @@
 	<TR>
 		<TD width="235" align="right">{--ADMIN_ADMINS_SELECT_LOGIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="235"><SELECT name="admin_id" size="1"
+		<TD width="235"><select name="admin_id" size="1"
 			class="admin_select">
 			{--_ADMINS_SELECTION--}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
@@ -39,9 +39,9 @@
 	<TR>
 		<TD align="right">{--ADMIN_ADMINS_SELECT_MODE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="mode" size="1" class="admin_select">
+		<TD><select name="mode" size="1" class="admin_select">
 			{--_MODE_OPTIONS--}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
@@ -53,4 +53,4 @@
 			value="{--ADMIN_ADMINS_ADD_ADMIN--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl
index 8ada07e58d..b0aee5f7e9 100644
--- a/templates/de/html/admin/admin_admins_contct_form.tpl
+++ b/templates/de/html/admin/admin_admins_contct_form.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin={!__ADMIN!}" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin={!__ADMIN!}" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400" class="admin_table dashed">
 	<TR>
-		<TD width="195" class="admin_header bottom2" align="right" height="28"><STRONG>{--ADMINS_ADMIN_ID--}:</STRONG></TD>
+		<TD width="195" class="admin_header bottom2" align="right" height="28"><strong>{--ADMINS_ADMIN_ID--}:</strong></TD>
 		<TD width="10" class="admin_header bottom2 seperator">&nbsp;</TD>
-		<TD width="195" class="admin_header bottom2" align="left"><STRONG>{!__ADMIN!}</STRONG></TD>
+		<TD width="195" class="admin_header bottom2" align="left"><strong>{!__ADMIN!}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" align="center">
-			{--ADMINS_ENTER_CONTACT_TEXT--}:<BR />
-			<TEXTAREA class="admin_normal" name="text" rows="5" cols="40"></TEXTAREA>
+			{--ADMINS_ENTER_CONTACT_TEXT--}:<br />
+			<textarea class="admin_normal" name="text" rows="5" cols="40"></textarea>
 		</TD>
 	</TR>
 	<TR>
@@ -29,4 +29,4 @@
 			class="admin_submit" value="{--ADMINS_CONTACT_SUBMIT--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl
index aab0519e87..281e97f2b3 100644
--- a/templates/de/html/admin/admin_admins_mails_edit.tpl
+++ b/templates/de/html/admin/admin_admins_mails_edit.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_mails"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_mails"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="2" align="center" class="admin_title" height="30"><STRONG>{--ADMINS_MAILS_EDIT_TITLE--}</STRONG>
+		<TD colspan="2" align="center" class="admin_title" height="30"><strong>{--ADMINS_MAILS_EDIT_TITLE--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_ADMINS_TEMPLATE--}:</STRONG>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_ADMINS_TEMPLATE--}:</strong>
 		</TD>
-		<TD class="admin_title bottom2" align="center"><STRONG>{--ADMIN_ADMINS_CONTACT--}:</STRONG>
+		<TD class="admin_title bottom2" align="center"><strong>{--ADMIN_ADMINS_CONTACT--}:</strong>
 		</TD>
 	</TR>
 	{!__ADMINS_ROWS!}
@@ -20,4 +20,4 @@
 			value="{--ADMIN_ADMINS_CHANGE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_admins_mails_edit_form.tpl b/templates/de/html/admin/admin_admins_mails_edit_form.tpl
index 96dd9b877d..e064333c83 100644
--- a/templates/de/html/admin/admin_admins_mails_edit_form.tpl
+++ b/templates/de/html/admin/admin_admins_mails_edit_form.tpl
@@ -1,8 +1,8 @@
-<FONT class="tiny">{--ADMINS_ADD_MORE_ADMINS--}:</FONT>
-<BR />
-<SELECT name="admin_new[$content[template]]" size="1"
+<div class="tiny">{--ADMINS_ADD_MORE_ADMINS--}:</div>
+<br />
+<select name="admin_new[$content[template]]" size="1"
 	class="admin_select">
-	<OPTION value="x">{--SELECT_NONE--}</OPTION>
+	<option value="x">{--SELECT_NONE--}</option>
 	$content[admins]
-</SELECT>
-<BR />
+</select>
+<br />
diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl
index 54a6f5147e..b3cd36d0a3 100644
--- a/templates/de/html/admin/admin_admins_mails_list.tpl
+++ b/templates/de/html/admin/admin_admins_mails_list.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_mails"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_mails"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="3" align="center" class="admin_title" height="30"><STRONG>{--ADMINS_MAILS_TITLE--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title" height="30"><strong>{--ADMINS_MAILS_TITLE--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD width="30" class="admin_title bottom2 right2" align="center">
-		<STRONG>{--ID_SELECT--}</STRONG></TD>
+		<strong>{--ID_SELECT--}</strong></TD>
 		<TD width="235" class="admin_title bottom2 right2" align="center">
-		<STRONG>{--ADMIN_ADMINS_TEMPLATE--}:</STRONG></TD>
-		<TD width="235" class="admin_title bottom2" align="center"><STRONG>{--ADMIN_ADMINS_CONTACT--}:</STRONG>
+		<strong>{--ADMIN_ADMINS_TEMPLATE--}:</strong></TD>
+		<TD width="235" class="admin_title bottom2" align="center"><strong>{--ADMIN_ADMINS_CONTACT--}:</strong>
 		</TD>
 	</TR>
 	{!__MAILS_ROWS!}
@@ -22,4 +22,4 @@
 			value="{--ADMIN_ADMINS_EDIT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_amenu_delete.tpl b/templates/de/html/admin/admin_amenu_delete.tpl
index 9875063100..c62ff6d2c8 100644
--- a/templates/de/html/admin/admin_amenu_delete.tpl
+++ b/templates/de/html/admin/admin_amenu_delete.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
 		<TD align="center" colspan="2" class="admin_header" height="40">
-		<STRONG>{--DEL_ADMIN_MENU--}</STRONG></TD>
+		<strong>{--DEL_ADMIN_MENU--}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" class="admin_header bottom2">
@@ -20,4 +20,4 @@
 			value="{--DEL_ENTRIES--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_amenu_edit.tpl b/templates/de/html/admin/admin_amenu_edit.tpl
index 9de9036688..b24d6a2c51 100644
--- a/templates/de/html/admin/admin_amenu_edit.tpl
+++ b/templates/de/html/admin/admin_amenu_edit.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <TR>
-	<TH class="admin_title bottom2 right2" align="center" width="30" height="30"><STRONG>{--ID_SELECT--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_ACTION--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_WHAT--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_TITLE--}</STRONG></TH>
-	<TH class="admin_title bottom2" align="center"><STRONG>{--SORT_NAVIGATION--}</STRONG></TH>
+	<TH class="admin_title bottom2 right2" align="center" width="30" height="30"><strong>{--ID_SELECT--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_ACTION--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_WHAT--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_TITLE--}</strong></TH>
+	<TH class="admin_title bottom2" align="center"><strong>{--SORT_NAVIGATION--}</strong></TH>
 </TR>
 {!__MENU_ROWS!}
 <TR>
@@ -16,4 +16,4 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_amenu_edit_form.tpl b/templates/de/html/admin/admin_amenu_edit_form.tpl
index 199adcea60..0821a05e42 100644
--- a/templates/de/html/admin/admin_amenu_edit_form.tpl
+++ b/templates/de/html/admin/admin_amenu_edit_form.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
-		<TD align="center" colspan="2" class="admin_title" height="40"><STRONG>{--EDIT_ADMIN_MENU--}</STRONG>
+		<TD align="center" colspan="2" class="admin_title" height="40"><strong>{--EDIT_ADMIN_MENU--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -21,4 +21,4 @@
 			value="{--SUBMIT_CHANGES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_amenu_edit_row.tpl b/templates/de/html/admin/admin_amenu_edit_row.tpl
index c172710c50..5659e77103 100644
--- a/templates/de/html/admin/admin_amenu_edit_row.tpl
+++ b/templates/de/html/admin/admin_amenu_edit_row.tpl
@@ -39,9 +39,9 @@
 <TR>
 	<TD width="50%" class="admin_edit switch_sw$content[sw]" align="right">
 	{--EDIT_DESCR--}:</TD>
-	<TD width="50%" class="admin_edit switch_sw$content[sw]"><TEXTAREA
+	<TD width="50%" class="admin_edit switch_sw$content[sw]"><textarea
 		name="sel_desc[$content[sel]]" class="admin_normal" rows="10"
-		cols="30">$content[descr]</TEXTAREA></TD>
+		cols="30">$content[descr]</textarea></TD>
 </TR>
 <TR>
 	<TD colspan="2" class="seperator switch_sw$content[sw] bottom2"
diff --git a/templates/de/html/admin/admin_cache_stats.tpl b/templates/de/html/admin/admin_cache_stats.tpl
index d93148d2b1..fac3f7b19c 100644
--- a/templates/de/html/admin/admin_cache_stats.tpl
+++ b/templates/de/html/admin/admin_cache_stats.tpl
@@ -2,7 +2,7 @@
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="2" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_CACHE_STATS_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_CACHE_STATS_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD width="320" class="bottom2 right2" align="right">{--ADMIN_CACHE_DB_HITS--}</TD>
@@ -20,11 +20,11 @@
 			align="right">={!__TOTAL_HITS!}</TD>
 	</TR>
 	<TR>
-		<TD width="320" class="admin_footer right2" align="right"><STRONG>{--ADMIN_CACHE_PERCENTS--}</STRONG></TD>
+		<TD width="320" class="admin_footer right2" align="right"><strong>{--ADMIN_CACHE_PERCENTS--}</strong></TD>
 		<TD width="100" class="admin_footer" style="padding-right: 2px"
-			align="center"><STRONG>{!__CACHE_PERC!}%</STRONG></TD>
+			align="center"><strong>{!__CACHE_PERC!}%</strong></TD>
 	</TR>
 </TABLE>
 
-<DIV class="admin_note"><FONT class="admin_note tiny">{--ADMIN_CACHE_NOTES--}</FONT>
-</DIV>
+<div class="admin_note"><div class="admin_note tiny">{--ADMIN_CACHE_NOTES--}</div>
+</div>
diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl
index d4776a67d8..f39ca570bc 100644
--- a/templates/de/html/admin/admin_config_active.tpl
+++ b/templates/de/html/admin/admin_config_active.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_active"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_active"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="580">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ADMIN_ACTIVE_SETTINGS--}:</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ADMIN_ACTIVE_SETTINGS--}:</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -32,4 +32,4 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl
index 39807fd94f..7e451ec0ba 100644
--- a/templates/de/html/admin/admin_config_admin.tpl
+++ b/templates/de/html/admin/admin_config_admin.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_admin" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_admin" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_ADMIN_MENU_HEADER--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_ADMIN_MENU_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -33,4 +33,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_admins.tpl b/templates/de/html/admin/admin_config_admins.tpl
index 5fe310dcb7..2a122783c1 100644
--- a/templates/de/html/admin/admin_config_admins.tpl
+++ b/templates/de/html/admin/admin_config_admins.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
 	method="post">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="680"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_LIST_ACLS--}:</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_LIST_ACLS--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="30"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="120"><STRONG>{--ADMINS_AID--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_ACTION--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_WHAT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="120"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="30"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="120"><strong>{--ADMINS_AID--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_ACTION--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_WHAT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
 	</TR>
 	{!__ACL_ROWS!}
 	<TR>
@@ -23,4 +23,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_admins_del.tpl b/templates/de/html/admin/admin_config_admins_del.tpl
index f260404241..c8343b3d21 100644
--- a/templates/de/html/admin/admin_config_admins_del.tpl
+++ b/templates/de/html/admin/admin_config_admins_del.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_DELETE_ACLS--}:</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_DELETE_ACLS--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="30"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="120"><STRONG>{--ADMINS_AID--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_ACTION--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_WHAT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="120"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="30"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="120"><strong>{--ADMINS_AID--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_ACTION--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_WHAT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
 	</TR>
 	{!__ACL_ROWS!}
 	<TR>
@@ -21,4 +21,4 @@
 			value="{--ADMINS_REMOVE_ACLS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_admins_del_row.tpl b/templates/de/html/admin/admin_config_admins_del_row.tpl
index 0822c0c234..1be5cdea49 100644
--- a/templates/de/html/admin/admin_config_admins_del_row.tpl
+++ b/templates/de/html/admin/admin_config_admins_del_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><STRONG>$content[id]</STRONG>
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="sel[$content[id]]" value="1"></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 	$content[admin]</TD>
diff --git a/templates/de/html/admin/admin_config_admins_edit.tpl b/templates/de/html/admin/admin_config_admins_edit.tpl
index 2b2b84805c..3cc00f2b41 100644
--- a/templates/de/html/admin/admin_config_admins_edit.tpl
+++ b/templates/de/html/admin/admin_config_admins_edit.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_admins"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_EDIT_ACLS--}:</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_EDIT_ACLS--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="30"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="120"><STRONG>{--ADMINS_AID--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_ACTION--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="204"><STRONG>{--MENU_WHAT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="120"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="30"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="120"><strong>{--ADMINS_AID--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_ACTION--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="204"><strong>{--MENU_WHAT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
 	</TR>
 	{!__ACL_ROWS!}
 	<TR>
@@ -21,4 +21,4 @@
 			value="{--ADMINS_CHANGE_ACLS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_admins_edit_row.tpl b/templates/de/html/admin/admin_config_admins_edit_row.tpl
index e68d98f3f4..12f407e112 100644
--- a/templates/de/html/admin/admin_config_admins_edit_row.tpl
+++ b/templates/de/html/admin/admin_config_admins_edit_row.tpl
@@ -1,16 +1,16 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><STRONG>$content[id]</STRONG>
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="sel[$content[id]]" value="1"></TD>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><SELECT
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><select
 		name="admin[$content[id]]" size="1" class="admin_select">
 		$content[admins_selection]
-	</SELECT></TD>
+	</select></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 	$content[action_selection]</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 	$content[what_selection]</TD>
-	<TD class="switch_sw$content[sw] bottom2" align="center"><SELECT
+	<TD class="switch_sw$content[sw] bottom2" align="center"><select
 		name="mode[$content[id]]" size="1" class="admin_select">
 		$content[mode_options]
-	</SELECT></TD>
+	</select></TD>
 </TR>
diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl
index 28fa01f321..e15a577b27 100644
--- a/templates/de/html/admin/admin_config_autopurge.tpl
+++ b/templates/de/html/admin/admin_config_autopurge.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_autopurge"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="510"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_AUTOPURGE_CONFIGURATION--}</STRONG></TD>
+		<strong>{--ADMIN_AUTOPURGE_CONFIGURATION--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
@@ -94,10 +94,10 @@
 	<TR>
 		<TD align="right">{--ADMIN_OPTION_AUTOPURGE_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="auto_purge_active" value="Y"{--_CFG_AP_ACTIVE_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="auto_purge_active" value="N"{--_CFG_AP_ACTIVE_N--}>
-		</SPAN></TD>
+		</span></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="7" class="seperator">&nbsp;</TD>
@@ -176,4 +176,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 5fac24f74f..9442021778 100644
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_beg"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_beg"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_BEG_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_BEG_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -69,14 +69,14 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_SELECT_BEG_MODE--}:</STRONG></TD>
+		<strong>{--ADMIN_SELECT_BEG_MODE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD align="right" height="20"><INPUT type="radio" name="beg_mode"
-			class="admin_normal" value="DIRECT"{!__BEG_MODE_DIRECT!}>&nbsp;{--BEG_MODE_DIRECT--}<BR />
+			class="admin_normal" value="DIRECT"{!__BEG_MODE_DIRECT!}>&nbsp;{--BEG_MODE_DIRECT--}<br />
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_mode"
@@ -88,7 +88,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_BEG_RALLYE_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_BEG_RALLYE_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -97,7 +97,7 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_rallye"
-			class="admin_normal" value="Y"{!__BEG_RALLYE_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_RALLYE_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_rallye" class="admin_normal" value="N"{!__BEG_RALLYE_N!} />&nbsp;{--NO--}
 		</TD>
 	</TR>
@@ -108,7 +108,7 @@
 		<TD align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_include_own"
-			class="admin_normal" value="Y"{!__BEG_INCLUDE_OWN_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_INCLUDE_OWN_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_include_own" class="admin_normal"
 			value="N"{!__BEG_INCLUDE_OWN_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -131,7 +131,7 @@
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_active"
-			class="admin_normal" value="Y"{!__BEG_ACTIVE_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_ACTIVE_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_active" class="admin_normal" value="N"{!__BEG_ACTIVE_N!} />&nbsp;{--NO--}
 		</TD>
 	</TR>
@@ -144,12 +144,12 @@
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center">
-			<SELECT name="beg_pay_mode" size="1">
-				<OPTION value="IMG"{!__BEG_PAY_MODE_IMG!}>{--ADMIN_BEG_PAY_MODE_IMG--}</OPTION>
-				<OPTION value="JS"{!__BEG_PAY_MODE_JS!}>{--ADMIN_BEG_PAY_MODE_JS--}</OPTION>
-				<OPTION value="BOTH"{!__BEG_PAY_MODE_BOTH!}>{--ADMIN_BEG_PAY_MODE_BOTH--}</OPTION>
-				<OPTION value="NONE"{!__BEG_PAY_MODE_NONE!}>{--ADMIN_BEG_PAY_MODE_NONE--}</OPTION>
-			</SELECT>
+			<select name="beg_pay_mode" size="1">
+				<option value="IMG"{!__BEG_PAY_MODE_IMG!}>{--ADMIN_BEG_PAY_MODE_IMG--}</option>
+				<option value="JS"{!__BEG_PAY_MODE_JS!}>{--ADMIN_BEG_PAY_MODE_JS--}</option>
+				<option value="BOTH"{!__BEG_PAY_MODE_BOTH!}>{--ADMIN_BEG_PAY_MODE_BOTH--}</option>
+				<option value="NONE"{!__BEG_PAY_MODE_NONE!}>{--ADMIN_BEG_PAY_MODE_NONE--}</option>
+			</select>
 		</TD>
 	</TR>
 	<TR>
@@ -157,7 +157,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-			<STRONG>{--ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS--}</STRONG>
+			<strong>{--ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -167,7 +167,7 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_ral_en_notify"
-			class="admin_normal" value="Y"{!__BEG_RAL_EN_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_RAL_EN_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_ral_en_notify" class="admin_normal"
 			value="N"{!__BEG_RAL_EN_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -178,7 +178,7 @@
 		<TD align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_ral_di_notify"
-			class="admin_normal" value="Y"{!__BEG_RAL_DI_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_RAL_DI_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_ral_di_notify" class="admin_normal"
 			value="N"{!__BEG_RAL_DI_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -189,7 +189,7 @@
 		<TD align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="beg_new_mem_notify"
-			class="admin_normal" value="Y"{!__BEG_NEW_MEMBER_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BEG_NEW_MEMBER_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="beg_new_mem_notify" class="admin_normal"
 			value="N"{!__BEG_NEW_MEMBER_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -221,4 +221,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl
index 2ae7b268c7..9a1af7476a 100644
--- a/templates/de/html/admin/admin_config_birthday.tpl
+++ b/templates/de/html/admin/admin_config_birthday.tpl
@@ -1,21 +1,21 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_birthday"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_birthday"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_BIRTHDAY_HEADER--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_BIRTHDAY_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD width="400" align="right">{--ADMIN_BIRTHDAY_POINTS--}:<BR />
-		<FONT class="admin_note">({--ADMIN_BIRTHDAY_POINTS_NOTE--})</FONT></TD>
+		<TD width="400" align="right">{--ADMIN_BIRTHDAY_POINTS--}:<br />
+		<div class="admin_note">({--ADMIN_BIRTHDAY_POINTS_NOTE--})</div></TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="170"><INPUT type="text" name="birthday_points"
 			class="admin_normal" value="{!__POINTS_VALUE!}" size="4"
-			maxlength="6">&nbsp;<FONT class="tiny">({!POINTS!})</FONT></TD>
+			maxlength="6">&nbsp;<div class="tiny">({!POINTS!})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -27,7 +27,7 @@
 		<TD align="right" height="20">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="birthday_active"
-			class="admin_normal" value="Y"{!__BIRTHDAY_ACTIVE_Y!} />&nbsp;{--YES--}<BR />
+			class="admin_normal" value="Y"{!__BIRTHDAY_ACTIVE_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="birthday_active" class="admin_normal"
 			value="N"{!__BIRTHDAY_ACTIVE_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -36,14 +36,14 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_SELECT_BIRTHDAY_MODE--}:</STRONG></TD>
+		<strong>{--ADMIN_SELECT_BIRTHDAY_MODE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD align="right" height="20"><INPUT type="radio"
-			name="birthday_mode" class="admin_normal" value="DIRECT"{!__BIRTHDAY_MODE_DIRECT!}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<BR />
+			name="birthday_mode" class="admin_normal" value="DIRECT"{!__BIRTHDAY_MODE_DIRECT!}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<br />
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="radio" name="birthday_mode"
@@ -60,4 +60,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl
index df192c3cee..48e65c912d 100644
--- a/templates/de/html/admin/admin_config_bonus.tpl
+++ b/templates/de/html/admin/admin_config_bonus.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_bonus"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_bonus"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ACTIVATE_BONUS_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_ACTIVATE_BONUS_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -14,7 +14,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_active" class="admin_normal" value="Y"{!__BONUS_ACTIVE_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_active" class="admin_normal" value="Y"{!__BONUS_ACTIVE_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_active" class="admin_normal" value="N"{!__BONUS_ACTIVE_N!} />&nbsp;{--NO--}
 		</TD>
 	</TR>
@@ -26,7 +26,7 @@
 		&nbsp;{--ADMIN_BONUS_INCLUDE_OWN--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_include_own" class="admin_normal" value="Y"{!__BONUS_INCLUDE_OWN_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_include_own" class="admin_normal" value="Y"{!__BONUS_INCLUDE_OWN_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_include_own" class="admin_normal"
 			value="N"{!__BONUS_INCLUDE_OWN_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -41,7 +41,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_click_yn" class="admin_normal" value="Y"{!__BONUS_CLICK_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_click_yn" class="admin_normal" value="Y"{!__BONUS_CLICK_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_click_yn" class="admin_normal"
 			value="N"{!__BONUS_CLICK_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -56,7 +56,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_login_yn" class="admin_normal" value="Y"{!__BONUS_LOGIN_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_login_yn" class="admin_normal" value="Y"{!__BONUS_LOGIN_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_login_yn" class="admin_normal"
 			value="N"{!__BONUS_LOGIN_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -71,7 +71,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_order_yn" class="admin_normal" value="Y"{!__BONUS_ORDER_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_order_yn" class="admin_normal" value="Y"{!__BONUS_ORDER_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_order_yn" class="admin_normal"
 			value="N"{!__BONUS_ORDER_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -86,7 +86,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_stats_yn" class="admin_normal" value="Y"{!__BONUS_STATS_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_stats_yn" class="admin_normal" value="Y"{!__BONUS_STATS_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_stats_yn" class="admin_normal"
 			value="N"{!__BONUS_STATS_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -101,7 +101,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_REF_INCLUDE--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_ref_yn" class="admin_normal" value="Y"{!__BONUS_REF_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_ref_yn" class="admin_normal" value="Y"{!__BONUS_REF_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value="N"{!__BONUS_REF_N!} />&nbsp;{--NO--}
 		</TD>
 	</TR>
@@ -110,7 +110,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_BONUS_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_BONUS_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -121,7 +121,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="text"
 			name="bonus_order" class="admin_normal" size="8" maxlength="20"
-			value="{!__ORDER_VALUE!}">&nbsp;<FONT class="admin_note">({!POINTS!})</FONT>
+			value="{!__ORDER_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div>
 		</TD>
 	</TR>
 	<TR>
@@ -133,7 +133,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="text"
 			name="bonus_ref" class="admin_normal" size="8" maxlength="20"
-			value="{!__REF_VALUE!}">&nbsp;<FONT class="admin_note">({!POINTS!})</FONT>
+			value="{!__REF_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div>
 		</TD>
 	</TR>
 	<TR>
@@ -145,7 +145,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="text"
 			name="bonus_stats" class="admin_normal" size="8" maxlength="20"
-			value="{!__STATS_VALUE!}">&nbsp;<FONT class="admin_note">({!POINTS!})</FONT>
+			value="{!__STATS_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div>
 		</TD>
 	</TR>
 	<TR>
@@ -157,7 +157,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="text"
 			name="login_bonus" class="admin_normal" size="8" maxlength="20"
-			value="{!__LOGIN_VALUE!}">&nbsp;<FONT class="admin_note">({!POINTS!})</FONT>
+			value="{!__LOGIN_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div>
 		</TD>
 	</TR>
 	<TR>
@@ -165,7 +165,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_BONUS_TURBO_BONUS_TITLE--}:</STRONG></TD>
+		<strong>{--ADMIN_BONUS_TURBO_BONUS_TITLE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -175,7 +175,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center"><INPUT type="text" name="turbo_bonus"
 			class="admin_normal" size="10" maxlength="20"
-			value="{!__TURBO_VALUE!}">&nbsp;<FONT class="admin_note">({!POINTS!})</FONT>
+			value="{!__TURBO_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div>
 		</TD>
 	</TR>
 	<TR>
@@ -183,18 +183,18 @@
 	</TR>
 	<TR>
 		<TD align="right" height="20" valign="top">
-		{--ADMIN_BONUS_TURBO_RATES--}:<BR />
-		<BR />
-		<DIV align="left">
-		<OL>
+		{--ADMIN_BONUS_TURBO_RATES--}:<br />
+		<br />
+		<div align="left">
+		<ol>
 			<LH>
-			<STRONG>{--ADMIN_BONUS_TURBO_RATES_NOTE1--}:</STRONG>
+			<strong>{--ADMIN_BONUS_TURBO_RATES_NOTE1--}:</strong>
 			</LH>
-			<LI>{--ADMIN_BONUS_TURBO_RATES_NOTE2--}</LI>
-			<LI>{--ADMIN_BONUS_TURBO_RATES_NOTE3--}</LI>
-			<LI>{--ADMIN_BONUS_TURBO_RATES_NOTE4--}</LI>
-		</OL>
-		</DIV>
+			<li>{--ADMIN_BONUS_TURBO_RATES_NOTE2--}</li>
+			<li>{--ADMIN_BONUS_TURBO_RATES_NOTE3--}</li>
+			<li>{--ADMIN_BONUS_TURBO_RATES_NOTE4--}</li>
+		</ol>
+		</div>
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD align="center" valign="top">{!__TRATES_LIST!}</TD>
@@ -204,7 +204,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:</STRONG></TD>
+		<strong>{--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -227,7 +227,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_BONUS_TURBO_MISC_TITLE--}:</STRONG></TD>
+		<strong>{--ADMIN_BONUS_TURBO_MISC_TITLE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -264,7 +264,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:</STRONG></TD>
+		<strong>{--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -274,7 +274,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_en_notify" class="admin_normal" value="Y"{!__BONUS_EN_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_en_notify" class="admin_normal" value="Y"{!__BONUS_EN_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_en_notify" class="admin_normal"
 			value="N"{!__BONUS_EN_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -286,7 +286,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_di_notify" class="admin_normal" value="Y"{!__BONUS_DI_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_di_notify" class="admin_normal" value="Y"{!__BONUS_DI_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_di_notify" class="admin_normal"
 			value="N"{!__BONUS_DI_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -298,7 +298,7 @@
 		&nbsp;{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="radio"
-			name="bonus_new_mem_notify" class="admin_normal" value="Y"{!__BONUS_NEW_MEMBER_NOTIFY_Y!} />&nbsp;{--YES--}<BR />
+			name="bonus_new_mem_notify" class="admin_normal" value="Y"{!__BONUS_NEW_MEMBER_NOTIFY_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="bonus_new_mem_notify" class="admin_normal"
 			value="N"{!__BONUS_NEW_MEMBER_NOTIFY_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -311,8 +311,7 @@
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD width="195" align="center"><INPUT type="text"
 			name="bonus_notify_points" class="admin_normal" size="8"
-			maxlength="20" value="{!__NOTIFY_VALUE!}">&nbsp;<FONT
-			class="admin_note">({!POINTS!})</FONT></TD>
+			maxlength="20" value="{!__NOTIFY_VALUE!}">&nbsp;<div class="admin_note">({!POINTS!})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -333,4 +332,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_cache.tpl b/templates/de/html/admin/admin_config_cache.tpl
index 15c960d7e1..b65d9f838c 100644
--- a/templates/de/html/admin/admin_config_cache.tpl
+++ b/templates/de/html/admin/admin_config_cache.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_cache"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_cache"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_CACHE_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_CACHE_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" class="seperator" height="10">&nbsp;</TD>
@@ -125,4 +125,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl
index d620dbe4ea..b9f04681c5 100644
--- a/templates/de/html/admin/admin_config_cats.tpl
+++ b/templates/de/html/admin/admin_config_cats.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_cats"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_cats"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
 	<TR>
 		<TD align="center" colspan="4" class="admin_header bottom2"
-			height="50"><STRONG>{--EDIT_DEL_CATEGORIES--}</STRONG></TD>
+			height="50"><strong>{--EDIT_DEL_CATEGORIES--}</strong></TD>
 	</TR>
 	<TR>
-		<TD class="admin_title bottom2 right2" width="40" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--CATNAME--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" width="120" align="center"><STRONG>{--IS_VISIBLE--}</STRONG></TD>
-		<TD class="admin_title bottom2" width="120" align="center"><STRONG>{--SORTING_KEY--}</STRONG></TD>
+		<TD class="admin_title bottom2 right2" width="40" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--CATNAME--}</strong></TD>
+		<TD class="admin_title bottom2 right2" width="120" align="center"><strong>{--IS_VISIBLE--}</strong></TD>
+		<TD class="admin_title bottom2" width="120" align="center"><strong>{--SORTING_KEY--}</strong></TD>
 	</TR>
 	{!__CAT_ROWS!}
 	<TR>
@@ -21,4 +21,4 @@
 			name="del" class="admin_delete" value="{--DEL_CATS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl
index e72769dee7..9a1a8241c8 100644
--- a/templates/de/html/admin/admin_config_doubler.tpl
+++ b/templates/de/html/admin/admin_config_doubler.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_doubler"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_doubler"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_DOUBLER_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_DOUBLER_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -90,7 +90,7 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!} />&nbsp;{--YES--}<BR />
+			name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="doubler_sent_all" class="admin_normal"
 
 			value="N"{!__DOUBLER_SENT_ALL_N!} />&nbsp;{--NO--}</TD>
@@ -102,7 +102,7 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_JACKPOT--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!} />&nbsp;{--YES--}<BR />
+			name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="doubler_jackpot" class="admin_normal"
 			value="N"{!__DOUBLER_JACKPOT_N!} />&nbsp;{--NO--}</TD>
 	</TR>
@@ -113,7 +113,7 @@
 		<TD align="right" height="20">{--ADMIN_DOUBLER_OWN--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!} />&nbsp;{--YES--}<BR />
+			name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!} />&nbsp;{--YES--}<br />
 		<INPUT type="radio" name="doubler_own" class="admin_normal" value="N"{!__DOUBLER_OWN_N!} />&nbsp;{--NO--}
 		</TD>
 	</TR>
@@ -141,7 +141,7 @@
 	</TR>
 	<TR>
 		<TD align="center" height="30" colspan="3" class="admin_title bottom2">
-		<STRONG>{--ADMIN_DOUBLER_SEND_MODE--}:</STRONG></TD>
+		<strong>{--ADMIN_DOUBLER_SEND_MODE--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -154,11 +154,11 @@
 	</TR>
 	<TR>
 		<TD align="center" height="20"><INPUT type="radio"
-			name="doubler_send_mode" class="admin_normal" value="DIRECT"{!__DOUBLER_SEND_DIRECT!}><BR />
+			name="doubler_send_mode" class="admin_normal" value="DIRECT"{!__DOUBLER_SEND_DIRECT!}><br />
 		</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
 		<TD style="padding-left: 5px"><INPUT type="radio"
-			name="doubler_send_mode" class="admin_normal" value="RESET"{!__DOUBLER_SEND_RESET!}><BR />
+			name="doubler_send_mode" class="admin_normal" value="RESET"{!__DOUBLER_SEND_RESET!}><br />
 		</TD>
 	</TR>
 	<TR>
@@ -166,7 +166,7 @@
 	</TR>
 	<TR>
 		<TD align="center" height="30" colspan="3" class="admin_title bottom2">
-		<STRONG>{--ADMIN_DOUBLER_DISPLAY_SETTINGS--}:</STRONG></TD>
+		<strong>{--ADMIN_DOUBLER_DISPLAY_SETTINGS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -174,10 +174,10 @@
 	<TR>
 		<TD align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_NEW--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
-		<TD style="padding-left: 5px"><SELECT name="doubler_display_new"
+		<TD style="padding-left: 5px"><select name="doubler_display_new"
 			size="1" class="admin_select">
 			{!__DOUBLER_DISPLAY_NEW!}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -185,10 +185,10 @@
 	<TR>
 		<TD align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_PAY--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
-		<TD style="padding-left: 5px"><SELECT name="doubler_display_pay"
+		<TD style="padding-left: 5px"><select name="doubler_display_pay"
 			size="1" class="admin_select">
 			{!__DOUBLER_DISPLAY_PAY!}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -196,10 +196,10 @@
 	<TR>
 		<TD align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_OLD--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
-		<TD style="padding-left: 5px"><SELECT name="doubler_display_old"
+		<TD style="padding-left: 5px"><select name="doubler_display_old"
 			size="1" class="admin_select">
 			{!__DOUBLER_DISPLAY_OLD!}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
@@ -211,4 +211,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_email.tpl b/templates/de/html/admin/admin_config_email.tpl
index 5bd62996b2..594a37534d 100644
--- a/templates/de/html/admin/admin_config_email.tpl
+++ b/templates/de/html/admin/admin_config_email.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_email"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_email"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
 	<TR>
-		<TD align="center" colspan="3" class="admin_title" height="30"><STRONG>{--EDIT_DEL_MAX_VALUES--}</STRONG>
+		<TD align="center" colspan="3" class="admin_title" height="30"><strong>{--EDIT_DEL_MAX_VALUES--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="admin_title bottom2 right2" width="30" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" width="275" align="center"><STRONG>{--MAX_VALUE!}</STRONG></TD>
-		<TD class="admin_title bottom2" width="275" align="center"><STRONG>{--MAX_COMMENT--}</STRONG></TD>
+		<TD class="admin_title bottom2 right2" width="30" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_title bottom2 right2" width="275" align="center"><strong>{--MAX_VALUE!}</strong></TD>
+		<TD class="admin_title bottom2" width="275" align="center"><strong>{--MAX_COMMENT--}</strong></TD>
 	</TR>
 	{!__ROWS!}
 	<TR>
@@ -20,4 +20,4 @@
 			name="del" class="admin_delete" value="{--DEL_MAX_V--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_email_del.tpl b/templates/de/html/admin/admin_config_email_del.tpl
index 8b3197e35f..b2e39b030b 100644
--- a/templates/de/html/admin/admin_config_email_del.tpl
+++ b/templates/de/html/admin/admin_config_email_del.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_email&amp;do=del"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" height="30" class="bottom"><STRONG>{--DELETE_MRECEIVE--}:</STRONG></TD>
+		<TD align="center" height="30" class="bottom"><strong>{--DELETE_MRECEIVE--}:</strong></TD>
 	</TR>
 	{!__ROWS!}
 	<TR>
@@ -16,4 +16,4 @@
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_email_del_row.tpl b/templates/de/html/admin/admin_config_email_del_row.tpl
index 0adc260c4d..4435ec4952 100644
--- a/templates/de/html/admin/admin_config_email_del_row.tpl
+++ b/templates/de/html/admin/admin_config_email_del_row.tpl
@@ -2,8 +2,8 @@
 	<TD height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
 </TR>
 <TR>
-	<TD class="switch_sw$content[sw]" align="center"><STRONG>{--MRECEIVE_ID--}
-	$content[id]:</STRONG></TD>
+	<TD class="switch_sw$content[sw]" align="center"><strong>{--MRECEIVE_ID--}
+	$content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_config_email_edit.tpl b/templates/de/html/admin/admin_config_email_edit.tpl
index e4efcd8563..0fc0f8f669 100644
--- a/templates/de/html/admin/admin_config_email_edit.tpl
+++ b/templates/de/html/admin/admin_config_email_edit.tpl
@@ -1,7 +1,7 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_email&amp;do=edit" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_email&amp;do=edit" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" colspan="2" height="30" class="bottom"><STRONG>{--EDIT_MRECEIVE--}:</STRONG></TD>
+		<TD align="center" colspan="2" height="30" class="bottom"><strong>{--EDIT_MRECEIVE--}:</strong></TD>
 	</TR>
 	{!__ROWS!}
 	<TR>
@@ -14,4 +14,4 @@
 		<TD colspan="2" height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_email_edit_row.tpl b/templates/de/html/admin/admin_config_email_edit_row.tpl
index 4cac110357..c717a4238d 100644
--- a/templates/de/html/admin/admin_config_email_edit_row.tpl
+++ b/templates/de/html/admin/admin_config_email_edit_row.tpl
@@ -2,8 +2,8 @@
 	<TD colspan="2" height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
 </TR>
 <TR>
-	<TD class="switch_sw$content[sw]" colspan="2" align="center"><STRONG>{--MRECEIVE_ID--}
-	$content[id]:</STRONG> <INPUT type="hidden" name="id[$content[id]]" value="1">
+	<TD class="switch_sw$content[sw]" colspan="2" align="center"><strong>{--MRECEIVE_ID--}
+	$content[id]:</strong> <INPUT type="hidden" name="id[$content[id]]" value="1">
 	</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl
index bb8b47d833..76a1657175 100644
--- a/templates/de/html/admin/admin_config_extensions.tpl
+++ b/templates/de/html/admin/admin_config_extensions.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_extensions"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_EXTENSIONS_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_EXTENSIONS_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="bottom2" align="right" width="350" height="20">
@@ -22,4 +22,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl
index d469b51d13..75a4221603 100644
--- a/templates/de/html/admin/admin_config_holiday.tpl
+++ b/templates/de/html/admin/admin_config_holiday.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_holiday"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_holiday"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--HOLIDAY_ADMIN_CONFIG_HEADER--}</STRONG></TD>
+		<strong>{--HOLIDAY_ADMIN_CONFIG_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -13,8 +13,7 @@
 		<TD width="300" style="padding-left: 5px">{--HOLIDAY_ADMIN_MAX_HOLIDAY--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD width="270"><INPUT type="text" name="holiday_max"
-			class="admin_normal" value="{!__MAX_VALUE!}" size="4" maxlength="6">&nbsp;<FONT
-			class="tiny">({--DAYS--})</FONT></TD>
+			class="admin_normal" value="{!__MAX_VALUE!}" size="4" maxlength="6">&nbsp;<div class="tiny">({--DAYS--})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -32,7 +31,7 @@
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD width="270"><INPUT type="radio" name="holiday_mode"
 			class="admin_normal" value="RESET"{!__RESET_DEFAULT!}">
-		{--HOLIDAY_ADMIN_MODE_RESET--}<BR />
+		{--HOLIDAY_ADMIN_MODE_RESET--}<br />
 		<INPUT type="radio" name="holiday_mode" class="admin_normal"
 			value="DIRECT"{!__DIRECT_DEFAULT!}">
 		{--HOLIDAY_ADMIN_MODE_DIRECT--}</TD>
@@ -47,4 +46,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl
index 0ad8af6e70..03e02e2e0e 100644
--- a/templates/de/html/admin/admin_config_home.tpl
+++ b/templates/de/html/admin/admin_config_home.tpl
@@ -1,18 +1,18 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="3" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_CONFIG_HOME--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title" height="30"><strong>{--ADMIN_CONFIG_HOME--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MENU_WHAT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2"><STRONG>{--HOME_ACTION--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MENU_WHAT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2"><strong>{--HOME_ACTION--}</strong></TD>
 	</TR>
 	{!__HOME_ROWS!}
 	<TR>
-		<TD colspan="3" class="admin_footer"><FONT
-			class="admin_note">{--HOME_BOTTOM_NOTE--}</FONT>
+		<TD colspan="3" class="admin_footer">
+			<div class="admin_note">{--HOME_BOTTOM_NOTE--}</div>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl
index 0cb3dbd3ed..f572c46055 100644
--- a/templates/de/html/admin/admin_config_home_main.tpl
+++ b/templates/de/html/admin/admin_config_home_main.tpl
@@ -2,14 +2,14 @@
 	class="admin_table" width="320">
 	<TR>
 		<TD align="center" class="admin_header top2 bottom2 left2 right2"
-			height="30"><STRONG>{--ADMIN_CONFIG_HOME_TITLE--}</STRONG></TD>
+			height="30"><strong>{--ADMIN_CONFIG_HOME_TITLE--}</strong></TD>
 	</TR>
 	<TR>
-		<TD class="guest_menu_row"><A class="menu_blur"
-			href="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=target">&nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</A></TD>
+		<TD class="guest_menu_row"><a class="menu_blur"
+			href="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=target">&nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</a></TD>
 	</TR>
 	<TR>
-		<TD class="guest_menu_bottom"><A class="menu_blur"
-			href="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings">&nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</A></TD>
+		<TD class="guest_menu_bottom"><a class="menu_blur"
+			href="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings">&nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</a></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl
index 9b7f511fbf..638785b5f8 100644
--- a/templates/de/html/admin/admin_config_home_settings.tpl
+++ b/templates/de/html/admin/admin_config_home_settings.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="510">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_HOME_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_HOME_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -14,21 +14,21 @@
 		<TD align="right" width="320" height="20">
 		{--ADMIN_CONFIG_INDEX_DELAY--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
-		<TD width="185" align="center"><SELECT name="index_delay"
+		<TD width="185" align="center"><select name="index_delay"
 			size="1" class="admin_select">
-			<OPTION value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
-			<OPTION value="0"$content[0]>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
+			<option value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</option>
+			<option value="0"$content[0]>{--ADMIN_INDEX_MANUAL_FORWARD--}</option>
 			<!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen //-->
-			<OPTION value="1"$content[1]>1 {--_SECONDS--}</OPTION>
-			<OPTION value="2"$content[2]>2 {--_SECONDS--}</OPTION>
-			<OPTION value="3"$content[3]>3 {--_SECONDS--}</OPTION>
-			<OPTION value="4"$content[4]>4 {--_SECONDS--}</OPTION>
-			<OPTION value="5"$content[5]>5 {--_SECONDS--}</OPTION>
-			<OPTION value="10"$content[10]>10 {--_SECONDS--}</OPTION>
-			<OPTION value="15"$content[15]>15 {--_SECONDS--}</OPTION>
-			<OPTION value="30"$content[30]>30 {--_SECONDS--}</OPTION>
+			<option value="1"$content[1]>1 {--_SECONDS--}</option>
+			<option value="2"$content[2]>2 {--_SECONDS--}</option>
+			<option value="3"$content[3]>3 {--_SECONDS--}</option>
+			<option value="4"$content[4]>4 {--_SECONDS--}</option>
+			<option value="5"$content[5]>5 {--_SECONDS--}</option>
+			<option value="10"$content[10]>10 {--_SECONDS--}</option>
+			<option value="15"$content[15]>15 {--_SECONDS--}</option>
+			<option value="30"$content[30]>30 {--_SECONDS--}</option>
 			<!-- Laenger sollte es aber nun nicht dauern! //-->
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -48,4 +48,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl
index cd06139410..d3eb273660 100644
--- a/templates/de/html/admin/admin_config_home_settings_pro.tpl
+++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="510">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_HOME_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_HOME_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -14,18 +14,18 @@
 		<TD align="right" width="320" height="20">
 		{--ADMIN_CONFIG_INDEX_DELAY--}:</TD>
 		<TD class="seperator" width="5">&nbsp;</TD>
-		<TD width="185" align="center"><SELECT name="index_delay"
+		<TD width="185" align="center"><select name="index_delay"
 			size="1" class="admin_select">
-			<OPTION value="-1"{--$content[-1]--}>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
-			<OPTION value="0"{--$content[0]--}>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
+			<option value="-1"{--$content[-1]--}>{--ADMIN_INDEX_MANUAL_FORWARD--}</option>
+			<option value="0"{--$content[0]--}>{--ADMIN_INDEX_NO_DELAY--}</option>
 			<!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen -->
-			<OPTION value="1"{--$content[1]--}>1 {--_SECONDS--}</OPTION>
-			<OPTION value="2"{--$content[2]--}>2 {--_SECONDS--}</OPTION>
-			<OPTION value="3"{--$content[3]--}>3 {--_SECONDS--}</OPTION>
-			<OPTION value="4"{--$content[4]--}>4 {--_SECONDS--}</OPTION>
-			<OPTION value="5"{--$content[5]--}>5 {--_SECONDS--}</OPTION>
-			<OPTION value="10"{--$content[10]--}>10 {--_SECONDS--}</OPTION>
-		</SELECT></TD>
+			<option value="1"{--$content[1]--}>1 {--_SECONDS--}</option>
+			<option value="2"{--$content[2]--}>2 {--_SECONDS--}</option>
+			<option value="3"{--$content[3]--}>3 {--_SECONDS--}</option>
+			<option value="4"{--$content[4]--}>4 {--_SECONDS--}</option>
+			<option value="5"{--$content[5]--}>5 {--_SECONDS--}</option>
+			<option value="10"{--$content[10]--}>10 {--_SECONDS--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -45,4 +45,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl
index 86f18170a3..ade1038ade 100644
--- a/templates/de/html/admin/admin_config_mediadata.tpl
+++ b/templates/de/html/admin/admin_config_mediadata.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_mediadata"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="580">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ADMIN_MEDIADATA_SETTINGS--}:</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ADMIN_MEDIADATA_SETTINGS--}:</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -43,8 +43,8 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note"><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_START_NOTE--}<BR />
-<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_STAGE_NOTE--}<BR />
-</DIV>
+<div class="admin_note"><strong><BIG>&middot;</BIG></strong>&nbsp;{--ADMIN_MEDIADATA_MT_START_NOTE--}<br />
+<strong><BIG>&middot;</BIG></strong>&nbsp;{--ADMIN_MEDIADATA_MT_STAGE_NOTE--}<br />
+</div>
diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl
index fe7a199312..3d07043c2f 100644
--- a/templates/de/html/admin/admin_config_newsletter.tpl
+++ b/templates/de/html/admin/admin_config_newsletter.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_newsletter"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="520" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2 seperator" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ADMIN_NEWSLETTER_SETTINGS--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ADMIN_NEWSLETTER_SETTINGS--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -32,4 +32,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl
index cbf9424b0b..e503b120a1 100644
--- a/templates/de/html/admin/admin_config_nickname.tpl
+++ b/templates/de/html/admin/admin_config_nickname.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_nickname" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_nickname" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--NICKNAME_ADMIN_CONFIG_HEADER--}</STRONG></TD>
+		<strong>{--NICKNAME_ADMIN_CONFIG_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -44,4 +44,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl
index 12e0e88af4..b9bdfb4225 100644
--- a/templates/de/html/admin/admin_config_order.tpl
+++ b/templates/de/html/admin/admin_config_order.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_order" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_order" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="580">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
 		<TD class="admin_title bottom2" colspan="3" align="center">
-			<STRONG>{--ORDER_ADMIN_SETTINGS--}:</STRONG>
+			<strong>{--ORDER_ADMIN_SETTINGS--}:</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -80,10 +80,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_CHECK_EMAIL_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="test_text" value="N"{--_CFG_TEST_TEXT_N--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="test_text" value="Y"{--_CFG_TEST_TEXT_Y--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -95,10 +95,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="test_subj" value="N"{--_CFG_TEST_SUBJ_N--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="test_subj" value="Y"{--_CFG_TEST_SUBJ_Y--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -110,10 +110,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_URL_BLACKLIST--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="url_blacklist" value="Y"{--_CFG_URL_BLIST_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="url_blacklist" value="N"{--_CFG_URL_BLIST_N--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -126,11 +126,11 @@
 		<TD align="right" width="275">{--ADMIN_REPAY_ON_DELETE_MODE--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center" width="275">
-			<SELECT name="repay_deleted_mails" class="admin_select" size="1">
-				<OPTION value="REPAY"{--_CFG_REPAY_POINTS_REPAY--}">{--ADMIN_CFG_REPAY_POINTS_REPAY--}</OPTION>
-				<OPTION value="JACKPOT"{--_CFG_REPAY_POINTS_JACKPOT--}">{--ADMIN_CFG_REPAY_POINTS_JACKPOT--}</OPTION>
-				<OPTION value="SHRED"{--_CFG_REPAY_POINTS_SHRED--}">{--ADMIN_CFG_REPAY_POINTS_SHRED--}</OPTION>
-			</SELECT>
+			<select name="repay_deleted_mails" class="admin_select" size="1">
+				<option value="REPAY"{--_CFG_REPAY_POINTS_REPAY--}">{--ADMIN_CFG_REPAY_POINTS_REPAY--}</option>
+				<option value="JACKPOT"{--_CFG_REPAY_POINTS_JACKPOT--}">{--ADMIN_CFG_REPAY_POINTS_JACKPOT--}</option>
+				<option value="SHRED"{--_CFG_REPAY_POINTS_SHRED--}">{--ADMIN_CFG_REPAY_POINTS_SHRED--}</option>
+			</select>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -140,7 +140,7 @@
 	</TR>
 	<TR>
 		<TD colspan="5" height="30" class="admin_title bottom2" align="center">
-		<STRONG>{--ADMIN_ORDER_SELECTION_SETTINGS--}:</STRONG></TD>
+		<strong>{--ADMIN_ORDER_SELECTION_SETTINGS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" height="7" class="seperator">&nbsp;</TD>
@@ -150,10 +150,10 @@
 		<TD align="right" width="275">
 		{--ADMIN_ORDER_SELECTION_COLUMN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center" width="275"><SELECT name="order_select"
+		<TD align="center" width="275"><select name="order_select"
 			class="admin_select" size="1">
 			{!__ORDER_SELECT!}
-		</SELECT></TD>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -164,10 +164,10 @@
 		<TD align="right" width="275">{--ADMIN_ORDER_SELECTION_MODE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center" width="275">
-			<SELECT name="order_mode" class="admin_select" size="1">
-				<OPTION value="ASC"{!__ASC_DEFAULT!}">{--SORT_ASCENDING--}</OPTION>
-				<OPTION value="DESC"{!__DESC_DEFAULT!}">{--SORT_DESCENDING--}</OPTION>
-			</SELECT>
+			<select name="order_mode" class="admin_select" size="1">
+				<option value="ASC"{!__ASC_DEFAULT!}">{--SORT_ASCENDING--}</option>
+				<option value="DESC"{!__DESC_DEFAULT!}">{--SORT_DESCENDING--}</option>
+			</select>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -176,7 +176,7 @@
 	</TR>
 	<TR>
 		<TD colspan="5" height="30" class="admin_title bottom2" align="center">
-		<STRONG>{--ORDER_ADMIN_MISC_SETTINGS--}:</STRONG></TD>
+		<strong>{--ORDER_ADMIN_MISC_SETTINGS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" height="7" class="seperator">&nbsp;</TD>
@@ -203,4 +203,4 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_order_form.tpl b/templates/de/html/admin/admin_config_order_form.tpl
index 808090f70e..2102c7dbef 100644
--- a/templates/de/html/admin/admin_config_order_form.tpl
+++ b/templates/de/html/admin/admin_config_order_form.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_order"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_order"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="580">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--ORDER_ADMIN_SETTINGS--}:</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--ORDER_ADMIN_SETTINGS--}:</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -39,7 +39,7 @@
 	</TR>
 	<TR>
 		<TD colspan="5" height="30" class="admin_title bottom2" align="center">
-			<STRONG>{--ORDER_ADMIN_MISC_SETTINGS--}:</STRONG>
+			<strong>{--ORDER_ADMIN_MISC_SETTINGS--}:</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -68,4 +68,4 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index 3fbb7df0f7..f8f4fb0284 100644
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_other" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_other" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="520" class="admin_table dashed">
 	<TR>
 		<TD colspan="5" height="7" class="seperator admin_title">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
-		<TD colspan="3" align="center" class="admin_title"><STRONG>{--ADMIN_OTHER_SETTINGS--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title"><strong>{--ADMIN_OTHER_SETTINGS--}</strong>
 		</TD>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
 	</TR>
@@ -22,8 +22,7 @@
 		<TD align="right">{--ADMIN_OPTION_CODE_LENGTH--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><INPUT type="text" name="code_length" class="admin_normal"
-			size="3" maxlength="5" value="{--_CFG_CODE_LENGTH--}"><FONT
-			class="tiny">{--ADMIN_CODE_LENGTH_NOTE--}</FONT></TD>
+			size="3" maxlength="5" value="{--_CFG_CODE_LENGTH--}"><div class="tiny">{--ADMIN_CODE_LENGTH_NOTE--}</div></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -119,14 +118,14 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right" width="340">{--ADMIN_OPTION_MAX_COMMA--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="max_comma" size="1" class="admin_select">
-			<OPTION value="0"{--_COMMA_DEF_0--}>0</OPTION>
-			<OPTION value="1"{--_COMMA_DEF_1--}>1</OPTION>
-			<OPTION value="2"{--_COMMA_DEF_2--}>2</OPTION>
-			<OPTION value="3"{--_COMMA_DEF_3--}>3</OPTION>
-			<OPTION value="4"{--_COMMA_DEF_4--}>4</OPTION>
-			<OPTION value="5"{--_COMMA_DEF_5--}>5</OPTION>
-		</SELECT></TD>
+		<TD><select name="max_comma" size="1" class="admin_select">
+			<option value="0"{--_COMMA_DEF_0--}>0</option>
+			<option value="1"{--_COMMA_DEF_1--}>1</option>
+			<option value="2"{--_COMMA_DEF_2--}>2</option>
+			<option value="3"{--_COMMA_DEF_3--}>3</option>
+			<option value="4"{--_COMMA_DEF_4--}>4</option>
+			<option value="5"{--_COMMA_DEF_5--}>5</option>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -151,10 +150,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_CSS_PHP--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> <INPUT type="radio" name="css_php"
-			value="DIRECT"{--_CFG_CSS_PHP_DIRECT--}>&nbsp;{--ADMIN_CSS_PHP_DIRECT--}<BR />
+		<TD><span class="nobr"> <INPUT type="radio" name="css_php"
+			value="DIRECT"{--_CFG_CSS_PHP_DIRECT--}>&nbsp;{--ADMIN_CSS_PHP_DIRECT--}<br />
 		<INPUT type="radio" name="css_php" value="FILE"{--_CFG_CSS_PHP_FILE--}>&nbsp;{--ADMIN_CSS_PHP_FILE--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -166,10 +165,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_GUEST_MENU--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<BR />
+		<TD><span class="nobr"> <INPUT type="radio"
+			name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<br />
 		<INPUT type="radio" name="guest_menu" value="N"{--_CFG_GUEST_MENU_INACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_INACTIVE--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -181,10 +180,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_MEMBER_MENU--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<BR />
+		<TD><span class="nobr"> <INPUT type="radio"
+			name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<br />
 		<INPUT type="radio" name="member_menu" value="N"{--_CFG_MEMBER_MENU_INACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_INACTIVE--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -196,10 +195,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_YOURE_HERE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<BR />
+		<TD><span class="nobr"> <INPUT type="radio"
+			name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<br />
 		<INPUT type="radio" name="youre_here" value="N"{--_CFG_YOURE_HERE_INACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_INACTIVE--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -211,10 +210,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr">
-			<INPUT type="radio" name="show_timings" value="Y"{--_CFG_SHOW_TIMINGS_Y--} />&nbsp;{--YES--}<BR />
+		<TD><span class="nobr">
+			<INPUT type="radio" name="show_timings" value="Y"{--_CFG_SHOW_TIMINGS_Y--} />&nbsp;{--YES--}<br />
 			<INPUT type="radio" name="show_timings" value="N"{--_CFG_SHOW_TIMINGS_N--} />&nbsp;{--NO--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -226,10 +225,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_SHOW_POINTS_UNCONFIRMED--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr">
-			<INPUT type="radio" name="show_points_unconfirmed" value="Y"{--_CFG_SHOW_POINTS_UNCONFIRMED_Y--} />&nbsp;{--YES--}<BR />
+		<TD><span class="nobr">
+			<INPUT type="radio" name="show_points_unconfirmed" value="Y"{--_CFG_SHOW_POINTS_UNCONFIRMED_Y--} />&nbsp;{--YES--}<br />
 			<INPUT type="radio" name="show_points_unconfirmed" value="N"{--_CFG_SHOW_POINTS_UNCONFIRMED_N--} />&nbsp;{--NO--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -241,10 +240,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_MAILID_REDIRECT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> <INPUT type="radio"
-			name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<BR />
+		<TD><span class="nobr"> <INPUT type="radio"
+			name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<br />
 		<INPUT type="radio" name="mailid_error_redirect" value="REJECT"{--_CFG_MAILID_REDIRECT_REJECT--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -257,7 +256,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
-		<TD colspan="3" align="center" class="admin_title"><STRONG>{--ADMIN_SENDING_SETTINGS--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title"><strong>{--ADMIN_SENDING_SETTINGS--}</strong>
 		</TD>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
 	</TR>
@@ -286,10 +285,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_ZIPCODE_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="order_multi_page" value="Y"{--_CFG_ORDER_MULTI_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="order_multi_page" value="N"{--_CFG_ORDER_MULTI_N--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -301,10 +300,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="autosend_active" value="Y"{--_CFG_AUTOSEND_ACTIVE_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="autosend_active" value="N"{--_CFG_AUTOSEND_ACTIVE_N--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -317,7 +316,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
-		<TD colspan="3" align="center" class="admin_title"><STRONG>{--ADMIN_NOTIFY_SETTINGS--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title"><strong>{--ADMIN_NOTIFY_SETTINGS--}</strong>
 		</TD>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
 	</TR>
@@ -333,10 +332,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="send_prof_update" value="Y"{--_CFG_SEND_UPDATE_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="send_prof_update" value="N"{--_CFG_SEND_UPDATE_N--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -348,10 +347,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="nobr"> {--YES--}:&nbsp;<INPUT
+		<TD><span class="nobr"> {--YES--}:&nbsp;<INPUT
 			type="radio" name="admin_notify" value="Y"{--_CFG_ADMIN_NOTIFY_Y--}>&nbsp;
 		{--NO--}:&nbsp;<INPUT type="radio" name="admin_notify" value="N"{--_CFG_ADMIN_NOTIFY_N--}>
-		</SPAN></TD>
+		</span></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 
@@ -364,7 +363,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
-		<TD colspan="3" align="center" class="admin_title"><STRONG>{--ADMIN_TIMEOUT_SETTINGS--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title"><strong>{--ADMIN_TIMEOUT_SETTINGS--}</strong>
 		</TD>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
 	</TR>
@@ -405,7 +404,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
-		<TD colspan="3" align="center" class="admin_title"><STRONG>{--ADMIN_PROFILE_TIME_SETTINGS--}</STRONG>
+		<TD colspan="3" align="center" class="admin_title"><strong>{--ADMIN_PROFILE_TIME_SETTINGS--}</strong>
 		</TD>
 		<TD width="10" class="seperator admin_title">&nbsp;</TD>
 	</TR>
@@ -468,4 +467,4 @@
 		<TD colspan="5" height="7" class="seperator admin_title">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl
index 29c8f0d88c..0b3058585f 100644
--- a/templates/de/html/admin/admin_config_payouts.tpl
+++ b/templates/de/html/admin/admin_config_payouts.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_payouts"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_payouts"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_PAYOUT_EDIT_DEL_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_PAYOUT_EDIT_DEL_TITLE--}</strong></TD>
 	</TR>
 	<TR>
-		<TD width="30" class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="100" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_FROM--}</STRONG></TD>
-		<TD width="150" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_TITLE--}</STRONG></TD>
-		<TD width="150" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_RATE2--}</STRONG></TD>
-		<TD width="150" class="admin_title bottom2" align="center"><STRONG>{--ADMIN_PAYOUT_MIN_POINTS2--}</STRONG></TD>
+		<TD width="30" class="admin_title bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="100" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_FROM--}</strong></TD>
+		<TD width="150" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></TD>
+		<TD width="150" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></TD>
+		<TD width="150" class="admin_title bottom2" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></TD>
 	</TR>
 	{!__PAYOUT_ROWS!}
 	<TR>
@@ -23,4 +23,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_payouts_del.tpl b/templates/de/html/admin/admin_config_payouts_del.tpl
index 0044ee2719..9a82aaf61e 100644
--- a/templates/de/html/admin/admin_config_payouts_del.tpl
+++ b/templates/de/html/admin/admin_config_payouts_del.tpl
@@ -1,17 +1,17 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_payouts&amp;ok=ok"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="650"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="4" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_PAYOUT_DELETE_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_PAYOUT_DELETE_TITLE--}</strong></TD>
 	</TR>
 	<TR>
-		<TD width="30" class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="250" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_TITLE--}</STRONG></TD>
-		<TD width="150" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_RATE2--}</STRONG></TD>
-		<TD width="100" class="admin_title bottom2" align="center"><STRONG>{--ADMIN_PAYOUT_MIN_POINTS2--}</STRONG></TD>
+		<TD width="30" class="admin_title bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="250" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></TD>
+		<TD width="150" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></TD>
+		<TD width="100" class="admin_title bottom2" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></TD>
 	</TR>
 	{!__PAYOUT_ROWS!}
 	<TR>
@@ -20,4 +20,4 @@
 			value="{--ADMIN_PAYOUT_DELETE--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_payouts_edit.tpl b/templates/de/html/admin/admin_config_payouts_edit.tpl
index c97c00e973..9ac2041b40 100644
--- a/templates/de/html/admin/admin_config_payouts_edit.tpl
+++ b/templates/de/html/admin/admin_config_payouts_edit.tpl
@@ -1,18 +1,18 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_payouts&amp;ok=ok"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="650"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_PAYOUT_EDIT_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_PAYOUT_EDIT_TITLE--}</strong></TD>
 	</TR>
 	<TR>
-		<TD width="20" class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="200" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_TITLE--}</STRONG></TD>
-		<TD width="150" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_RATE2--}</STRONG></TD>
-		<TD width="100" class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_PAYOUT_MIN_POINTS2--}</STRONG></TD>
-		<TD width="180" class="admin_title bottom2" align="center"><STRONG>{--ADMIN_PAYOUT_ALLOW_URLS--}</STRONG></TD>
+		<TD width="20" class="admin_title bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="200" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></TD>
+		<TD width="150" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></TD>
+		<TD width="100" class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></TD>
+		<TD width="180" class="admin_title bottom2" align="center"><strong>{--ADMIN_PAYOUT_ALLOW_URLS--}</strong></TD>
 	</TR>
 	{!__PAYOUT_ROWS!}
 	<TR>
diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl
index d3e78cdbec..3cb6ebbb52 100644
--- a/templates/de/html/admin/admin_config_point_settings.tpl
+++ b/templates/de/html/admin/admin_config_point_settings.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=settings" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=settings" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_POINT_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_POINT_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" class="seperator" height="5">&nbsp;</TD>
@@ -13,7 +13,7 @@
 		{--ADMIN_CONFIG_DIRECT_PAY--}</TD>
 		<TD width="240" align="right">
 		{--ADMIN_CONFIG_POINTS_DIRECT--}&nbsp;<INPUT type="radio"
-			name="allow_direct_pay" value="Y" class="admin_normal"{!__DIRECT_Y!} /><BR />
+			name="allow_direct_pay" value="Y" class="admin_normal"{!__DIRECT_Y!} /><br />
 		<HR noshade width="220">
 		{--ADMIN_CONFIG_POINTS_MAILS--}&nbsp;<INPUT type="radio"
 			name="allow_direct_pay" value="N" class="admin_normal"{!__DIRECT_N!} />
@@ -57,4 +57,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl
index 3f72a6aa63..509419f169 100644
--- a/templates/de/html/admin/admin_config_points.tpl
+++ b/templates/de/html/admin/admin_config_points.tpl
@@ -5,19 +5,19 @@
 	</TR>
 	<TR>
 		<TD class="seperator" width="10" rowspan="3">&nbsp;</TD>
-		<TD><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;&nbsp;<A
-			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=points">{--ADMIN_EDIT_POINTS--}</A>
+		<TD><strong><BIG>&middot;</BIG></strong>&nbsp;&nbsp;<a
+			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=points">{--ADMIN_EDIT_POINTS--}</a>
 		</TD>
 		<TD class="seperator" width="10" rowspan="3">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;&nbsp;<A
-			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=ref">{--ADMIN_EDIT_REFDEPTHS--}</A>
+		<TD><strong><BIG>&middot;</BIG></strong>&nbsp;&nbsp;<a
+			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=ref">{--ADMIN_EDIT_REFDEPTHS--}</a>
 		</TD>
 	</TR>
 	<TR>
-		<TD><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;&nbsp;<A
-			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=settings">{--ADMIN_EDIT_POINT_SETTINGS--}</A>
+		<TD><strong><BIG>&middot;</BIG></strong>&nbsp;&nbsp;<a
+			href="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=settings">{--ADMIN_EDIT_POINT_SETTINGS--}</a>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl
index 573896ee37..0b9ca57216 100644
--- a/templates/de/html/admin/admin_config_primera.tpl
+++ b/templates/de/html/admin/admin_config_primera.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_primera" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_primera" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--PRIMERA_ADMIN_CONFIG_TITLE--}</STRONG></TD>
+		<strong>{--PRIMERA_ADMIN_CONFIG_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -74,6 +74,6 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--PRIMERA_ADMIN_CONFIG_NOTE--}</DIV>
+<div class="admin_note">{--PRIMERA_ADMIN_CONFIG_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl
index 18328722ba..87466e4218 100644
--- a/templates/de/html/admin/admin_config_proxy.tpl
+++ b/templates/de/html/admin/admin_config_proxy.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_proxy" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_proxy" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_PROXY_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_EDIT_PROXY_SETTINGS--}</strong></TD>
 	</TR>
 	<TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
 	<TR>
@@ -48,4 +48,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_rallye_del.tpl b/templates/de/html/admin/admin_config_rallye_del.tpl
index 428972eebf..bfa2ab502a 100644
--- a/templates/de/html/admin/admin_config_rallye_del.tpl
+++ b/templates/de/html/admin/admin_config_rallye_del.tpl
@@ -1,18 +1,18 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_REMOVE_PRICES--}</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--RALLYE_REMOVE_PRICES--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD align="center" width="10" class="admin_title bottom2 right2">
-		<STRONG>{--ID_SELECT--}</STRONG></TD>
+		<strong>{--ID_SELECT--}</strong></TD>
 		<TD align="center" width="50" class="admin_title bottom2 right2">
-		<STRONG>{--RALLYE_LEVEL--}:</STRONG></TD>
+		<strong>{--RALLYE_LEVEL--}:</strong></TD>
 		<TD align="center" width="200" class="admin_title bottom2 right2">
-		<STRONG>{--RALLYE_PRICE_POINTS--}:</STRONG></TD>
-		<TD align="center" width="320" class="admin_title bottom2"><STRONG>{--RALLYE_PRICE_INFO--}:</STRONG>
+		<strong>{--RALLYE_PRICE_POINTS--}:</strong></TD>
+		<TD align="center" width="320" class="admin_title bottom2"><strong>{--RALLYE_PRICE_INFO--}:</strong>
 		</TD>
 	</TR>
 	{!__PRICE_ROWS!}
@@ -22,4 +22,4 @@
 			value="{--RALLYE_REMOVE_PRICES--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_rallye_edit.tpl b/templates/de/html/admin/admin_config_rallye_edit.tpl
index 8440ed5675..82100aceff 100644
--- a/templates/de/html/admin/admin_config_rallye_edit.tpl
+++ b/templates/de/html/admin/admin_config_rallye_edit.tpl
@@ -1,21 +1,21 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin_table dashed">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_SELECTED_PRICES--}</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--RALLYE_EDIT_SELECTED_PRICES--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD width="120" align="center" width="50"
-			class="admin_title bottom2 right2"><STRONG>{--RALLYE_ID--}:</STRONG>
+			class="admin_title bottom2 right2"><strong>{--RALLYE_ID--}:</strong>
 		</TD>
 		<TD width="65" align="center" width="50"
-			class="admin_title bottom2 right2"><STRONG>{--RALLYE_LEVEL--}:</STRONG>
+			class="admin_title bottom2 right2"><strong>{--RALLYE_LEVEL--}:</strong>
 		</TD>
 		<TD width="185" align="center" width="200"
-			class="admin_title bottom2 right2"><STRONG>{--RALLYE_PRICE_POINTS--}:</STRONG>
+			class="admin_title bottom2 right2"><strong>{--RALLYE_PRICE_POINTS--}:</strong>
 		</TD>
 		<TD width="130" align="center" width="320" class="admin_title bottom2">
-		<STRONG>{--RALLYE_PRICE_INFO--}:</STRONG></TD>
+		<strong>{--RALLYE_PRICE_INFO--}:</strong></TD>
 	</TR>
 	{!__PRICE_ROWS!}
 	<TR>
@@ -25,4 +25,4 @@
 			value="{--RALLYE_CHANGE_PRICES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_rallye_edit_row.tpl b/templates/de/html/admin/admin_config_rallye_edit_row.tpl
index a7508cc5a9..9246c24cff 100644
--- a/templates/de/html/admin/admin_config_rallye_edit_row.tpl
+++ b/templates/de/html/admin/admin_config_rallye_edit_row.tpl
@@ -1,8 +1,8 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><SELECT
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><select
 		name="rallye_id[$content[id]]" size="1" class="admin_select">
 		$content[rallyes]
-	</SELECT></TD>
+	</select></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 	&nbsp;<INPUT type="text" name="level[$content[id]]"
 		class="admin_normal" size="5" maxlength="20" value="$content[level]">
diff --git a/templates/de/html/admin/admin_config_rallye_prices.tpl b/templates/de/html/admin/admin_config_rallye_prices.tpl
index d4ac38af87..99a17e8f85 100644
--- a/templates/de/html/admin/admin_config_rallye_prices.tpl
+++ b/templates/de/html/admin/admin_config_rallye_prices.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_DEL_PRICES--}</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--RALLYE_EDIT_DEL_PRICES--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD align="center" width="10" class="admin_title bottom2 right2">
-		<STRONG>{--ID_SELECT--}</STRONG></TD>
+		<strong>{--ID_SELECT--}</strong></TD>
 		<TD align="center" width="50" class="admin_title bottom2 right2">
-		<STRONG>{--RALLYE_LEVEL--}:</STRONG></TD>
+		<strong>{--RALLYE_LEVEL--}:</strong></TD>
 		<TD align="center" width="200" class="admin_title bottom2 right2">
-		<STRONG>{--RALLYE_PRICE_POINTS--}:</STRONG></TD>
-		<TD align="center" width="320" class="admin_title bottom2"><STRONG>{--RALLYE_PRICE_INFO--}:</STRONG>
+		<strong>{--RALLYE_PRICE_POINTS--}:</strong></TD>
+		<TD align="center" width="320" class="admin_title bottom2"><strong>{--RALLYE_PRICE_INFO--}:</strong>
 		</TD>
 	</TR>
 	{!__PRICE_ROWS!}
@@ -24,4 +24,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl
index 56fccb818f..d1b67559a6 100644
--- a/templates/de/html/admin/admin_config_refback.tpl
+++ b/templates/de/html/admin/admin_config_refback.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_refback" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_refback" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="500">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-			<STRONG>{--ADMIN_CONFIG_REFBACK_TITLE--}</STRONG>
+			<strong>{--ADMIN_CONFIG_REFBACK_TITLE--}</strong>
 		</TD>
 	</TR>
 	<TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
@@ -41,4 +41,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl
index 2fbda216d4..7b1b3bfeed 100644
--- a/templates/de/html/admin/admin_config_refid.tpl
+++ b/templates/de/html/admin/admin_config_refid.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_refid" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_refid" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="450" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title2 bottom2" colspan="2" align="center">
-			<STRONG>{--ADMIN_CONFIG_REFID_TITLE--}</STRONG>
+			<strong>{--ADMIN_CONFIG_REFID_TITLE--}</strong>
 		</TD>
 	</TR>
 
@@ -20,10 +20,10 @@
 	<TR>
 		<TD align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_REFID_TARGRT--}:</TD>
 		<TD align="center">
-			<SELECT name="refid_target" size="1" class="admin_select">
-				<OPTION value="register"{!__DEF_RT_REGISTER!}">{--ADMIN_REF_TARGET_REGISTER--}</OPTION>
-				<OPTION value="index"{!__DEF_RT_INDEX!}">{--ADMIN_REF_TARGET_INDEX--}</OPTION>
-			</SELECT>
+			<select name="refid_target" size="1" class="admin_select">
+				<option value="register"{!__DEF_RT_REGISTER!}">{--ADMIN_REF_TARGET_REGISTER--}</option>
+				<option value="index"{!__DEF_RT_INDEX!}">{--ADMIN_REF_TARGET_INDEX--}</option>
+			</select>
 		</TD>
 	</TR>
 
@@ -33,10 +33,10 @@
 	<TR>
 		<TD align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_ZERO_REFID--}:</TD>
 		<TD align="center">
-			<SELECT name="select_user_zero_refid" size="1" class="admin_select">
-				<OPTION value="Y"{!__RAND_REFID_Y!}">{--ADMIN_RAND_REFID_ENABLED--}</OPTION>
-				<OPTION value="N"{!__RAND_REFID_N!}">{--ADMIN_RAND_REFID_DISABLED--}</OPTION>
-			</SELECT>
+			<select name="select_user_zero_refid" size="1" class="admin_select">
+				<option value="Y"{!__RAND_REFID_Y!}">{--ADMIN_RAND_REFID_ENABLED--}</option>
+				<option value="N"{!__RAND_REFID_N!}">{--ADMIN_RAND_REFID_DISABLED--}</option>
+			</select>
 		</TD>
 	</TR>
 
@@ -58,4 +58,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_reg_pro.tpl b/templates/de/html/admin/admin_config_reg_pro.tpl
index 5987dbc385..b351377eb1 100644
--- a/templates/de/html/admin/admin_config_reg_pro.tpl
+++ b/templates/de/html/admin/admin_config_reg_pro.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_reg"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_reg"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="430">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_REGFORM_SETTINGS--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--EDIT_REGFORM_SETTINGS--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -52,4 +52,4 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_register.tpl b/templates/de/html/admin/admin_config_register.tpl
index 30dd64f2b7..fd5400a17e 100644
--- a/templates/de/html/admin/admin_config_register.tpl
+++ b/templates/de/html/admin/admin_config_register.tpl
@@ -1,7 +1,7 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_register" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_register" method="POST">
 <TABLE border="0" cellpadding="0" cellspacing="0" width="450" class="admin_table dashed">
 	<TR>
-		<TD colspan="3" align="center" class="admin_title" height="30"><STRONG>{--REGISTER_MUST_HEADER--}:</STRONG>
+		<TD colspan="3" align="center" class="admin_title" height="30"><strong>{--REGISTER_MUST_HEADER--}:</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -17,4 +17,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl
index 93c2b244d9..33eecb52b2 100644
--- a/templates/de/html/admin/admin_config_register2.tpl
+++ b/templates/de/html/admin/admin_config_register2.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_register2" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_register2" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="430">
 	<TR>
 		<TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_REGFORM_SETTINGS--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--EDIT_REGFORM_SETTINGS--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -80,4 +80,4 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_rewrite.tpl b/templates/de/html/admin/admin_config_rewrite.tpl
index 550019e834..17af0ce773 100644
--- a/templates/de/html/admin/admin_config_rewrite.tpl
+++ b/templates/de/html/admin/admin_config_rewrite.tpl
@@ -1,13 +1,13 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rewrite"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_rewrite"
 	method="POST" style="bottom-margin: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
 		<TD class="admin_header bottom2 right2" align="center" height="30">
-		<STRONG>{--MODULE_NAME--}</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--MODULE_TITLE--}</STRONG>
+		<strong>{--MODULE_NAME--}</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--MODULE_TITLE--}</strong>
 		</TD>
-		<TD class="admin_header bottom2" align="center"><STRONG>{--MODULE_SKIPPED--}</STRONG>
+		<TD class="admin_header bottom2" align="center"><strong>{--MODULE_SKIPPED--}</strong>
 		</TD>
 	</TR>
 	{!__MODULE_ROWS!}
@@ -18,7 +18,7 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note"><STRONG>{--ADMIN_CONFIG_REWRITE_NOTE--}</STRONG>
-</DIV>
+<div class="admin_note"><strong>{--ADMIN_CONFIG_REWRITE_NOTE--}</strong>
+</div>
diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl
index fbb5fa44ea..44a4421be2 100644
--- a/templates/de/html/admin/admin_config_secure.tpl
+++ b/templates/de/html/admin/admin_config_secure.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_secure"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_secure"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="520" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2 seperator" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_SECURITY_SETTINGS--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--EDIT_SECURITY_SETTINGS--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -42,7 +42,7 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note"><FONT class="admin_note">{--ADMIN_SALT_LENGTH_NOTE--}</FONT>
-</DIV>
+<div class="admin_note"><div class="admin_note">{--ADMIN_SALT_LENGTH_NOTE--}</div>
+</div>
diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl
index 63e4ade01b..458053d392 100644
--- a/templates/de/html/admin/admin_config_sponsor.tpl
+++ b/templates/de/html/admin/admin_config_sponsor.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_sponsor" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_sponsor" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="500">
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_CONFIG_SPONSOR_TITLE--}</STRONG>
+    <strong>{--ADMIN_CONFIG_SPONSOR_TITLE--}</strong>
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
@@ -31,4 +31,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl
index 838acd5dcf..0331111236 100644
--- a/templates/de/html/admin/admin_config_stats.tpl
+++ b/templates/de/html/admin/admin_config_stats.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_stats"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_stats"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_SETUP_STATS_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_SETUP_STATS_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD width="340" height="40" align="right"><STRONG>{--ADMIN_GSTATS_MEMBERS--}:</STRONG><BR />
-		<FONT class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</FONT></TD>
+		<TD width="340" height="40" align="right"><strong>{--ADMIN_GSTATS_MEMBERS--}:</strong><br />
+		<div class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</div></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="50"><INPUT type="radio" name="guest_stats"
 			class="admin_normal" value="members"{!__MEMBERS_RADIO!}></TD>
@@ -23,8 +23,8 @@
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_MODULES--}:</STRONG><BR />
-		<FONT class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</FONT></TD>
+		<TD height="40" align="right"><strong>{--ADMIN_GSTATS_MODULES--}:</strong><br />
+		<div class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</div></TD>
 		<TD class="seperator">&nbsp;</TD>
 		<TD><INPUT type="radio" name="guest_stats" class="admin_normal"
 			value="modules"{!__MODULES_RADIO!}></TD>
@@ -36,8 +36,8 @@
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_INACTIVE--}:</STRONG><BR />
-		<FONT class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</FONT></TD>
+		<TD height="40" align="right"><strong>{--ADMIN_GSTATS_INACTIVE--}:</strong><br />
+		<div class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</div></TD>
 		<TD class="seperator">&nbsp;</TD>
 		<TD><INPUT type="radio" name="guest_stats" class="admin_normal"
 			value="inactive"{!__INACTIVE_RADIO!}></TD>
@@ -47,7 +47,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_MEMBER_STATS_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_MEMBER_STATS_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator">&nbsp;</TD>
@@ -68,4 +68,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl
index 113202f464..997c4d2238 100644
--- a/templates/de/html/admin/admin_config_sub_points.tpl
+++ b/templates/de/html/admin/admin_config_sub_points.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_points&sub=points"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2 seperator" width="10" height="30">&nbsp;</TD>
-		<TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_POINTS_SETTINGS--}</STRONG>
+		<TD class="admin_title bottom2" colspan="3" align="center"><strong>{--EDIT_POINTS_SETTINGS--}</strong>
 		</TD>
 		<TD class="admin_title bottom2 seperator" width="10">&nbsp;</TD>
 	</TR>
@@ -44,4 +44,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index b88c61ea50..b600e12d34 100644
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" width="550" class="admin_table dashed" align="center">
 	<tr>
 		<td colspan="2" align="center" class="admin_title bottom2" height="30">
-			<STRONG>{--ADMIN_CONFIG_SURFBAR_TITLE--}</STRONG>
+			<strong>{--ADMIN_CONFIG_SURFBAR_TITLE--}</strong>
 		</td>
 	</tr>
 	<tr><td height="3" colspan="2" class="seperator">&nbsp;</td></tr>
@@ -236,6 +236,6 @@
 </table>
 </form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_CONFIG_SURFBAR_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl
index bb89eab747..afd179f478 100644
--- a/templates/de/html/admin/admin_config_title.tpl
+++ b/templates/de/html/admin/admin_config_title.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_title"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_title"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_TITLE_SETTINGS--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_TITLE_SETTINGS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -35,7 +35,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_TITLE_DECORATIONS--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_TITLE_DECORATIONS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -74,4 +74,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl
index 0bebf757a1..afdc078c5f 100644
--- a/templates/de/html/admin/admin_config_top10.tpl
+++ b/templates/de/html/admin/admin_config_top10.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_top10"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_top10"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--TOP10_ADMIN_CONFIG_HEADER--}</STRONG></TD>
+		<strong>{--TOP10_ADMIN_CONFIG_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -25,4 +25,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl
index 04e6b5bb5e..8e7e2b7ab0 100644
--- a/templates/de/html/admin/admin_config_transfer.tpl
+++ b/templates/de/html/admin/admin_config_transfer.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_transfer" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_transfer" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_CONFIG_TRANSFER_HEADER--}</STRONG></TD>
+		<strong>{--ADMIN_CONFIG_TRANSFER_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -39,14 +39,14 @@
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="transfer_balance"
 			class="admin_normal" value="{!__TRANS_BALANCE_VALUE!}" size="4"
-			maxlength="6">&nbsp;<FONT class="tiny">({!POINTS!})</FONT></TD>
+			maxlength="6">&nbsp;<div class="tiny">({!POINTS!})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="right">{--ADMIN_TRANSFER_CODE--}:<BR />
-		<FONT class="admin_note">({--ADMIN_TRANSFER_CODE_NOTE--})</FONT></TD>
+		<TD align="right">{--ADMIN_TRANSFER_CODE--}:<br />
+		<div class="admin_note">({--ADMIN_TRANSFER_CODE_NOTE--})</div></TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="transfer_code" class="admin_normal"
 			value="{!__TRANS_CODE_VALUE!}" size="4" maxlength="6"></TD>
@@ -57,10 +57,10 @@
 	<TR>
 		<TD align="right" width="250">{--ADMIN_AUTOPURGE_TRANSFER--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="ap_transfer" size="1" class="admin_select">
-			<OPTION value="Y"{!__YES_AP!} />{--YES--}</OPTION>
-			<OPTION value="N"{!__NO_AP!} />{--NO--}</OPTION>
-		</SELECT></TD>
+		<TD><select name="ap_transfer" size="1" class="admin_select">
+			<option value="Y"{!__YES_AP!} />{--YES--}</option>
+			<option value="N"{!__NO_AP!} />{--NO--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
@@ -72,4 +72,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl
index 0edfd427a2..6523ef49c6 100644
--- a/templates/de/html/admin/admin_config_user.tpl
+++ b/templates/de/html/admin/admin_config_user.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_user"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_user"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--USER_ADMIN_CONFIG_HEADER--}</STRONG></TD>
+		<strong>{--USER_ADMIN_CONFIG_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -36,4 +36,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl
index fd7f95554f..0d396ee7a7 100644
--- a/templates/de/html/admin/admin_config_wernis.tpl
+++ b/templates/de/html/admin/admin_config_wernis.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_wernis" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_wernis" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--WERNIS_ADMIN_CONFIG_TITLE--}</STRONG></TD>
+		<strong>{--WERNIS_ADMIN_CONFIG_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -169,6 +169,6 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--WERNIS_ADMIN_CONFIG_NOTE--}</DIV>
+<div class="admin_note">{--WERNIS_ADMIN_CONFIG_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl
index b45291d7ef..44e52cd69e 100644
--- a/templates/de/html/admin/admin_contct_user_form.tpl
+++ b/templates/de/html/admin/admin_contct_user_form.tpl
@@ -1,14 +1,14 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=user_contct&amp;u_id=$content[u_id]" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=user_contct&amp;u_id=$content[u_id]" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400" class="admin_table dashed" align="center">
 	<TR>
 		<TD align="center" class="admin_title bottom2" height="30">
-			<STRONG>{--ADMIN_CONTACT_USER--}:<BR />
-			$content[surname] $content[family] &lt;<A href="mailto:$content[email]">$content[email]</A>&gt;</STRONG>
+			<strong>{--ADMIN_CONTACT_USER--}:<br />
+			$content[surname] $content[family] &lt;<a href="mailto:$content[email]">$content[email]</a>&gt;</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="bottom2" style="padding: 10px"><TEXTAREA
-			class="admin_normal" name="text" rows="10" cols="20"></TEXTAREA>
+		<TD align="center" class="bottom2" style="padding: 10px"><textarea
+			class="admin_normal" name="text" rows="10" cols="20"></textarea>
 		</TD>
 	</TR>
 	<TR>
@@ -18,4 +18,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_del_admins.tpl b/templates/de/html/admin/admin_del_admins.tpl
index 77bccc0c52..984c7b5406 100644
--- a/templates/de/html/admin/admin_del_admins.tpl
+++ b/templates/de/html/admin/admin_del_admins.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_DELETE_ACCOUNTS--}</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_DELETE_ACCOUNTS--}</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_CONTACT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_EMAIL--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="160"><STRONG>{--ADMIN_LA_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_CONTACT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_EMAIL--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="160"><strong>{--ADMIN_LA_MODE--}:</strong></TD>
 	</TR>
 	{!__ADMINS_ROWS!}
 	<TR>
@@ -21,4 +21,4 @@
 			value="{--ADMIN_ADMINS_DELETE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl
index 948cd5bfc1..b2af0eaddd 100644
--- a/templates/de/html/admin/admin_del_bank_packages.tpl
+++ b/templates/de/html/admin/admin_del_bank_packages.tpl
@@ -1,14 +1,14 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_bank_package" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_bank_package" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="admin_table dashed" align="center">
 	<TR>
-		<TD colspan="5" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_DELETE_BANK_PACKAGES--}:</STRONG>
+		<TD colspan="5" align="center" class="admin_title" height="30"><strong>{--ADMIN_DELETE_BANK_PACKAGES--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD width="20" colspan="2" align="center" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_TITLE--}:</STRONG></TD>
-		<TD width="360" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_DESCR--}:</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--}</STRONG></TD>
+		<TD width="20" colspan="2" align="center" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_TITLE--}:</strong></TD>
+		<TD width="360" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_DESCR--}:</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2"><strong>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--}</strong></TD>
 	</TR>
 	$content
 	<TR>
@@ -17,6 +17,6 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_DELETE_BANK_PACKAGES_NOTES--}</DIV>
+<div class="admin_note">{--ADMIN_DELETE_BANK_PACKAGES_NOTES--}</div>
diff --git a/templates/de/html/admin/admin_del_bank_packages_row.tpl b/templates/de/html/admin/admin_del_bank_packages_row.tpl
index 309e66a208..824bcd70e1 100644
--- a/templates/de/html/admin/admin_del_bank_packages_row.tpl
+++ b/templates/de/html/admin/admin_del_bank_packages_row.tpl
@@ -3,7 +3,7 @@
 		<INPUT type="checkbox" title="{--ID_SELECT--} $content[id]" class="admin_normal" name="id[$content[id]]" value="1" checked="checked" />
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
-		<STRONG>$content[id]</STRONG>
+		<strong>$content[id]</strong>
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 		$content[title]
diff --git a/templates/de/html/admin/admin_del_cats.tpl b/templates/de/html/admin/admin_del_cats.tpl
index 3a7af1cc81..dc53d3e580 100644
--- a/templates/de/html/admin/admin_del_cats.tpl
+++ b/templates/de/html/admin/admin_del_cats.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_cats&do=del"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" height="30" class="admin_header bottom2"><STRONG>{--DELETE_CATEGORIES--}:</STRONG></TD>
+		<TD align="center" height="30" class="admin_header bottom2"><strong>{--DELETE_CATEGORIES--}:</strong></TD>
 	</TR>
 	{!__CAT_ROWS!}
 	<TR>
@@ -14,4 +14,4 @@
 			value="{--REMOVE_CATS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_del_cats_row.tpl b/templates/de/html/admin/admin_del_cats_row.tpl
index d366052fcc..c7ccb4cd65 100644
--- a/templates/de/html/admin/admin_del_cats_row.tpl
+++ b/templates/de/html/admin/admin_del_cats_row.tpl
@@ -2,8 +2,8 @@
 	<TD height="5" class="seperator switch_sw$content[sw]">&nbsp;</TD>
 </TR>
 <TR>
-	<TD align="center" class="switch_sw$content[sw]"><STRONG>{--CATEGORY_ID--}
-	$content[id]:</STRONG></TD>
+	<TD align="center" class="switch_sw$content[sw]"><strong>{--CATEGORY_ID--}
+	$content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD height="5" class="seperator switch_sw$content[sw]"></TD>
diff --git a/templates/de/html/admin/admin_del_email_bonus.tpl b/templates/de/html/admin/admin_del_email_bonus.tpl
index 9574866218..da8b7d5713 100644
--- a/templates/de/html/admin/admin_del_email_bonus.tpl
+++ b/templates/de/html/admin/admin_del_email_bonus.tpl
@@ -1,21 +1,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="99%">
 	<TR>
 		<TD class="admin_header bottom2" colspan="5" align="center" height="35">
-			<STRONG class="admin_misc">{--ADMIN_EMAIL_DELETED--}</STRONG>
+			<div class="admin_misc">{--ADMIN_EMAIL_DELETED--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_SUBJECT--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_URL--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_TIMESTAMP--}</STRONG></TD>
-		<TD class="bottom2" align="center"><STRONG>{--EMAIL_DELETE_COUNT--}</STRONG></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_SUBJECT--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_URL--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_TIMESTAMP--}</strong></TD>
+		<TD class="bottom2" align="center"><strong>{--EMAIL_DELETE_COUNT--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="right2 admin_misc" align="center">{!__ID!}</TD>
 		<TD class="right2 admin_misc" align="center">{!__SUBJECT!}</TD>
 		<TD class="right2 admin_misc" align="center">
-			<A href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</A>
+			<a href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</a>
 		</TD>
 		<TD class="right2 admin_misc" align="center">{!__ORDERED!}</TD>
 		<TD class="admin_misc" align="center">{!__CNT!}</TD>
diff --git a/templates/de/html/admin/admin_del_email_normal.tpl b/templates/de/html/admin/admin_del_email_normal.tpl
index a4107fd873..b90cc898c0 100644
--- a/templates/de/html/admin/admin_del_email_normal.tpl
+++ b/templates/de/html/admin/admin_del_email_normal.tpl
@@ -2,21 +2,21 @@
 	class="admin_table dashed" width="99%">
 	<TR>
 		<TD class="admin_header" colspan="8" align="center" height="35">
-		<STRONG class="admin_misc">{--ADMIN_EMAIL_DELETED--}</STRONG></TD>
+		<div class="admin_misc">{--ADMIN_EMAIL_DELETED--}</STRONG></TD>
 	</TR>
 	<TR>
-		<TD class="top2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="top2 right2" align="center"><STRONG>{--EMAIL_SENDER--}</STRONG></TD>
-		<TD class="top2 right2" align="center"><STRONG>{--EMAIL_SUBJECT--}</STRONG></TD>
-		<TD class="top2 right2" align="center"><STRONG>{--EMAIL_URL--}</STRONG></TD>
-		<TD class="top2 right2" align="center"><STRONG>{--EMAIL_TIMESTAMP--}</STRONG></TD>
+		<TD class="top2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="top2 right2" align="center"><strong>{--EMAIL_SENDER--}</strong></TD>
+		<TD class="top2 right2" align="center"><strong>{--EMAIL_SUBJECT--}</strong></TD>
+		<TD class="top2 right2" align="center"><strong>{--EMAIL_URL--}</strong></TD>
+		<TD class="top2 right2" align="center"><strong>{--EMAIL_TIMESTAMP--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="top2 right2 admin_misc" align="center">{!__ID!}</TD>
 		<TD class="top2 right2 admin_misc" align="center">{!__SENDER!}</TD>
 		<TD class="top2 right2 admin_misc" align="center">{!__SUBJECT!}</TD>
-		<TD class="top2 right2 admin_misc" align="center"><A
-			href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</A></TD>
+		<TD class="top2 right2 admin_misc" align="center"><a
+			href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</a></TD>
 		<TD class="top2 right2 admin_misc" align="center">{!__ORDERED!}</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_del_email_notify.tpl b/templates/de/html/admin/admin_del_email_notify.tpl
index 250295e295..9e36aab78b 100644
--- a/templates/de/html/admin/admin_del_email_notify.tpl
+++ b/templates/de/html/admin/admin_del_email_notify.tpl
@@ -1,21 +1,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="99%">
 	<TR>
 		<TD class="admin_header bottom2" colspan="5" align="center" height="35">
-			<STRONG class="admin_misc">{--ADMIN_NOTIFICATION_DELETED_TITLE--}</STRONG>
+			<div class="admin_misc">{--ADMIN_NOTIFICATION_DELETED_TITLE--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_SUBJECT--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_URL--}</STRONG></TD>
-		<TD class="bottom2 right2" align="center"><STRONG>{--EMAIL_TIMESTAMP--}</STRONG></TD>
-		<TD class="bottom2" align="center"><STRONG>{--EMAIL_DELETE_COUNT--}</STRONG></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_SUBJECT--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_URL--}</strong></TD>
+		<TD class="bottom2 right2" align="center"><strong>{--EMAIL_TIMESTAMP--}</strong></TD>
+		<TD class="bottom2" align="center"><strong>{--EMAIL_DELETE_COUNT--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="right2 admin_misc" align="center">{!__ID!}</TD>
 		<TD class="right2 admin_misc" align="center">{!__SUBJECT!}</TD>
-		<TD class="right2 admin_misc" align="center"><A
-			href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</A></TD>
+		<TD class="right2 admin_misc" align="center"><a
+			href="{!__URL!}" target="_blank">{--ADMIN_TEST_URL--}</a></TD>
 		<TD class="right2 admin_misc" align="center">{!__ORDERED!}</TD>
 		<TD class="admin_misc" align="center">{!__CNT!}</TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_del_payments.tpl b/templates/de/html/admin/admin_del_payments.tpl
index 1b49015512..d54c2f91fd 100644
--- a/templates/de/html/admin/admin_del_payments.tpl
+++ b/templates/de/html/admin/admin_del_payments.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=payments&do=del"
+<form action="{!URL!}/modules.php?module=admin&amp;what=payments&do=del"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" height="30" class="admin_title bottom"><STRONG>{--DELETE_PAYMENT--}:</STRONG></TD>
+		<TD align="center" height="30" class="admin_title bottom"><strong>{--DELETE_PAYMENT--}:</strong></TD>
 	</TR>
 	{!__PAYMENT_ROWS!}
 	<TR>
@@ -13,4 +13,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_del_payments_row.tpl b/templates/de/html/admin/admin_del_payments_row.tpl
index c6033357ae..5e4fee2cf5 100644
--- a/templates/de/html/admin/admin_del_payments_row.tpl
+++ b/templates/de/html/admin/admin_del_payments_row.tpl
@@ -1,6 +1,6 @@
 <TR>
-	<TD class="admin_title bottom" height="20" align="center"><STRONG>{--PAYMENT_ID--}
-	$content[id]:</STRONG></TD>
+	<TD class="admin_title bottom" height="20" align="center"><strong>{--PAYMENT_ID--}
+	$content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl
index e60620e1db..81275cf356 100644
--- a/templates/de/html/admin/admin_del_sponsor.tpl
+++ b/templates/de/html/admin/admin_del_sponsor.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={!__UID!}" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={!__UID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR>
   <TD align="center" class="admin_title bottom2" height="28">
-    <STRONG class="admin_done">{--ADMIN_HEADER_DEL_SPONSOR_1--}{!__UID!}{--ADMIN_HEADER_DEL_SPONSOR_2--}</STRONG>
+    <div class="admin_done">{--ADMIN_HEADER_DEL_SPONSOR_1--}{!__UID!}{--ADMIN_HEADER_DEL_SPONSOR_2--}</STRONG>
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
@@ -13,11 +13,11 @@
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD align="center"><A href="mailto:{!__EMAIL!}">{!__SNAME!} {!__FNAME!}</A>({!__EMAIL!})</TD>
+  <TD align="center"><a href="mailto:{!__EMAIL!}">{!__SNAME!} {!__FNAME!}</a>({!__EMAIL!})</TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD align="center"><TEXTAREA name="reason" class="admin_normal" rows="5" cols="50"></TEXTAREA></TD>
+  <TD align="center"><textarea name="reason" class="admin_normal" rows="5" cols="50"></textarea></TD>
 </TR>
 <TR><TD height="5" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
@@ -27,4 +27,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_del_user.tpl b/templates/de/html/admin/admin_del_user.tpl
index 91c0632143..155550c821 100644
--- a/templates/de/html/admin/admin_del_user.tpl
+++ b/templates/de/html/admin/admin_del_user.tpl
@@ -1,11 +1,9 @@
-<FORM
-	action="{!URL!}/modules.php?module=admin&amp;what=del_user&amp;u_id={!__UID!}"
-	method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=del_user&amp;u_id={!__UID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2" height="28"><STRONG
-			class="admin_done">{--ADMIN_HEADER_DEL_ACCOUNT_1--}{!__UID!}{--ADMIN_HEADER_DEL_ACCOUNT_2--}</STRONG>
+		<TD align="center" class="admin_title bottom2" height="28"><strong
+			class="admin_done">{--ADMIN_HEADER_DEL_ACCOUNT_1--}{!__UID!}{--ADMIN_HEADER_DEL_ACCOUNT_2--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -20,24 +18,24 @@
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">[&nbsp;<A href="{!__EMAIL!}">{!__SNAME!}
-		{!__FNAME!}</A>&nbsp;]</TD>
+		<TD align="center">[&nbsp;<a href="{!__EMAIL!}">{!__SNAME!}
+		{!__FNAME!}</a>&nbsp;]</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center"><TEXTAREA name="reason" class="admin_normal"
-			rows="5" cols="50"></TEXTAREA></TD>
+		<TD align="center"><textarea name="reason" class="admin_normal"
+			rows="5" cols="50"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator bottom2">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD class="admin_footer"><INPUT type="submit"
-			name="no" class="admin_no" value="{--NO--}" /> <INPUT
-			type="submit" name="ok" class="admin_yes" value="{--YES--}" />
+		<TD class="admin_footer">
+			<INPUT type="submit" name="no" class="admin_no" value="{--NO--}" />
+			<INPUT type="submit" name="ok" class="admin_yes" value="{--YES--}" />
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl
index 64d3785299..2cc4a323e6 100644
--- a/templates/de/html/admin/admin_edit_admins.tpl
+++ b/templates/de/html/admin/admin_edit_admins.tpl
@@ -1,18 +1,18 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="680"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="6" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_EDIT_ACCOUNTS--}</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_EDIT_ACCOUNTS--}</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_CONTACT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_EMAIL--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="240"><STRONG>{--ADMIN_ADMINS_PASSWORD--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="100"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="100"><STRONG>{--ADMIN_LA_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_CONTACT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_EMAIL--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="240"><strong>{--ADMIN_ADMINS_PASSWORD--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="100"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="100"><strong>{--ADMIN_LA_MODE--}:</strong></TD>
 	</TR>
 	{!__ADMINS_ROWS!}
 	<TR>
@@ -22,8 +22,8 @@
 			value="{--ADMIN_ADMINS_EDIT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_ADMINS_ACL_NOTE--}<BR />
-<BR />
-{--ADMIN_ADMINS_EDIT_NOTE--}</DIV>
+<div class="admin_note">{--ADMIN_ADMINS_ACL_NOTE--}<br />
+<br />
+{--ADMIN_ADMINS_EDIT_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_edit_admins_row.tpl b/templates/de/html/admin/admin_edit_admins_row.tpl
index 31585f19de..9437d023bf 100644
--- a/templates/de/html/admin/admin_edit_admins_row.tpl
+++ b/templates/de/html/admin/admin_edit_admins_row.tpl
@@ -11,12 +11,12 @@
 		size="10" maxlength="255">&nbsp;<INPUT type="password"
 		name="pass2[$content[id]]" class="admin_normal" size="10"
 		maxlength="255"></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2"><SELECT
+	<TD align="center" class="switch_sw$content[sw] bottom2"><select
 		name="mode[$content[id]]" size="1" class="admin_select">
 		$content[mode]
-	</SELECT></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2"><SELECT
+	</select></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2"><select
 		name="la_mode[$content[id]]" size="1" class="admin_select">
 		$content[la_mode]
-	</SELECT></TD>
+	</select></TD>
 </TR>
diff --git a/templates/de/html/admin/admin_edit_bank_packages.tpl b/templates/de/html/admin/admin_edit_bank_packages.tpl
index 97edafb561..06d58c49f7 100644
--- a/templates/de/html/admin/admin_edit_bank_packages.tpl
+++ b/templates/de/html/admin/admin_edit_bank_packages.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_bank_package" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_bank_package" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%" class="admin_table dashed" align="center">
 <TR>
 	<TD colspan="4" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_BANK_PACKAGES--}:</STRONG>
+		<strong>{--ADMIN_EDIT_BANK_PACKAGES--}:</strong>
 	</TD>
 </TR>
 $content
@@ -13,6 +13,6 @@ $content
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_EDIT_BANK_PACKAGES_NOTES--}</DIV>
+<div class="admin_note">{--ADMIN_EDIT_BANK_PACKAGES_NOTES--}</div>
diff --git a/templates/de/html/admin/admin_edit_bank_packages_row.tpl b/templates/de/html/admin/admin_edit_bank_packages_row.tpl
index 5ac08b57f7..67a5c4cf1c 100644
--- a/templates/de/html/admin/admin_edit_bank_packages_row.tpl
+++ b/templates/de/html/admin/admin_edit_bank_packages_row.tpl
@@ -5,7 +5,7 @@
 	</TD>
 	<TD width="34%" align="center" valign="top" style="padding:2px"class="switch_sw$content[sw] bottom2 right2">
 		{--ADMIN_BANK_PACKAGE_DESCRIPTION--}:<br />
-		<TEXTAREA class="admin_normal" name="description[$content[id]]" rows="3" cols="30">$content[description]</TEXTAREA>
+		<textarea class="admin_normal" name="description[$content[id]]" rows="3" cols="30">$content[description]</textarea>
 	</TD>
 	<TD width="33%" align="center" valign="top" style="padding:2px"class="switch_sw$content[sw] bottom2">
 		{--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:<br />
@@ -57,7 +57,7 @@
 <TR>
 	<TD align="center" valign="top" style="padding:2px"class="switch_sw$content[sw] bottom2 right2">
 		{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--}:<br />
-		<TEXTAREA class="admin_normal" name="free_account_stuff[$content[id]]" rows="3" cols="30">$content[free_account_stuff]</TEXTAREA>
+		<textarea class="admin_normal" name="free_account_stuff[$content[id]]" rows="3" cols="30">$content[free_account_stuff]</textarea>
 	</TD>
 	<TD align="center" valign="top" style="padding:2px" class="switch_sw$content[sw] bottom2 right2">
 		{--ADMIN_BANK_PACKAGE_EDIT_TAN_LOCK--}:<br />
diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl
index b3c0877bde..39e8599336 100644
--- a/templates/de/html/admin/admin_edit_cats.tpl
+++ b/templates/de/html/admin/admin_edit_cats.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_cats&do=edit" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_cats&do=edit" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <TR>
 	<TD align="center" colspan="3" height="30" class="admin_header bottom2">
-		<STRONG>{--EDIT_CATEGORIES--}:</STRONG>
+		<strong>{--EDIT_CATEGORIES--}:</strong>
 	</TD>
 </TR>
 {!__CAT_ROWS!}
@@ -13,4 +13,4 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl
index cbe5d561cb..078b4ef7b1 100644
--- a/templates/de/html/admin/admin_edit_cats_row.tpl
+++ b/templates/de/html/admin/admin_edit_cats_row.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD colspan="3" align="left" class="admin_header bottom2" height="25">
-	&nbsp;<STRONG>{--CATEGORY_ID--} $content[id]:</STRONG></TD>
+	&nbsp;<strong>{--CATEGORY_ID--} $content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD colspan="3" height="5" class="seperator switch_sw$content[sw]">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl
index e3b060b700..f69c8478fd 100644
--- a/templates/de/html/admin/admin_edit_email.tpl
+++ b/templates/de/html/admin/admin_edit_email.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_emails"
+<form action="{!URL!}/modules.php?module=admin&amp;what=edit_emails"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed">
 	<TR>
 		<TD width="10" height="30" class="admin_title seperator">&nbsp;</TD>
-		<TD align="center" colspan="3" class="admin_title"><STRONG>{--ADMIN_EDIT_EMAIL--}:</STRONG>
+		<TD align="center" colspan="3" class="admin_title"><strong>{--ADMIN_EDIT_EMAIL--}:</strong>
 		({!__ID_VALUE!})</TD>
 		<TD width="10" class="admin_title seperator">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD width="10" class="top2 seperator" height="35">&nbsp;</TD>
-		<TD align="right" class="top2"><STRONG>{--EDIT_URL--}:</STRONG>
+		<TD align="right" class="top2"><strong>{--EDIT_URL--}:</strong>
 		</TD>
 		<TD width="5" class="top2 seperator">&nbsp;</TD>
 		<TD class="top2"><INPUT type="text" name="url"
@@ -20,7 +20,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="top2 seperator" height="35">&nbsp;</TD>
-		<TD align="right" class="top2"><STRONG>{--EMAIL_EDIT_SUBJ--}:</STRONG>
+		<TD align="right" class="top2"><strong>{--EMAIL_EDIT_SUBJ--}:</strong>
 		</TD>
 		<TD width="5" class="top2" seperator>&nbsp;</TD>
 		<TD class="top2"><INPUT type="text" name="subj"
@@ -30,11 +30,11 @@
 	</TR>
 	<TR>
 		<TD width="10" height="125" class="top2" seperator>&nbsp;</TD>
-		<TD align="right" class="top2"><STRONG>{--EMAIL_EDIT_TEXT--}:</STRONG>
+		<TD align="right" class="top2"><strong>{--EMAIL_EDIT_TEXT--}:</strong>
 		</TD>
 		<TD width="5" class="top2 seperator">&nbsp;</TD>
-		<TD class="top2"><TEXTAREA name="text" class="admin_normal"
-			rows="8" cols="28">{!__TEXT_VALUE!}</TEXTAREA></TD>
+		<TD class="top2"><textarea name="text" class="admin_normal"
+			rows="8" cols="28">{!__TEXT_VALUE!}</textarea></TD>
 		<TD width="10" class="top2 seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -47,4 +47,4 @@
 		<TD width="10" class="admin_footer seperator top2">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_email_select.tpl b/templates/de/html/admin/admin_edit_email_select.tpl
index 9af022c2a2..e854f6f02c 100644
--- a/templates/de/html/admin/admin_edit_email_select.tpl
+++ b/templates/de/html/admin/admin_edit_email_select.tpl
@@ -1,11 +1,10 @@
-
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_emails"
+<form action="{!URL!}/modules.php?module=admin&amp;what=edit_emails"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed">
 	<TR>
 		<TD width="10" height="30" class="admin_title seperator">&nbsp;</TD>
-		<TD align="center" colspan="3" class="admin_title"><STRONG>{--ADMIN_SELECT_EMAIL_EDIT--}:</STRONG>
+		<TD align="center" colspan="3" class="admin_title"><strong>{--ADMIN_SELECT_EMAIL_EDIT--}:</strong>
 		</TD>
 		<TD width="10" class="admin_title seperator">&nbsp;</TD>
 	</TR>
@@ -19,4 +18,4 @@
 		<TD width="10" class="admin_footer seperator top2">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_payments.tpl b/templates/de/html/admin/admin_edit_payments.tpl
index 4255dfa79a..626a803032 100644
--- a/templates/de/html/admin/admin_edit_payments.tpl
+++ b/templates/de/html/admin/admin_edit_payments.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=payments&do=edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" colspan="2" class="admin_title bottom2" height="30"><STRONG>{--EDIT_PAYMENT--}:</STRONG></TD>
+		<TD align="center" colspan="2" class="admin_title bottom2" height="30"><strong>{--EDIT_PAYMENT--}:</strong></TD>
 	</TR>
 	{!__PAYMENT_ROWS!}
 	<TR>
@@ -14,4 +14,4 @@
 			value="{--CHANGE_PAY--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl
index a3c0e4f507..dd117030d1 100644
--- a/templates/de/html/admin/admin_edit_payments_row.tpl
+++ b/templates/de/html/admin/admin_edit_payments_row.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD class="admin_title bottom" colspan="2" align="center" height="20">
-	<STRONG>{--PAYMENT_ID--} $content[id]:</STRONG></TD>
+	<strong>{--PAYMENT_ID--} $content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_edit_rallyes.tpl b/templates/de/html/admin/admin_edit_rallyes.tpl
index 4328a140f9..4459f92c80 100644
--- a/templates/de/html/admin/admin_edit_rallyes.tpl
+++ b/templates/de/html/admin/admin_edit_rallyes.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--RALLYE_EDIT_RALLYES--}:</STRONG></TD>
+		<strong>{--RALLYE_EDIT_RALLYES--}:</strong></TD>
 	</TR>
 	{!__RALLYE_ROWS!}
 	<TR>
@@ -14,4 +14,4 @@
 			value="{--RALLYE_CHANGE_ADMIN--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_rallyes_row.tpl b/templates/de/html/admin/admin_edit_rallyes_row.tpl
index aa78fe7fd9..69d349d5fe 100644
--- a/templates/de/html/admin/admin_edit_rallyes_row.tpl
+++ b/templates/de/html/admin/admin_edit_rallyes_row.tpl
@@ -14,8 +14,8 @@
 <TR>
 	<TD class="switch_sw$content[sw]" align="right" valign="top">{--RALLYE_DESCR--}:</TD>
 	<TD class="switch_sw$content[sw] seperator" width="10">&nbsp;</TD>
-	<TD class="switch_sw$content[sw]" align="center"><TEXTAREA
-		name="descr[$content[id]]" cols="30" rows="6" class="admin_normal">$content[descr]</TEXTAREA>
+	<TD class="switch_sw$content[sw]" align="center"><textarea
+		name="descr[$content[id]]" cols="30" rows="6" class="admin_normal">$content[descr]</textarea>
 	</TD>
 </TR>
 <TR>
@@ -34,7 +34,7 @@
 		valign="top">{--RALLYE_START_DAY--}:</TD>
 	<TD class="switch_sw$content[sw] seperator" width="10">&nbsp;</TD>
 	<TD class="switch_sw$content[sw]" width="290" align="center">
-	$content[s_day]. $content[s_month]. $content[s_year]<BR />
+	$content[s_day]. $content[s_month]. $content[s_year]<br />
 	$content[s_hour]: $content[s_min]: $content[s_sec]</TD>
 </TR>
 <TR>
@@ -45,7 +45,7 @@
 		valign="top">{--RALLYE_END_DAY--}:</TD>
 	<TD class="switch_sw$content[sw] seperator" width="10">&nbsp;</TD>
 	<TD class="switch_sw$content[sw]" width="290" align="center">
-	$content[e_day]. $content[e_month]. $content[e_year]<BR />
+	$content[e_day]. $content[e_month]. $content[e_year]<br />
 	$content[e_hour]: $content[e_min]: $content[e_sec]</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl
index 0e89dba504..e234aae631 100644
--- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id={!__SPONSOR_ID!}" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id={!__SPONSOR_ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
-    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<BR />
-    <STRONG>{!__SPONSOR_VALUE!}</STRONG>
+    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<br />
+    <strong>{!__SPONSOR_VALUE!}</strong>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
@@ -18,7 +18,7 @@
 <TR>
   <TD align="right">{--ENTER_ADD_REASON--}:</TD>
   <TD width="10" class="seperator">&nbsp;</TD>
-  <TD><TEXTAREA name="reason" class="admin_normal" rows="5" cols="20"></TEXTAREA></TD>
+  <TD><textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea></TD>
 </TR>
 <TR><TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
@@ -28,4 +28,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index 931e38e0cf..f78aeebd56 100644
--- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@ -1,14 +1,14 @@
-<DIV align="center"><FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit" method="POST">
+<div align="center"><form action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed" align="center">
 <TR>
   <TD colspan="5" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({!__SPONSOR_ID!})</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({!__SPONSOR_ID!})</strong>
   </TD>
 </TR>
 <TR>
   <TD class="bottom2" width="10">&nbsp;</TD>
   <TD class="bottom2" colspan="3" align="center">
-    <FONT class="admin_note">{--ADMIN_SPONSOR_COMPANY_NOTE--}</FONT>
+    <div class="admin_note">{--ADMIN_SPONSOR_COMPANY_NOTE--}</div>
   </TD>
   <TD class="bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -50,7 +50,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -62,11 +62,11 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="255">
-    <SELECT name="gender" class="admin_select" size="1">
-      <OPTION value="M"{!__GENDER_M!}">{--GENDER_M--}</OPTION>
-      <OPTION value="F"{!__GENDER_F!}">{--GENDER_F--}</OPTION>
-      <OPTION value="C"{!__GENDER_C!}">{--GENDER_C--}</OPTION>
-    </SELECT>
+    <select name="gender" class="admin_select" size="1">
+      <option value="M"{!__GENDER_M!}">{--GENDER_M--}</option>
+      <option value="F"{!__GENDER_F!}">{--GENDER_F--}</option>
+      <option value="C"{!__GENDER_C!}">{--GENDER_C--}</option>
+    </select>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
@@ -179,7 +179,7 @@
 <TR><TD class="seperator bottom2" colspan="5" height="5">&nbsp;</TD></TR>
 <TR>
   <TD colspan="5" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_PASSWORDS--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_ENTER_PASSWORDS--}</strong>
   </TD>
 </TR>
 <TR><TD class="seperator" colspan="5" height="5">&nbsp;</TD></TR>
@@ -198,7 +198,7 @@
 <TR>
   <TD width="10" height="30">&nbsp;</TD>
   <TD colspan="3" align="center">
-    <FONT class="tiny">{--ADMIN_EDIT_USER_PASSWORD_NOTE--}</FONT>
+    <div class="tiny">{--ADMIN_EDIT_USER_PASSWORD_NOTE--}</div>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
@@ -206,7 +206,7 @@
 <TR>
   <TD class="admin_title bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="admin_title bottom2" colspan="3" align="center">
-    <STRONG>{--ADMIN_SPONSOR_WARNINGS_POINTS--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_WARNINGS_POINTS--}</strong>
   </TD>
   <TD class="admin_title bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -218,10 +218,10 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD style="padding-left: 15px">
-    <SELECT name="receive_warnings" class="admin_select" size="1">
-      <OPTION value="Y">{--YES--}</OPTION>
-	 <OPTION value="N">{--NO--}</OPTION>
-    </SELECT>
+    <select name="receive_warnings" class="admin_select" size="1">
+      <option value="Y">{--YES--}</option>
+	 <option value="N">{--NO--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -244,4 +244,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM></DIV>
+</form></div>
diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
index 8fd5b92872..cf21f9b2d7 100644
--- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id={!__SPONSOR_ID!}" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id={!__SPONSOR_ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
-    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<BR />
-    <STRONG>{!__SPONSOR_VALUE!}</STRONG>
+    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<br />
+    <strong>{!__SPONSOR_VALUE!}</strong>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
@@ -18,7 +18,7 @@
 <TR>
   <TD align="right">{--ENTER_SUB_REASON--}:</TD>
   <TD width="10" class="seperator">&nbsp;</TD>
-  <TD><TEXTAREA name="reason" class="admin_normal" rows="5" cols="20"></TEXTAREA></TD>
+  <TD><textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea></TD>
 </TR>
 <TR><TD height="5" colspan="3" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
@@ -28,4 +28,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl
index a25a03057b..f8f97f336a 100644
--- a/templates/de/html/admin/admin_edit_user.tpl
+++ b/templates/de/html/admin/admin_edit_user.tpl
@@ -1,21 +1,21 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=edit_user&amp;u_id=$content"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_EDIT_USER_PROFILE--}: ($content)</STRONG></TD>
+		<strong>{--ADMIN_EDIT_USER_PROFILE--}: ($content)</strong></TD>
 	</TR>
 	<TR>
 		<TD width="195" align="right" height="21">{--GENDER--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD width="195"><SELECT name="gender" class="admin_select"
+		<TD width="195"><select name="gender" class="admin_select"
 			size="1">
-			<OPTION value="M"{!_GENDER_M!}">{--GENDER_M--}</OPTION>
-			<OPTION value="F"{!_GENDER_F!}">{--GENDER_F--}</OPTION>
-			<OPTION value="C"{!_GENDER_C!}">{--GENDER_C--}</OPTION>
-		</SELECT></TD>
+			<option value="M"{!_GENDER_M!}">{--GENDER_M--}</option>
+			<option value="F"{!_GENDER_F!}">{--GENDER_F--}</option>
+			<option value="C"{!_GENDER_C!}">{--GENDER_C--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD align="right">{--SURNAME--}:</TD>
@@ -61,8 +61,7 @@
 		</TD>
 	</TR>
 	<TR>
-		<TD colspan="3" align="center" class="admin_footer bottom2"><FONT
-			class="tiny">{--ADMIN_EDIT_USER_PASSWORD_NOTE--}</FONT></TD>
+		<TD colspan="3" align="center" class="admin_footer bottom2"><div class="tiny">{--ADMIN_EDIT_USER_PASSWORD_NOTE--}</div></TD>
 	</TR>
 	<TR>
 		<TD align="right">{--ADMIN_PASS1--}:</TD>
@@ -83,4 +82,4 @@
 			value="{--CHANGE_PROFILE--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_email_archiv.tpl b/templates/de/html/admin/admin_email_archiv.tpl
index 15d574cf86..d26a118745 100644
--- a/templates/de/html/admin/admin_email_archiv.tpl
+++ b/templates/de/html/admin/admin_email_archiv.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="99%">
 	<TR>
-		<TD colspan="3" align="center" height="25" class="admin_title"><STRONG
-			class="admin_done">{--ADMIN_POOL_CONTENT--}</STRONG></TD>
+		<TD colspan="3" align="center" height="25" class="admin_title"><strong
+			class="admin_done">{--ADMIN_POOL_CONTENT--}</strong></TD>
 	</TR>
 	{!__TOP_EMAIL_NAV!} {!__EMAIL_ROWS!} {!__BOTTOM_EMAIL_NAV!}
 </TABLE>
diff --git a/templates/de/html/admin/admin_ext_reg_form.tpl b/templates/de/html/admin/admin_ext_reg_form.tpl
index a47d90108a..bb326d8990 100644
--- a/templates/de/html/admin/admin_ext_reg_form.tpl
+++ b/templates/de/html/admin/admin_ext_reg_form.tpl
@@ -1,6 +1,6 @@
-<A name="ext_$content[ext_name]"></A>
-<FORM
+<a name="ext_$content[ext_name]"></a>
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]"
 	method="POST" style="margin-bottom: 0px"><INPUT type="submit"
 	name="ok" class="admin_submit" value="{--ADMIN_REGISTER_EXTENSION--}" />
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl
index ecb48420aa..917fc13dba 100644
--- a/templates/de/html/admin/admin_extensions.tpl
+++ b/templates/de/html/admin/admin_extensions.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=extensions" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=extensions" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="510" align="center" class="admin_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title" height="30">
-			<STRONG>{--ADMIN_REGISTERED_EXTENSIONS--}</STRONG>
+			<strong>{--ADMIN_REGISTERED_EXTENSIONS--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="40"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="200"><STRONG>{--ADMIN_EXT_NAME--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="90"><STRONG>{--ADMIN_EXT_CSSFILE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="90"><STRONG>{--ADMIN_EXT_ACTIVE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="90"><STRONG>{--ADMIN_EXT_VERSION--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="40"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="200"><strong>{--ADMIN_EXT_NAME--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="90"><strong>{--ADMIN_EXT_CSSFILE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="90"><strong>{--ADMIN_EXT_ACTIVE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="90"><strong>{--ADMIN_EXT_VERSION--}</strong></TD>
 	</TR>
 	{!__EXT_ROWS!}
 	<TR>
@@ -22,4 +22,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_extensions_404.tpl b/templates/de/html/admin/admin_extensions_404.tpl
index b6b6706082..11f5d85d80 100644
--- a/templates/de/html/admin/admin_extensions_404.tpl
+++ b/templates/de/html/admin/admin_extensions_404.tpl
@@ -1,7 +1 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-	width="400" class="admin_done dashed">
-	<TR>
-		<TD align="center" height="40"><STRONG class="admin_failed">{--ADMIN_EXT_NOTHING_FOUND--}</STRONG>
-		</TD>
-	</TR>
-</TABLE>
\ No newline at end of file
+<!-- @DEPRECATED //-->
diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl
index 000e4df005..4dc9db38e1 100644
--- a/templates/de/html/admin/admin_extensions_delete.tpl
+++ b/templates/de/html/admin/admin_extensions_delete.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=extensions"
+<form action="{!URL!}/modules.php?module=admin&amp;what=extensions"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	align="center" class="admin_table dashed">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_REMOVING_THESE_EXTENSIONS--}</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--ADMIN_REMOVING_THESE_EXTENSIONS--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="40"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="180"><STRONG>{--ADMIN_EXT_NAME--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="80"><STRONG>{--ADMIN_EXT_VERSION--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="40"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="180"><strong>{--ADMIN_EXT_NAME--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="80"><strong>{--ADMIN_EXT_VERSION--}</strong></TD>
 		<TD align="center" class="admin_title bottom2" width="220">&nbsp;</TD>
 	</TR>
 	{!__EXTENSIONS_ROWS!}
@@ -19,4 +19,4 @@
 			value="{--ADMIN_REMOVE_EXTENSIONS--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_extensions_delete_row.tpl b/templates/de/html/admin/admin_extensions_delete_row.tpl
index 98e99523fb..a560b12989 100644
--- a/templates/de/html/admin/admin_extensions_delete_row.tpl
+++ b/templates/de/html/admin/admin_extensions_delete_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><STRONG>$content[id]</STRONG>
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="sel[$content[id]]" value="1"></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">
 	&nbsp;$content[ext_name]</TD>
diff --git a/templates/de/html/admin/admin_extensions_edit.tpl b/templates/de/html/admin/admin_extensions_edit.tpl
index 937613dfc8..3f61be68a3 100644
--- a/templates/de/html/admin/admin_extensions_edit.tpl
+++ b/templates/de/html/admin/admin_extensions_edit.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=extensions"
+<form action="{!URL!}/modules.php?module=admin&amp;what=extensions"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="370"
 	align="center" class="admin_table dashed">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_EDIT_EXTENSIONS--}:</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--ADMIN_EDIT_EXTENSIONS--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="30"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="180"><STRONG>{--ADMIN_EXT_NAME--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="80"><STRONG>{--ADMIN_EXT_CSSFILE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="80"><STRONG>{--ADMIN_EXT_ACTIVE--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="30"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="180"><strong>{--ADMIN_EXT_NAME--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="80"><strong>{--ADMIN_EXT_CSSFILE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="80"><strong>{--ADMIN_EXT_ACTIVE--}</strong></TD>
 	</TR>
 	{!__EXTENSIONS_ROWS!}
 	<TR>
@@ -20,4 +20,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_extensions_edit_row.tpl b/templates/de/html/admin/admin_extensions_edit_row.tpl
index b325660781..237793ef12 100644
--- a/templates/de/html/admin/admin_extensions_edit_row.tpl
+++ b/templates/de/html/admin/admin_extensions_edit_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><STRONG>$content[id]</STRONG>
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="sel[$content[id]]" value="1" /></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">
 	&nbsp;&nbsp;$content[name]</TD>
diff --git a/templates/de/html/admin/admin_extensions_installed.tpl b/templates/de/html/admin/admin_extensions_installed.tpl
index 8a1704a539..39a24606a0 100644
--- a/templates/de/html/admin/admin_extensions_installed.tpl
+++ b/templates/de/html/admin/admin_extensions_installed.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="400" class="admin_done dashed">
 	<TR>
-		<TD align="center" height="40"><STRONG>{--ADMIN_EXT_ALREADY_INSTALLED_1--}$content{--ADMIN_EXT_ALREADY_INSTALLED_2--}</STRONG>
+		<TD align="center" height="40"><strong>{--ADMIN_EXT_ALREADY_INSTALLED_1--}$content{--ADMIN_EXT_ALREADY_INSTALLED_2--}</strong>
 		</TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_extensions_list.tpl b/templates/de/html/admin/admin_extensions_list.tpl
index de84c5b37c..45cc3cc016 100644
--- a/templates/de/html/admin/admin_extensions_list.tpl
+++ b/templates/de/html/admin/admin_extensions_list.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <TR>
 	<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-	<STRONG>{--ADMIN_EXT_NEW_FOUND_TITLE--}:</STRONG></TD>
+	<strong>{--ADMIN_EXT_NEW_FOUND_TITLE--}:</strong></TD>
 </TR>
 <TR>
 	<TD align="center" width="5%" class="admin_title bottom2 right2">{--ID_SELECT--}</TD>
@@ -13,10 +13,10 @@
 {!__EXTENSIONS_ROWS!}
 <TR>
 	<TD colspan="2" align="center" class="admin_title right2">
-		{--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<STRONG>{!__TEXT_VALUE!}</STRONG>
+		{--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<strong>{!__TEXT_VALUE!}</strong>
 	</TD>
 	<TD colspan="3" align="right" class="admin_title right2">
-		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<STRONG>{!__TKBYTES_VALUE!} {--KBYTES--}</STRONG>
+		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<strong>{!__TKBYTES_VALUE!} {--KBYTES--}</strong>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_gmenu_delete.tpl b/templates/de/html/admin/admin_gmenu_delete.tpl
index 823a50335b..e8ac8a2fc9 100644
--- a/templates/de/html/admin/admin_gmenu_delete.tpl
+++ b/templates/de/html/admin/admin_gmenu_delete.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
 		<TD align="center" colspan="2" class="admin_header" height="40">
-		<STRONG>{--DEL_GUEST_MENU--}</STRONG></TD>
+		<strong>{--DEL_GUEST_MENU--}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" class="admin_header bottom2">
@@ -20,4 +20,4 @@
 			value="{--DEL_ENTRIES--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_gmenu_edit.tpl b/templates/de/html/admin/admin_gmenu_edit.tpl
index ee4013be99..e89da339c1 100644
--- a/templates/de/html/admin/admin_gmenu_edit.tpl
+++ b/templates/de/html/admin/admin_gmenu_edit.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <TR>
-	<TH class="admin_title bottom2 right2" align="center" width="30" height="30"><STRONG>{--ID_SELECT--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_ACTION--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_WHAT--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center"><STRONG>{--DISPLAY_TITLE--}</STRONG></TH>
-	<TH class="admin_title bottom2" align="center"><STRONG>{--SORT_NAVIGATION--}</STRONG></TH>
+	<TH class="admin_title bottom2 right2" align="center" width="30" height="30"><strong>{--ID_SELECT--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_ACTION--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_WHAT--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center"><strong>{--DISPLAY_TITLE--}</strong></TH>
+	<TH class="admin_title bottom2" align="center"><strong>{--SORT_NAVIGATION--}</strong></TH>
 </TR>
 {!__MENU_ROWS!}
 <TR>
@@ -17,4 +17,4 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_gmenu_edit_form.tpl b/templates/de/html/admin/admin_gmenu_edit_form.tpl
index a296849431..e616af8b7a 100644
--- a/templates/de/html/admin/admin_gmenu_edit_form.tpl
+++ b/templates/de/html/admin/admin_gmenu_edit_form.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
 		<TD align="center" colspan="2" class="admin_header" height="40">
-		<STRONG>{--EDIT_GUEST_MENU--}</STRONG></TD>
+		<strong>{--EDIT_GUEST_MENU--}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" class="admin_header bottom2">
@@ -21,4 +21,4 @@
 			value="{--SUBMIT_CHANGES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl
index c5c850553c..842ec5be1e 100644
--- a/templates/de/html/admin/admin_gmenu_status.tpl
+++ b/templates/de/html/admin/admin_gmenu_status.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
@@ -7,8 +7,8 @@
 		<TD colspan="4" height="5" class="admin_title seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_GUEST_MENU--}</STRONG><BR />
-		<BR />
+		<TD align="center" colspan="4" class="admin_title"><strong>{--CHANGE_GUEST_MENU--}</strong><br />
+		<br />
 		{--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--}</TD>
 	</TR>
 	<TR>
@@ -25,4 +25,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl
index 4c44941527..bd55dd2ab1 100644
--- a/templates/de/html/admin/admin_guest_add.tpl
+++ b/templates/de/html/admin/admin_guest_add.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=guest_add" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=guest_add" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 	<TR>
 		<TD height="8" colspan="5"></TD>
@@ -19,8 +19,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_WHAT_NAME--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table">{!__WHAT_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
+		<TD align="center" class="admin_table">{!__WHAT_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_WHAT_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -30,8 +30,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_PARENT_MENU--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table">{!__ACTION_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
+		<TD align="center" class="admin_table">{!__ACTION_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_ACTION_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -51,11 +51,11 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--MENU_IS_VISIBLE--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table"><SELECT
+		<TD align="center" class="admin_table"><select
 			class="admin_select" name="visible" size="1">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
-		</SELECT></TD>
+			<option value="Y">{--YES--}</option>
+			<option value="N">{--NO--}</option>
+		</select></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -65,11 +65,11 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--MENU_IS_ACTIVE--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table"><SELECT
+		<TD align="center" class="admin_table"><select
 			class="admin_select" name="active" size="1">
-			<OPTION value="N">{--YES--}</OPTION>
-			<OPTION value="Y">{--NO--}</OPTION>
-		</SELECT></TD>
+			<option value="N">{--YES--}</option>
+			<option value="Y">{--NO--}</option>
+		</select></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -91,4 +91,4 @@
 		<TD class="admin_table" height="8" colspan="5"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl
index abc733dc7c..eaaa2d43e2 100644
--- a/templates/de/html/admin/admin_list_admins.tpl
+++ b/templates/de/html/admin/admin_list_admins.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
+<form action="{!URL!}/modules.php?module=admin&amp;what=admins_edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="640"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_ADMINS_EDIT_ACCOUNTS--}</STRONG></TD>
+		<strong>{--ADMIN_ADMINS_EDIT_ACCOUNTS--}</strong></TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_CONTACT--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="300"><STRONG>{--ADMIN_ADMINS_EMAIL--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--ADMIN_ADMINS_ACCESS_MODE--}:</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="160"><STRONG>{--ADMIN_LA_MODE--}:</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_CONTACT--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="300"><strong>{--ADMIN_ADMINS_EMAIL--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="160"><strong>{--ADMIN_LA_MODE--}:</strong></TD>
 	</TR>
 	{!__ADMINS_ROWS!}
 	<TR>
@@ -23,4 +23,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_list_admins_row.tpl b/templates/de/html/admin/admin_list_admins_row.tpl
index 27f7e0b34b..c4bfba0f53 100644
--- a/templates/de/html/admin/admin_list_admins_row.tpl
+++ b/templates/de/html/admin/admin_list_admins_row.tpl
@@ -3,10 +3,10 @@
 		<INPUT type="checkbox" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" class="admin_normal" value="1" />
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">
-		&nbsp;&nbsp;<A href="$content[email_link]">$content[login]</A>
+		&nbsp;&nbsp;<a href="$content[email_link]">$content[login]</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">
-		&nbsp;&nbsp;<A href="mailto:$content[email]">$content[email]</A>
+		&nbsp;&nbsp;<a href="mailto:$content[email]">$content[email]</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">
 		&nbsp;&nbsp;$content[mode]
diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl
index 87cb8a4c02..ee5d21a797 100644
--- a/templates/de/html/admin/admin_list_autopurge.tpl
+++ b/templates/de/html/admin/admin_list_autopurge.tpl
@@ -1,14 +1,14 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
 	<TR>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--GENDER--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--SURNAME--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--FAMILY_NAME--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADDY--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--MEMBER_JOINED--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--LAST_SEEN--}</STRONG></TD>
-		<TD class="admin_title bottom2" align="center"><STRONG>{--AUTOPURGE_NOTIFIED--}</STRONG></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--_UID--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--GENDER--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--SURNAME--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--FAMILY_NAME--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--ADDY--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--MEMBER_JOINED--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--LAST_SEEN--}</strong></TD>
+		<TD class="admin_title bottom2" align="center"><strong>{--AUTOPURGE_NOTIFIED--}</strong></TD>
 	</TR>
 	{!__AUTOPURGE_ROWS!}
 	<TR>
diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl
index bb88345d7e..6ba13a3c65 100644
--- a/templates/de/html/admin/admin_list_bank_package.tpl
+++ b/templates/de/html/admin/admin_list_bank_package.tpl
@@ -1,21 +1,21 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=list_bank_package"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620"
 	class="admin_table dashed" align="center">
 	<TR>
-		<TD colspan="8" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_LIST_BANK_PACKAGES--}:</STRONG>
+		<TD colspan="8" align="center" class="admin_title" height="30"><strong>{--ADMIN_LIST_BANK_PACKAGES--}:</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD width="20" colspan="2" align="center"
-			class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_TITLE--}:</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_DESCR--}:</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_PLUS--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_MINUS--}</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2"><STRONG>{--ADMIN_LIST_BANK_PACKAGES_STATUS--}</STRONG></TD>
+			class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_TITLE--}:</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_DESCR--}:</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_PLUS--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_MINUS--}</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2"><strong>{--ADMIN_LIST_BANK_PACKAGES_STATUS--}</strong></TD>
 	</TR>
 	{!__BANK_PACKAGE_ROWS!}
 	<TR>
@@ -28,4 +28,4 @@
 			value="{--ADMIN_DELETE_ENTRIES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_bank_package_row.tpl b/templates/de/html/admin/admin_list_bank_package_row.tpl
index 6d5e84824a..b7209c14c5 100644
--- a/templates/de/html/admin/admin_list_bank_package_row.tpl
+++ b/templates/de/html/admin/admin_list_bank_package_row.tpl
@@ -3,7 +3,7 @@
 		<INPUT type="checkbox" title="{--ID_SELECT--} $content[id]" class="admin_normal" name="id[$content[id]]" value="1" />
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
-		<STRONG>$content[id]</STRONG>
+		<strong>$content[id]</strong>
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 		$content[title]
diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index b045ac72d8..9a2e68207e 100644
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -2,22 +2,22 @@
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_header bottom2 right2" align="center" width="60">
-		<STRONG>{--BEG_RANK--}</STRONG></TD>
+		<strong>{--BEG_RANK--}</strong></TD>
 		<TD class="admin_header bottom2 right2" align="center" width="90">
-		<STRONG>{--_UID--}:</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--SURNAME_FAMILY--}:</STRONG>
+		<strong>{--_UID--}:</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--SURNAME_FAMILY--}:</strong>
 		</TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--BEG_TOTAL--}:</STRONG>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--BEG_TOTAL--}:</strong>
 		</TD>
-		<TD class="admin_header bottom2" align="center" width="160"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="admin_header bottom2" align="center" width="160"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__BEG_ROWS!}
 	<TR>
 		<TD colspan="3" class="admin_header bottom2 right2" height="28"
-			align="right"><U>{--BEG_MEMBER_TOTAL--}:</U>&nbsp;</TD>
-		<TD class="admin_header bottom2 right2" height="28">&nbsp;<U>{!__TOTAL!}
-		{!POINTS!}</U></TD>
+			align="right"><u>{--BEG_MEMBER_TOTAL--}:</u>&nbsp;</TD>
+		<TD class="admin_header bottom2 right2" height="28">&nbsp;<u>{!__TOTAL!}
+		{!POINTS!}</u></TD>
 		<TD class="admin_header bottom2">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -27,7 +27,7 @@
 	</TR>
 </TABLE>
 
-<DIV class="admin_note"><STRONG>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</STRONG><BR />
-<BR />
-<FONT class="admin_note">{--ADMIN_BEG_TIMEOUT_1--} <STRONG>{!__AUTOPURGE_TIMEOUT!}</STRONG>
-{--ADMIN_BEG_TIMEOUT_2--}</FONT></DIV>
+<div class="admin_note"><strong>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</strong><br />
+<br />
+<div class="admin_note">{--ADMIN_BEG_TIMEOUT_1--} <strong>{!__AUTOPURGE_TIMEOUT!}</strong>
+{--ADMIN_BEG_TIMEOUT_2--}</div></div>
diff --git a/templates/de/html/admin/admin_list_beg_form.tpl b/templates/de/html/admin/admin_list_beg_form.tpl
index 2d50364a4b..dc1b0b178e 100644
--- a/templates/de/html/admin/admin_list_beg_form.tpl
+++ b/templates/de/html/admin/admin_list_beg_form.tpl
@@ -1,6 +1,6 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_beg"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_beg"
 	method="POST" style="margin-bottom: 5px"><INPUT type="submit"
 	name="withdraw" class="admin_submit"
-	value="{--ADMIN_BEG_WITHDRAW_NOW--}"></FORM>
+	value="{--ADMIN_BEG_WITHDRAW_NOW--}"></form>
 
-<DIV class="admin_note">({--ADMIN_BEG_WITHDRAW_NOTE--})</DIV>
+<div class="admin_note">({--ADMIN_BEG_WITHDRAW_NOTE--})</div>
diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl
index 17e1fc6867..5c132bf46d 100644
--- a/templates/de/html/admin/admin_list_beg_rows.tpl
+++ b/templates/de/html/admin/admin_list_beg_rows.tpl
@@ -1,10 +1,10 @@
 <TR>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]$content[cnt]$content[win2]</TD>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<A
-		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[win2]</TD>
-	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<a
+		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</a>$content[win2]</TD>
+	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<a
 		href="$content[email]">$content[gender] $content[sname]
-	$content[fname]</A>$content[win2]</TD>
+	$content[fname]</a>$content[win2]</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[turbo]
 	{!POINTS!}</TD>
 	<TD class="switch_sw$content[sw] bottom2">&nbsp;$content[last]</TD>
diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl
index dc2b18fb34..a4ff830b0f 100644
--- a/templates/de/html/admin/admin_list_bonus.tpl
+++ b/templates/de/html/admin/admin_list_bonus.tpl
@@ -2,22 +2,22 @@
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_header bottom2 right2" align="center" width="60">
-		<STRONG>{--BONUS_RANK--}</STRONG></TD>
+		<strong>{--BONUS_RANK--}</strong></TD>
 		<TD class="admin_header bottom2 right2" align="center" width="90">
-		<STRONG>{--_UID--}:</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--SURNAME_FAMILY--}:</STRONG>
+		<strong>{--_UID--}:</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--SURNAME_FAMILY--}:</strong>
 		</TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--BONUS_TURBO_TOTAL2--}:</STRONG>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--BONUS_TURBO_TOTAL2--}:</strong>
 		</TD>
-		<TD class="admin_header bottom2" align="center" width="160"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="admin_header bottom2" align="center" width="160"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__BONUS_ROWS!}
 	<TR>
 		<TD colspan="3" class="admin_header bottom2 right2" height="28"
-			align="right"><U>{--BONUS_MEMBER_TOTAL--}:</U>&nbsp;</TD>
-		<TD class="admin_header bottom2 right2" height="28">&nbsp;<U>{!__TOTAL!}
-		{!POINTS!}</U></TD>
+			align="right"><u>{--BONUS_MEMBER_TOTAL--}:</u>&nbsp;</TD>
+		<TD class="admin_header bottom2 right2" height="28">&nbsp;<u>{!__TOTAL!}
+		{!POINTS!}</u></TD>
 		<TD class="admin_header bottom2">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -26,7 +26,7 @@
 	</TR>
 </TABLE>
 
-<DIV class="admin_note"><STRONG>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</STRONG><BR />
-<BR />
-<FONT class="admin_note">{--ADMIN_BONUS_TIMEOUT_1--} <STRONG>{!__AUTOPURGE_TIMEOUT!}</STRONG>
-{--ADMIN_BONUS_TIMEOUT_2--}</FONT></DIV>
+<div class="admin_note"><strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong><br />
+<br />
+<div class="admin_note">{--ADMIN_BONUS_TIMEOUT_1--} <strong>{!__AUTOPURGE_TIMEOUT!}</strong>
+{--ADMIN_BONUS_TIMEOUT_2--}</div></div>
diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl
index 2f57864037..0f11db5818 100644
--- a/templates/de/html/admin/admin_list_bonus_emails.tpl
+++ b/templates/de/html/admin/admin_list_bonus_emails.tpl
@@ -1,12 +1,12 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="99%">
 <TR>
   <TD colspan="3" align="center" height="25" class="admin_title">
-    <STRONG class="admin_done">{--ADMIN_BONUS_CONTENT--}</STRONG>
+    <div class="admin_done">{--ADMIN_BONUS_CONTENT--}</STRONG>
   </TD>
 </TR>
 $content[nav]
 $content[rows]
 $content[nav]
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_list_bonus_form.tpl b/templates/de/html/admin/admin_list_bonus_form.tpl
index c4438588e6..677cabe5eb 100644
--- a/templates/de/html/admin/admin_list_bonus_form.tpl
+++ b/templates/de/html/admin/admin_list_bonus_form.tpl
@@ -1,6 +1,6 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_bonus"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_bonus"
 	method="POST" style="margin-bottom: 5px"><INPUT type="submit"
 	name="withdraw" class="admin_submit"
-	value="{--ADMIN_BONUS_WITHDRAW_NOW--}"></FORM>
+	value="{--ADMIN_BONUS_WITHDRAW_NOW--}"></form>
 
-<DIV class="admin_note">({--ADMIN_BONUS_WITHDRAW_NOTE--})</DIV>
+<div class="admin_note">({--ADMIN_BONUS_WITHDRAW_NOTE--})</div>
diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl
index 188ff33575..e4a97222b4 100644
--- a/templates/de/html/admin/admin_list_bonus_rows.tpl
+++ b/templates/de/html/admin/admin_list_bonus_rows.tpl
@@ -1,7 +1,7 @@
 <TR>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]$content[cnt]$content[win2]</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]$content[uid]$content[win2]</TD>
-	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A href="$content[email]">$content[gender] $content[surname] $content[family]</A>$content[win2]</TD>
+	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<a href="$content[email]">$content[gender] $content[surname] $content[family]</a>$content[win2]</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[points] {!POINTS!}</TD>
 	<TD class="switch_sw$content[sw] bottom2">&nbsp;$content[last]</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl
index 79adca9dda..45cd4086ac 100644
--- a/templates/de/html/admin/admin_list_cats.tpl
+++ b/templates/de/html/admin/admin_list_cats.tpl
@@ -2,14 +2,14 @@
 	class="admin_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="admin_header bottom2"
-			height="50">{--USER_ID--}: <STRONG><A
-			href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__UID!}</A></STRONG>({!__EMAIL!})
+			height="50">{--USER_ID--}: <strong><a
+			href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__UID!}</a></strong>({!__EMAIL!})
 		</TD>
 	</TR>
 	{!__CATS_ROWS!}
 	<TR>
 		<TD colspan="3" class="admin_footer"
-			style="padding-top: 10px; padding-bottom: 10px"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR />
+			style="padding-top: 10px; padding-bottom: 10px"><u>{--ADMIN_MEMBER_FUNCTIONS--}:</u><br />
 		{!__MEMBER_LINKS!}</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_cats_404.tpl b/templates/de/html/admin/admin_list_cats_404.tpl
index b936c0f516..23fee03ddc 100644
--- a/templates/de/html/admin/admin_list_cats_404.tpl
+++ b/templates/de/html/admin/admin_list_cats_404.tpl
@@ -4,8 +4,8 @@
 		<TD height="10" class="admin_header seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_header"><STRONG>{--ADMIN_MEM_NO_CATS_1--}<A
-			href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__UID!}</A>{--ADMIN_MEM_NO_CATS_2--}</STRONG>
+		<TD align="center" class="admin_header"><strong>{--ADMIN_MEM_NO_CATS_1--}<a
+			href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__UID!}</a>{--ADMIN_MEM_NO_CATS_2--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -15,7 +15,7 @@
 		<TD height="10" class="admin_header seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_header"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR />
+		<TD align="center" class="admin_header"><u>{--ADMIN_MEMBER_FUNCTIONS--}:</u><br />
 		{!__MEMBER_LINKS!}</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl
index e296451e0d..a90c2dc8ef 100644
--- a/templates/de/html/admin/admin_list_country.tpl
+++ b/templates/de/html/admin/admin_list_country.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_country"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_country"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620"
 	class="admin_table dashed" align="center">
 	<TR>
-		<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--ADMIN_LIST_COUNTRIES--}:</STRONG>
+		<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--ADMIN_LIST_COUNTRIES--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD width="20" align="center" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_COUNTRY_CODE--}:</STRONG></TD>
-		<TD width="400" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_COUNTRY_NAME--}:</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2"><STRONG>{--ADMIN_COUNTRY_STATUS--}</STRONG></TD>
+		<TD width="20" align="center" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_COUNTRY_CODE--}:</strong></TD>
+		<TD width="400" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_COUNTRY_NAME--}:</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2"><strong>{--ADMIN_COUNTRY_STATUS--}</strong></TD>
 	</TR>
 	{!__COUNTRY_ROWS!}
 	<TR>
@@ -23,7 +23,7 @@
 			value="{--ADMIN_DELETE_ENTRIES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
 <P>
 	{!__ADD_COUNTRY_FORM!}
diff --git a/templates/de/html/admin/admin_list_country_del_row.tpl b/templates/de/html/admin/admin_list_country_del_row.tpl
index a0709fe389..ba4f4d8166 100644
--- a/templates/de/html/admin/admin_list_country_del_row.tpl
+++ b/templates/de/html/admin/admin_list_country_del_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>$content[id]</STRONG>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="id[$content[id]]" value="1"></TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 	$content[code]</TD>
diff --git a/templates/de/html/admin/admin_list_country_edit_row.tpl b/templates/de/html/admin/admin_list_country_edit_row.tpl
index 6ddb9bd296..29ba6c82b0 100644
--- a/templates/de/html/admin/admin_list_country_edit_row.tpl
+++ b/templates/de/html/admin/admin_list_country_edit_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>$content[id]</STRONG>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>$content[id]</strong>
 	<INPUT type="hidden" name="id[$content[id]]" value="1"></TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><INPUT
 		type="text" name="code[$content[id]]" class="admin_normal" size="2"
@@ -7,8 +7,8 @@
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><INPUT
 		type="text" name="descr[$content[id]]" class="admin_normal" size="20"
 		maxelength="255" value="$content[descr]"></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2"><SELECT
+	<TD align="center" class="switch_sw$content[sw] bottom2"><select
 		name="is_active[$content[id]]" class="admin_select" size="1">
 		$content[status]
-	</SELECT></TD>
+	</select></TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl
index 016c80916f..5173e57266 100644
--- a/templates/de/html/admin/admin_list_country_form.tpl
+++ b/templates/de/html/admin/admin_list_country_form.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_country" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_country" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="4" align="center" class="admin_title" height="30">
-			<STRONG>{!__COUNTRY_TITLE!}:</STRONG>
+			<strong>{!__COUNTRY_TITLE!}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD width="20" align="center" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_COUNTRY_CODE--}:</STRONG></TD>
-		<TD width="300" align="center" class="admin_title bottom2 right2"><STRONG>{--ADMIN_COUNTRY_NAME--}:</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2"><STRONG>{--ADMIN_COUNTRY_STATUS--}</STRONG></TD>
+		<TD width="20" align="center" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_COUNTRY_CODE--}:</strong></TD>
+		<TD width="300" align="center" class="admin_title bottom2 right2"><strong>{--ADMIN_COUNTRY_NAME--}:</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2"><strong>{--ADMIN_COUNTRY_STATUS--}</strong></TD>
 	</TR>
 	{!__COUNTRY_ROWS!}
 	<TR>
@@ -19,4 +19,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_country_no_row.tpl b/templates/de/html/admin/admin_list_country_no_row.tpl
index 7543814cca..c59e9226b7 100644
--- a/templates/de/html/admin/admin_list_country_no_row.tpl
+++ b/templates/de/html/admin/admin_list_country_no_row.tpl
@@ -1,4 +1,5 @@
 <TR>
-	<TD align="center" class="bottom2" colspan="4" height="30"><STRONG>{--ADMIN_COUNTRY_NO_CODES_SETUP--}</STRONG>
+	<TD align="center" class="bottom2" colspan="4" height="30">
+		<strong>{--ADMIN_COUNTRY_NO_CODES_SETUP--}</strong>
 	</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl
index fbdee00178..d518f192bc 100644
--- a/templates/de/html/admin/admin_list_doubler_already.tpl
+++ b/templates/de/html/admin/admin_list_doubler_already.tpl
@@ -1,21 +1,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="540" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title" align="center" height="30" colspan="4">
-			<STRONG class="big">{!__ADMIN_DOUBLER_LIST_ALREADY!}</STRONG>
+			<div class="big">{!__ADMIN_DOUBLER_LIST_ALREADY!}</STRONG>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="admin_title bottom2 right2" align="center" height="25" width="25%">
-			<STRONG class="medium">{--_UID--}:</STRONG>
+			<div class="medium">{--_UID--}:</STRONG>
 		</TD>
 		<TD class="admin_title bottom2 right2" align="center" width="25%">
-			<STRONG class="medium">{!POINTS!}:</STRONG>
+			<div class="medium">{!POINTS!}:</STRONG>
 		</TD>
 		<TD class="admin_title bottom2 right2" align="center" width="25%">
-			<STRONG class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</STRONG>
+			<div class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</STRONG>
 		</TD>
 		<TD class="admin_title bottom2" align="center" width="25%">
-			<STRONG class="medium">{--REMOTE_IP--}:</STRONG>
+			<div class="medium">{--REMOTE_IP--}:</STRONG>
 		</TD>
 	</TR>
 	{!__ROWS_CONTENT!}
diff --git a/templates/de/html/admin/admin_list_doubler_overview.tpl b/templates/de/html/admin/admin_list_doubler_overview.tpl
index fe2ec8c065..f97ce311ca 100644
--- a/templates/de/html/admin/admin_list_doubler_overview.tpl
+++ b/templates/de/html/admin/admin_list_doubler_overview.tpl
@@ -2,14 +2,14 @@
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2" align="center" height="30" colspan="2">
-		<STRONG class="big">{--ADMIN_DOUBLER_LIST_OVERVIEW--}</STRONG></TD>
+		<div class="big">{--ADMIN_DOUBLER_LIST_OVERVIEW--}</STRONG></TD>
 	</TR>
 	<TR>
 		<TD class="admin_title bottom2 right2" align="center" height="25"
-			width="260"><STRONG class="medium">{--ADMIN_DOUBLER_LIST_ALREADY--}</STRONG>
+			width="260"><div class="medium">{--ADMIN_DOUBLER_LIST_ALREADY--}</STRONG>
 		</TD>
 		<TD class="admin_title bottom2" align="center" height="25" width="260">
-		<STRONG class="medium">{--ADMIN_DOUBLER_LIST_WAITING--}</STRONG></TD>
+		<div class="medium">{--ADMIN_DOUBLER_LIST_WAITING--}</STRONG></TD>
 	</TR>
 	<TR>
 		<TD class="right2" align="center"
@@ -19,19 +19,19 @@
 			<TR>
 				<TD class="switch_sw1 bottom2" align="right" width="245">
 				{--ADMIN_DOUBLER_ALREADY_ALL--}:&nbsp;</TD>
-				<TD class="switch_sw1 bottom2" align="center" width="30"><STRONG>{!__DOUBLER_ALREADY_ALL_LINK!}</STRONG>
+				<TD class="switch_sw1 bottom2" align="center" width="30"><strong>{!__DOUBLER_ALREADY_ALL_LINK!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD class="switch_sw2 bottom2" align="right">
 				{--ADMIN_DOUBLER_ALREADY_DIRECT--}:&nbsp;</TD>
-				<TD class="switch_sw2 bottom2" align="center"><STRONG>{!__DOUBLER_ALREADY_DIRECT_LINK!}</STRONG>
+				<TD class="switch_sw2 bottom2" align="center"><strong>{!__DOUBLER_ALREADY_DIRECT_LINK!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD class="switch_sw1" align="right">
 				{--ADMIN_DOUBLER_ALREADY_REF--}:&nbsp;</TD>
-				<TD class="switch_sw1" align="center"><STRONG>{!__DOUBLER_ALREADY_REF_LINK!}</STRONG>
+				<TD class="switch_sw1" align="center"><strong>{!__DOUBLER_ALREADY_REF_LINK!}</strong>
 				</TD>
 			</TR>
 		</TABLE>
@@ -43,19 +43,19 @@
 			<TR>
 				<TD class="switch_sw1 bottom2" align="right" width="245">
 				{--ADMIN_DOUBLER_WAITING_ALL--}:&nbsp;</TD>
-				<TD class="switch_sw1 bottom2" align="center" width="30"><STRONG>{!__DOUBLER_WAITING_ALL_LINK!}</STRONG>
+				<TD class="switch_sw1 bottom2" align="center" width="30"><strong>{!__DOUBLER_WAITING_ALL_LINK!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD class="switch_sw2 bottom2" align="right">
 				{--ADMIN_DOUBLER_WAITING_DIRECT--}:&nbsp;</TD>
-				<TD class="switch_sw2 bottom2" align="center"><STRONG>{!__DOUBLER_WAITING_DIRECT_LINK!}</STRONG>
+				<TD class="switch_sw2 bottom2" align="center"><strong>{!__DOUBLER_WAITING_DIRECT_LINK!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD class="switch_sw1" align="right">
 				{--ADMIN_DOUBLER_WAITING_REF--}:&nbsp;</TD>
-				<TD class="switch_sw1" align="center"><STRONG>{!__DOUBLER_WAITING_REF_LINK!}</STRONG>
+				<TD class="switch_sw1" align="center"><strong>{!__DOUBLER_WAITING_REF_LINK!}</strong>
 				</TD>
 			</TR>
 		</TABLE>
diff --git a/templates/de/html/admin/admin_list_doubler_waiting.tpl b/templates/de/html/admin/admin_list_doubler_waiting.tpl
index 24086f476a..7df2034c06 100644
--- a/templates/de/html/admin/admin_list_doubler_waiting.tpl
+++ b/templates/de/html/admin/admin_list_doubler_waiting.tpl
@@ -1,18 +1,18 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="540" class="admin_table dashed">
 	<TR>
-		<TD class="admin_title" align="center" height="30" colspan="4"><STRONG
-			class="big">{!__ADMIN_DOUBLER_LIST_WAITING!}</STRONG></TD>
+		<TD class="admin_title" align="center" height="30" colspan="4"><strong
+			class="big">{!__ADMIN_DOUBLER_LIST_WAITING!}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="admin_title bottom2 right2" align="center" height="25"
-			width="25%"><STRONG class="medium">{--_UID--}:</STRONG></TD>
+			width="25%"><div class="medium">{--_UID--}:</strong></TD>
 		<TD class="admin_title bottom2 right2" align="center" width="25%">
-		<STRONG class="medium">{!POINTS!}:</STRONG></TD>
+		<div class="medium">{!POINTS!}:</strong></TD>
 		<TD class="admin_title bottom2 right2" align="center" width="25%">
-		<STRONG class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</STRONG>
+		<div class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</strong>
 		</TD>
-		<TD class="admin_title bottom2" align="center" width="25%"><STRONG
-			class="medium">{--REMOTE_IP--}:</STRONG></TD>
+		<TD class="admin_title bottom2" align="center" width="25%"><strong
+			class="medium">{--REMOTE_IP--}:</strong></TD>
 	</TR>
 	{!__ROWS_CONTENT!}
 	<TR>
diff --git a/templates/de/html/admin/admin_list_emails.tpl b/templates/de/html/admin/admin_list_emails.tpl
index ab2bc06f4f..dd7606d852 100644
--- a/templates/de/html/admin/admin_list_emails.tpl
+++ b/templates/de/html/admin/admin_list_emails.tpl
@@ -1,12 +1,12 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="99%">
 <TR>
   <TD colspan="3" align="center" height="25" class="admin_title">
-    <STRONG class="admin_done">{--ADMIN_POOL_CONTENT--} ($content[who])</STRONG>
+    <div class="admin_done">{--ADMIN_POOL_CONTENT--} ($content[who])</STRONG>
   </TD>
 </TR>
 $content[nav]
 $content[rows]
 $content[nav]
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl
index e9c8521097..615f6e1697 100644
--- a/templates/de/html/admin/admin_list_emails_row.tpl
+++ b/templates/de/html/admin/admin_list_emails_row.tpl
@@ -1,61 +1,61 @@
 <TR>
   <TD class="bottom top2 right" width="23%" align="center">
     {--EMAIL_SENDER--}:<br />
-    <STRONG class="admin_misc">$content[sender_link]</STRONG>
+    <div class="admin_misc">$content[sender_link]</STRONG>
   </TD>
   <TD class="bottom top2 right" width="23%" align="center">
     {--EMAIL_SUBJECT--}:<br />
-    <STRONG class="admin_misc">$content[subject]</STRONG>
+    <div class="admin_misc">$content[subject]</STRONG>
   </TD>
   <TD class="bottom top2" width="54%" align="center">
     {--EMAIL_TEXT--}:<br />
-    <STRONG class="admin_misc">$content[text]</STRONG>
+    <div class="admin_misc">$content[text]</STRONG>
   </TD>
 </TR>
 <TR><TD height="5" colspan="3"></TD></TR>
 <TR>
   <TD colspan="2" align="center" class="top bottom right">
     {--EMAIL_PAYMENT--}:<br />
-    <STRONG class="admin_misc">$content[payment]
+    <div class="admin_misc">$content[payment]
   </TD>
   <TD align="center" class="top bottom">
     {--EMAIL_CATEGORY--}:<br />
-    <STRONG class="admin_misc">$content[category]
+    <div class="admin_misc">$content[category]
   </TD>
 </TR>
 <TR><TD height="5" colspan="3"></TD></TR>
 <TR>
   <TD align="center" class="top bottom right">
     {--EMAIL_RECEIVERS--}:<br />
-    <STRONG class="admin_misc">$content[sent_email]</STRONG>
-    ({--EMAIL_RUIDS--}: <STRONG class="admin_misc">$content[receivers]</STRONG>)
+    <div class="admin_misc">$content[sent_email]</STRONG>
+    ({--EMAIL_RUIDS--}: <div class="admin_misc">$content[receivers]</STRONG>)
   </TD>
   <TD align="center" class="top bottom right">
     {--USERS_LINKS--}:<br />
-    <STRONG class="admin_misc">$content[unconfirmed]</STRONG>
+    <div class="admin_misc">$content[unconfirmed]</STRONG>
   </TD>
   <TD align="center" class="top bottom">
     {--EMAIL_POOL_TYPE--}:<br />
-    <STRONG class="admin_misc">$content[type]</STRONG>
+    <div class="admin_misc">$content[type]</STRONG>
   </TD>
 </TR>
 <TR><TD height="5" colspan="3"></TD></TR>
 <TR>
   <TD align="center" class="top right">
     {--EMAIL_TSEND--}:<br />
-    <STRONG class="admin_misc">$content[target_send]</STRONG>
+    <div class="admin_misc">$content[target_send]</STRONG>
   </TD>
   <TD align="center" class="top right">
     {--EMAIL_URL--}:<br />
-    <STRONG class="admin_misc"><A href="$content[frametester]" target="_blank">{--ADMIN_TEST_URL--}</A></STRONG>
+    <div class="admin_misc"><a href="$content[frametester]" target="_blank">{--ADMIN_TEST_URL--}</a></STRONG>
   </TD>
   <TD align="center" class="top">
     {--EMAIL_TIMESTAMP--}:<br />
-    <STRONG class="admin_misc">$content[timestamp]</STRONG>
+    <div class="admin_misc">$content[timestamp]</STRONG>
   </TD>
 </TR>
 <TR>
   <TD align="center" class="top2 admin_del_link" colspan="3">
-    <A href="{!URL!}/modules.php?module=admin&amp;what=del_email&amp;mid=$content[id]">{--ADMIN_DELETE_NORMAL_MAIL--}</A>
+    <a href="{!URL!}/modules.php?module=admin&amp;what=del_email&amp;mid=$content[id]">{--ADMIN_DELETE_NORMAL_MAIL--}</a>
   </TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_extensions.tpl b/templates/de/html/admin/admin_list_extensions.tpl
index de84c5b37c..45cc3cc016 100644
--- a/templates/de/html/admin/admin_list_extensions.tpl
+++ b/templates/de/html/admin/admin_list_extensions.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <TR>
 	<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-	<STRONG>{--ADMIN_EXT_NEW_FOUND_TITLE--}:</STRONG></TD>
+	<strong>{--ADMIN_EXT_NEW_FOUND_TITLE--}:</strong></TD>
 </TR>
 <TR>
 	<TD align="center" width="5%" class="admin_title bottom2 right2">{--ID_SELECT--}</TD>
@@ -13,10 +13,10 @@
 {!__EXTENSIONS_ROWS!}
 <TR>
 	<TD colspan="2" align="center" class="admin_title right2">
-		{--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<STRONG>{!__TEXT_VALUE!}</STRONG>
+		{--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<strong>{!__TEXT_VALUE!}</strong>
 	</TD>
 	<TD colspan="3" align="right" class="admin_title right2">
-		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<STRONG>{!__TKBYTES_VALUE!} {--KBYTES--}</STRONG>
+		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<strong>{!__TKBYTES_VALUE!} {--KBYTES--}</strong>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_extensions_row.tpl b/templates/de/html/admin/admin_list_extensions_row.tpl
index 368844be5d..a01fc73702 100644
--- a/templates/de/html/admin/admin_list_extensions_row.tpl
+++ b/templates/de/html/admin/admin_list_extensions_row.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[id].</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><A href="$content[link]">$content[name]</A></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><a href="$content[link]">$content[name]</a></TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[last]</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[size]&nbsp;{--KBYTES--}</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2">$content[new_ver]&nbsp;($content[old_ver])</TD>
@@ -8,6 +8,6 @@
 <TR>
 	<TD class="switch_sw$content[sw] bottom2">&nbsp;</TD>
 	<TD colspan="4" class="switch_sw$content[sw] bottom2">
-		<FONT class="tiny">$content[info]</FONT>
+		<div class="tiny">$content[info]</div>
 	</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl
index c9ad5ca5b2..443903bb4b 100644
--- a/templates/de/html/admin/admin_list_holiday.tpl
+++ b/templates/de/html/admin/admin_list_holiday.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=del_holiday"
+<form action="{!URL!}/modules.php?module=admin&amp;what=del_holiday"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD width="10" class="admin_title bottom2 right2" align="center"
-			height="30"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD width="50" class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}:</STRONG></TD>
-		<TD width="80" class="admin_title bottom2 right2" align="center"><STRONG>{--HOLIDAY_ADMIN_TSTART--}:</STRONG></TD>
-		<TD width="80" class="admin_title bottom2 right2" align="center"><STRONG>{--HOLIDAY_ADMIN_TEND--}:</STRONG></TD>
-		<TD width="100" class="admin_title bottom2 right2" align="center"><STRONG>{--HOLIDAY_ADMIN_COMMENTS--}:</STRONG></TD>
-		<TD width="100" class="admin_title bottom2 right2" align="center"><STRONG>{--ACCOUNT_STATUS--}:</STRONG></TD>
-		<TD width="160" class="admin_title bottom2" align="center"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG></TD>
+			height="30"><strong>{--ID_SELECT--}</strong></TD>
+		<TD width="50" class="admin_title bottom2 right2" align="center"><strong>{--_UID--}:</strong></TD>
+		<TD width="80" class="admin_title bottom2 right2" align="center"><strong>{--HOLIDAY_ADMIN_TSTART--}:</strong></TD>
+		<TD width="80" class="admin_title bottom2 right2" align="center"><strong>{--HOLIDAY_ADMIN_TEND--}:</strong></TD>
+		<TD width="100" class="admin_title bottom2 right2" align="center"><strong>{--HOLIDAY_ADMIN_COMMENTS--}:</strong></TD>
+		<TD width="100" class="admin_title bottom2 right2" align="center"><strong>{--ACCOUNT_STATUS--}:</strong></TD>
+		<TD width="160" class="admin_title bottom2" align="center"><strong>{--ADMIN_LAST_ONLINE--}:</strong></TD>
 	</TR>
 	{!__HOLIDAY_ROWS!}
 	<TR>
@@ -20,4 +20,4 @@
 			value="{--HOLIDAY_ADMIN_STOP_CHECKED--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_holiday_row.tpl b/templates/de/html/admin/admin_list_holiday_row.tpl
index 1af87b9c9f..e6abd87520 100644
--- a/templates/de/html/admin/admin_list_holiday_row.tpl
+++ b/templates/de/html/admin/admin_list_holiday_row.tpl
@@ -12,7 +12,7 @@
 		$content[end]
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
-		<PRE>$content[comments]</PRE>
+		<pre>$content[comments]</pre>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 		$content[status]
diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl
index 4b7a6b4ae4..91414ac3cb 100644
--- a/templates/de/html/admin/admin_list_links.tpl
+++ b/templates/de/html/admin/admin_list_links.tpl
@@ -1,14 +1,14 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 	<TR>
 		<TD colspan="4" align="center" class="admin_header bottom2" height="40">
-			<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__SNAME_VALUE!} {!__FNAME_VALUE!}</A></STRONG> ({!__EMAIL_VALUE!}):
+			<strong><a href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__SNAME_VALUE!} {!__FNAME_VALUE!}</a></strong> ({!__EMAIL_VALUE!}):
 		</TD>
 	</TR>
 	{!__EMAIL_LIST!}
 	<TR>
 		<TD colspan="4" height="40" class="admin_header" align="center">
-			{--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<BR />
-			<A href="{!URL!}/modules.php?module=admin&amp;what=list_links&amp;u_id={!__UID!}&del=all" onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</A>
+			{--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<br />
+			<a href="{!URL!}/modules.php?module=admin&amp;what=list_links&amp;u_id={!__UID!}&del=all" onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</a>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_links_problem.tpl b/templates/de/html/admin/admin_list_links_problem.tpl
index b40cfaf3cf..894df83d5c 100644
--- a/templates/de/html/admin/admin_list_links_problem.tpl
+++ b/templates/de/html/admin/admin_list_links_problem.tpl
@@ -1,5 +1,5 @@
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2" colspan="4">
-    <STRONG class="admin_failed large">$content[problem]:</STRONG>&nbsp;$content[data]
+    <div class="admin_failed large">$content[problem]:</STRONG>&nbsp;$content[data]
   </TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl
index 58543fc2f9..3f0e41f6a2 100644
--- a/templates/de/html/admin/admin_list_payments.tpl
+++ b/templates/de/html/admin/admin_list_payments.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=payments"
+<form action="{!URL!}/modules.php?module=admin&amp;what=payments"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="99%" class="admin_table dashed">
 	<TR>
-		<TD align="center" colspan="5" class="admin_title" height="30"><STRONG>{--EDIT_DEL_PAYMENT--}</STRONG>
+		<TD align="center" colspan="5" class="admin_title" height="30"><strong>{--EDIT_DEL_PAYMENT--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--PAY_TIME--}:</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--PAY_PAYMENT--}:</STRONG></TD>
-		<TD class="admin_title bottom2 right2" align="center"><STRONG>{--PAY_PRICE--}:</STRONG></TD>
-		<TD class="admin_title bottom2" align="center"><STRONG>{--PAY_TITLE--}:</STRONG></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--PAY_TIME--}:</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--PAY_PAYMENT--}:</strong></TD>
+		<TD class="admin_title bottom2 right2" align="center"><strong>{--PAY_PRICE--}:</strong></TD>
+		<TD class="admin_title bottom2" align="center"><strong>{--PAY_TITLE--}:</strong></TD>
 	</TR>
 	{!__PAYMENT_ROWS!}
 	<TR>
@@ -22,4 +22,4 @@
 			name="del" class="admin_delete" value="{--DEL_PAY--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_payouts.tpl b/templates/de/html/admin/admin_list_payouts.tpl
index f2116ef4a7..0b22a33bde 100644
--- a/templates/de/html/admin/admin_list_payouts.tpl
+++ b/templates/de/html/admin/admin_list_payouts.tpl
@@ -1,24 +1,24 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_payouts"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_payouts"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed" align="center">
 	<TR>
-		<TD colspan="6" align="center" class="admin_title" height="30"><STRONG>{--PAYOUT_ADMIN_LIST_PAYOUTS--}:</STRONG>
+		<TD colspan="6" align="center" class="admin_title" height="30"><strong>{--PAYOUT_ADMIN_LIST_PAYOUTS--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD width="20" align="center" class="admin_title bottom2 right2"><STRONG>{--_UID--}</STRONG></TD>
-		<TD width="40" align="center" class="admin_title bottom2 right2"><STRONG>{--PAYOUT_TOTAL_PAYOUT--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--PAYOUT_TARGET_ACCOUNT2--}</STRONG></TD>
-		<TD width="80" align="center" class="admin_title bottom2 right2"><STRONG>{--PAYOUT_TARGET_BANK2--}</STRONG></TD>
-		<TD width="120" align="center" class="admin_title bottom2 right2"><STRONG>{--PAYOUT_TIMESTAMP--}</STRONG></TD>
-		<TD width="220" align="center" class="admin_title bottom2"><STRONG>{--PAYOUT_STATUS--}</STRONG></TD>
+		<TD width="20" align="center" class="admin_title bottom2 right2"><strong>{--_UID--}</strong></TD>
+		<TD width="40" align="center" class="admin_title bottom2 right2"><strong>{--PAYOUT_TOTAL_PAYOUT--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--PAYOUT_TARGET_ACCOUNT2--}</strong></TD>
+		<TD width="80" align="center" class="admin_title bottom2 right2"><strong>{--PAYOUT_TARGET_BANK2--}</strong></TD>
+		<TD width="120" align="center" class="admin_title bottom2 right2"><strong>{--PAYOUT_TIMESTAMP--}</strong></TD>
+		<TD width="220" align="center" class="admin_title bottom2"><strong>{--PAYOUT_STATUS--}</strong></TD>
 	</TR>
 	{!__PAYOUT_ROWS!}
 	<TR>
-		<TD colspan="6" class="admin_footer"><A
-			href="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=delete">{--PAYOUT_DELETE_ALL_REQUESTS--}</A>
+		<TD colspan="6" class="admin_footer"><a
+			href="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=delete">{--PAYOUT_DELETE_ALL_REQUESTS--}</a>
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_payouts_banner.tpl b/templates/de/html/admin/admin_list_payouts_banner.tpl
index 1f29edd2f2..a0ac512363 100644
--- a/templates/de/html/admin/admin_list_payouts_banner.tpl
+++ b/templates/de/html/admin/admin_list_payouts_banner.tpl
@@ -1,11 +1,11 @@
 {--PAYOUT_OPTIONAL_BANNER--}:&nbsp;
-<STRONG><A href="$content[banner]" title="$content[alt]"
-	target="_blank">$content[banner]</A></STRONG>
-<BR />
+<strong><a href="$content[banner]" title="$content[alt]"
+	target="_blank">$content[banner]</a></strong>
+<br />
 {--PAYOUT_ALTERNATE_TEXT--}:&nbsp;
-<STRONG>$content[alt]</STRONG>
-<BR />
-<BR />
+<strong>$content[alt]</strong>
+<br />
+<br />
 {--PAYOUT_TARGET_URL--}:&nbsp;
-<STRONG>$content[url]</STRONG>
-<BR />
+<strong>$content[url]</strong>
+<br />
diff --git a/templates/de/html/admin/admin_list_payouts_txt.tpl b/templates/de/html/admin/admin_list_payouts_txt.tpl
index 5b2b1a4402..4665da6cde 100644
--- a/templates/de/html/admin/admin_list_payouts_txt.tpl
+++ b/templates/de/html/admin/admin_list_payouts_txt.tpl
@@ -1,8 +1,8 @@
 {--PAYOUT_LINK_TEXT--}:
-<BR />
-<STRONG>$content[txt_link]</STRONG>
-<BR />
-<BR />
+<br />
+<strong>$content[txt_link]</strong>
+<br />
+<br />
 {--PAYOUT_LINK_URL--}:
-<BR />
-<STRONG>$content[txt_url]</STRONG>
+<br />
+<strong>$content[txt_url]</strong>
diff --git a/templates/de/html/admin/admin_list_primera_main.tpl b/templates/de/html/admin/admin_list_primera_main.tpl
index 3d23712fa5..6472cb31eb 100644
--- a/templates/de/html/admin/admin_list_primera_main.tpl
+++ b/templates/de/html/admin/admin_list_primera_main.tpl
@@ -1,13 +1,13 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%" class="admin_table dashed">
 <TR>
-	<TD class="admin_header bottom2 right2" align="center" width="60"><STRONG>{--ID_SELECT--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="90"><STRONG>{--_UID--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center"><STRONG>{--PRIMERA_ADMIN_ACCOUNT--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center"><STRONG>{--PRIMERA_ADMIN_TRANSFERED--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--PRIMERA_ADMIN_TIMESTAMP--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--PRIMERA_ADMIN_TYPE--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--PRIMERA_ADMIN_API_MESSAGE--}</STRONG></TD>
-	<TD class="admin_header bottom2" align="center" width="160"><STRONG>{--PRIMERA_ADMIN_API_STATUS--}</STRONG></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="60"><strong>{--ID_SELECT--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="90"><strong>{--_UID--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center"><strong>{--PRIMERA_ADMIN_ACCOUNT--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center"><strong>{--PRIMERA_ADMIN_TRANSFERED--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--PRIMERA_ADMIN_TIMESTAMP--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--PRIMERA_ADMIN_TYPE--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--PRIMERA_ADMIN_API_MESSAGE--}</strong></TD>
+	<TD class="admin_header bottom2" align="center" width="160"><strong>{--PRIMERA_ADMIN_API_STATUS--}</strong></TD>
 </TR>
 $content
 <TR>
diff --git a/templates/de/html/admin/admin_list_rallye_noselect.tpl b/templates/de/html/admin/admin_list_rallye_noselect.tpl
index cf2f29cda9..77f3c63954 100644
--- a/templates/de/html/admin/admin_list_rallye_noselect.tpl
+++ b/templates/de/html/admin/admin_list_rallye_noselect.tpl
@@ -1,3 +1,3 @@
 {--RALLYE_NO_RALLYES_SELECTED_1--}
-<A href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes">{--RALLYE_NO_RALLYES_SELECTED_2--}</A>
+<a href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes">{--RALLYE_NO_RALLYES_SELECTED_2--}</a>
 {--RALLYE_NO_RALLYES_SELECTED_3--}
diff --git a/templates/de/html/admin/admin_list_rallye_prices.tpl b/templates/de/html/admin/admin_list_rallye_prices.tpl
index 9787417c89..77260cf3f5 100644
--- a/templates/de/html/admin/admin_list_rallye_prices.tpl
+++ b/templates/de/html/admin/admin_list_rallye_prices.tpl
@@ -1,17 +1,17 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="5" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_DEL_RALLYES--}:</STRONG>
+		<TD colspan="5" align="center" class="admin_title" height="30"><strong>{--RALLYE_EDIT_DEL_RALLYES--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" width="10" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" width="100" class="admin_title bottom2 right2"><STRONG>{--RALLYE_TITLE--}:</STRONG></TD>
-		<TD align="center" width="70" class="admin_title bottom2 right2"><STRONG>{--RALLYE_ADMIN_ID--}:</STRONG></TD>
-		<TD align="center" width="200" class="admin_title bottom2 right2"><STRONG>{--RALLYE_TSTART--}:</STRONG></TD>
-		<TD align="center" width="200" class="admin_title bottom2"><STRONG>{--RALLYE_TEND--}:</STRONG></TD>
+		<TD align="center" width="10" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" width="100" class="admin_title bottom2 right2"><strong>{--RALLYE_TITLE--}:</strong></TD>
+		<TD align="center" width="70" class="admin_title bottom2 right2"><strong>{--RALLYE_ADMIN_ID--}:</strong></TD>
+		<TD align="center" width="200" class="admin_title bottom2 right2"><strong>{--RALLYE_TSTART--}:</strong></TD>
+		<TD align="center" width="200" class="admin_title bottom2"><strong>{--RALLYE_TEND--}:</strong></TD>
 	</TR>
 	{!__RALLYE_ROWS!}
 	<TR>
@@ -23,7 +23,7 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note"><STRONG>{--RALLYE_EDIT_DEL_NOTE--}</STRONG>
-</DIV>
+<div class="admin_note"><strong>{--RALLYE_EDIT_DEL_NOTE--}</strong>
+</div>
diff --git a/templates/de/html/admin/admin_list_rallye_prices_row.tpl b/templates/de/html/admin/admin_list_rallye_prices_row.tpl
index 9b5cc59d5b..e6846819bf 100644
--- a/templates/de/html/admin/admin_list_rallye_prices_row.tpl
+++ b/templates/de/html/admin/admin_list_rallye_prices_row.tpl
@@ -1,9 +1,9 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[select]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><A
-		href="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[title]</A></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><A
-		href="$content[email_link]">$content[alogin]</A></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><a
+		href="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[title]</a></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><a
+		href="$content[email_link]">$content[alogin]</a></TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[start]</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2">$content[end]</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl
index 5ce67b56a4..71487845b4 100644
--- a/templates/de/html/admin/admin_list_rallye_usr.tpl
+++ b/templates/de/html/admin/admin_list_rallye_usr.tpl
@@ -1,18 +1,18 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
 <TR>
-	<TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_LIST_USERS_1--}{!__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}:</STRONG>
+	<TD colspan="4" align="center" class="admin_title" height="30"><strong>{--RALLYE_LIST_USERS_1--}{!__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}:</strong>
 	</TD>
 </TR>
 <TR>
-	<TD align="center" class="admin_title bottom2 right2"><STRONG>{--_UID--}:</STRONG></TD>
-	<TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_OLD_REFS--}:</STRONG></TD>
-	<TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_NEW_REFS--}:</STRONG></TD>
-	<TD align="center" class="admin_title bottom2"><STRONG>{--RALLYE_REF_POINTS--}:</STRONG></TD>
+	<TD align="center" class="admin_title bottom2 right2"><strong>{--_UID--}:</strong></TD>
+	<TD align="center" class="admin_title bottom2 right2"><strong>{--RALLYE_OLD_REFS--}:</strong></TD>
+	<TD align="center" class="admin_title bottom2 right2"><strong>{--RALLYE_NEW_REFS--}:</strong></TD>
+	<TD align="center" class="admin_title bottom2"><strong>{--RALLYE_REF_POINTS--}:</strong></TD>
 </TR>
 {!__RALLYE_USER_ROWS!}
 <TR>
 	<TD colspan="4" class="admin_footer">
-		<STRONG class="admin_note">{--RALLYE_REF_POINTS_NOTE--}</STRONG>
+		<div class="admin_note">{--RALLYE_REF_POINTS_NOTE--}</strong>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_rallye_usr_row.tpl b/templates/de/html/admin/admin_list_rallye_usr_row.tpl
index a47be840f0..7a72db4ffb 100644
--- a/templates/de/html/admin/admin_list_rallye_usr_row.tpl
+++ b/templates/de/html/admin/admin_list_rallye_usr_row.tpl
@@ -1,7 +1,7 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
-	$content[bold_l]<A
-		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[bold_r]
+	$content[bold_l]<a
+		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</a>$content[bold_r]
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 	$content[bold_l]$content[old]$content[bold_r]</TD>
diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl
index b37c6f4f10..bf47082df6 100644
--- a/templates/de/html/admin/admin_list_rallyes.tpl
+++ b/templates/de/html/admin/admin_list_rallyes.tpl
@@ -1,14 +1,14 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_rallyes"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="730"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="6" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_DEL_RALLYES--}:</STRONG>
+		<TD colspan="6" align="center" class="admin_title" height="30"><strong>{--RALLYE_EDIT_DEL_RALLYES--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" width="10" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" colspan="5"><STRONG>{--RALLYE_LIST_OVERVIEW_TITLE--}:</STRONG></TD>
+		<TD align="center" width="10" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" colspan="5"><strong>{--RALLYE_LIST_OVERVIEW_TITLE--}:</strong></TD>
 	</TR>
 	{!__RALLYE_ROWS!}
 	<TR>
@@ -20,7 +20,7 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note"><STRONG class="admin_note">{--RALLYE_EDIT_ONLY_INACTIVE_NOTE--}</STRONG>
-</DIV>
+<div class="admin_note"><div class="admin_note">{--RALLYE_EDIT_ONLY_INACTIVE_NOTE--}</strong>
+</div>
diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl
index c8ecd8694c..a806728263 100644
--- a/templates/de/html/admin/admin_list_rallyes_row.tpl
+++ b/templates/de/html/admin/admin_list_rallyes_row.tpl
@@ -1,54 +1,54 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2"
 		rowspan="5">$content[select]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TITLE--}:</STRONG><BR />
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TITLE--}:</strong><br />
 	$content[title]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_DESCR2--}:</STRONG><BR />
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_DESCR2--}:</strong><br />
 	$content[descr]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ADMIN_ID--}:</STRONG><BR />
-	<A href="$content[email_link]">$content[alogin]</A></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TSTART--}:</STRONG><BR />
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_ADMIN_ID--}:</strong><br />
+	<a href="$content[email_link]">$content[alogin]</a></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TSTART--}:</strong><br />
 	$content[start_date]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_TEND--}:</STRONG><BR />
+	<TD align="center" class="switch_sw$content[sw] bottom2"><strong>{--RALLYE_TEND--}:</strong><br />
 	$content[end_date]</TD>
 </TR>
 <TR>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TEMPLATE2--}:</STRONG><BR />
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_TEMPLATE2--}:</strong><br />
 	$content[template]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_AUTO_ADD--}:</STRONG><BR />
-	<A
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_AUTO_ADD--}:</strong><br />
+	<a
 		href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;auto=$content[auto]"
-		title="$content[auto_title]">$content[auto_lnk]</A></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ACTIVE--}:</STRONG><BR />
-	<A
+		title="$content[auto_title]">$content[auto_lnk]</a></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_ACTIVE--}:</strong><br />
+	<a
 		href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;activate=$content[active]"
-		title="$content[active_title]">$content[active_lnk]</A></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_NOTIFY--}:</STRONG><BR />
-	<A
+		title="$content[active_title]">$content[active_lnk]</a></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><strong>{--RALLYE_NOTIFY--}:</strong><br />
+	<a
 		href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;notify=$content[notify]"
-		title="$content[notify_title]">$content[notify_lnk]</A></TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_NOTIFIED--}:</STRONG><BR />
+		title="$content[notify_title]">$content[notify_lnk]</a></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2"><strong>{--RALLYE_NOTIFIED--}:</strong><br />
 	$content[notified]</TD>
 </TR>
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2"
-		colspan="3"><STRONG>{--RALLYE_ASSIGNED_PRICES--}:</STRONG><BR />
-	<A
-		href="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[prices_cnt]</A>
+		colspan="3"><strong>{--RALLYE_ASSIGNED_PRICES--}:</strong><br />
+	<a
+		href="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[prices_cnt]</a>
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2" colspan="2">
-	<STRONG>{--RALLYE_ASSIGNED_USERS--}:</STRONG><BR />
+	<strong>{--RALLYE_ASSIGNED_USERS--}:</strong><br />
 	$content[joined]</TD>
 </TR>
 <TR>
 	<TD align="center" class="admin_title bottom2" colspan="5" height="35">
-	<STRONG>{--RALLYE_LIMITATIONS--}:</STRONG></TD>
+	<strong>{--RALLYE_LIMITATIONS--}:</strong></TD>
 </TR>
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2"
-		colspan="3"><STRONG>{--RALLYE_MIN_USERS_MINI--}:</STRONG><BR />
+		colspan="3"><strong>{--RALLYE_MIN_USERS_MINI--}:</strong><br />
 	$content[min_users]</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2" colspan="2">
-	<STRONG>{--RALLYE_MIN_PRICES_MINI--}:</STRONG><BR />
+	<strong>{--RALLYE_MIN_PRICES_MINI--}:</strong><br />
 	$content[min_prices]</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_rallyes_row2.tpl b/templates/de/html/admin/admin_list_rallyes_row2.tpl
index 95068b1a17..de6a6f3e1e 100644
--- a/templates/de/html/admin/admin_list_rallyes_row2.tpl
+++ b/templates/de/html/admin/admin_list_rallyes_row2.tpl
@@ -1,7 +1,7 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
-	$content[bold_l]<A
-		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[bold_r]
+	$content[bold_l]<a
+		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</a>$content[bold_r]
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 	$content[bold_l]$content[old]$content[bold_r]</TD>
diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl
index 5b8266b552..1e94f183b9 100644
--- a/templates/de/html/admin/admin_list_refs.tpl
+++ b/templates/de/html/admin/admin_list_refs.tpl
@@ -1,21 +1,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%" class="admin_table dashed">
 <TR>
 	<TD colspan="6" class="admin_title" height="30">
-		<STRONG>{--ADMIN_LIST_REFERRALS_1--}<U>$content[uid]</U>{--ADMIN_LIST_REFERRALS_2--}</STRONG>
+		<strong>{--ADMIN_LIST_REFERRALS_1--}<u>$content[uid]</u>{--ADMIN_LIST_REFERRALS_2--}</strong>
 	</TD>
 </TR>
 <TR>
-	<TD width="5%" align="center" class="admin_header bottom2 right2"><STRONG>{--_UID--}</STRONG></TD>
-	<TD width="5%" align="center" class="admin_header bottom2 right2"><STRONG>{--REFS_COUNT--}</STRONG></TD>
-	<TD width="35%" align="center" class="admin_header bottom2 right2"><STRONG>{--SURNAME_FAMILY--}</STRONG></TD>
-	<TD width="35%" align="center" class="admin_header bottom2 right2"><STRONG>{--ADDY--}</STRONG></TD>
-	<TD width="10%" align="center" class="admin_header bottom2 right2"><STRONG>{--ACCOUNT_STATUS--}</STRONG></TD>
-	<TD width="10%" align="center" class="admin_header bottom2"><STRONG>{--MEMBER_JOINED--}</STRONG></TD>
+	<TD width="5%" align="center" class="admin_header bottom2 right2"><strong>{--_UID--}</strong></TD>
+	<TD width="5%" align="center" class="admin_header bottom2 right2"><strong>{--REFS_COUNT--}</strong></TD>
+	<TD width="35%" align="center" class="admin_header bottom2 right2"><strong>{--SURNAME_FAMILY--}</strong></TD>
+	<TD width="35%" align="center" class="admin_header bottom2 right2"><strong>{--ADDY--}</strong></TD>
+	<TD width="10%" align="center" class="admin_header bottom2 right2"><strong>{--ACCOUNT_STATUS--}</strong></TD>
+	<TD width="10%" align="center" class="admin_header bottom2"><strong>{--MEMBER_JOINED--}</strong></TD>
 </TR>
 $content[rows]
 <TR>
 	<TD colspan="6" class="admin_footer" style="padding-top: 7px; padding-bottom: 7px">
-		<FONT class="admin_note">{--ADMIN_LIST_REFERRALS_NOTE--}</FONT>
+		<div class="admin_note">{--ADMIN_LIST_REFERRALS_NOTE--}</div>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl
index d1d06d2c91..9f01f0d153 100644
--- a/templates/de/html/admin/admin_list_refs2.tpl
+++ b/templates/de/html/admin/admin_list_refs2.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_LIST_REFERRALS_1--}<U>$content[uid]</U>{--ADMIN_LIST_REFERRALS_2--}</STRONG>
+		<strong>{--ADMIN_LIST_REFERRALS_1--}<u>$content[uid]</u>{--ADMIN_LIST_REFERRALS_2--}</strong>
 	</TD>
 </TR>
 <TR><TD class="seperator" height="6">&nbsp;</TD></TR>
@@ -9,7 +9,7 @@ $content[rows]
 <TR><TD class="seperator bottom2" height="1">&nbsp;</TD></TR>
 <TR>
 	<TD class="admin_footer" style="padding-top: 7px; padding-bottom: 7px">
-		<FONT class="admin_note">{--ADMIN_LIST_REFERRALS_NOTE--}</FONT>
+		<div class="admin_note">{--ADMIN_LIST_REFERRALS_NOTE--}</div>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl
index d8bd3dc8cd..b8583b433f 100644
--- a/templates/de/html/admin/admin_list_refs_level.tpl
+++ b/templates/de/html/admin/admin_list_refs_level.tpl
@@ -3,17 +3,17 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%" class="admin_table dashed">
 <TR>
 	<TD colspan="6" class="admin_title" height="30" align="center">
-		<STRONG>{--ADMIN_LIST_REFERRALS_LEVEL_1--}<U>$content[level]</U>{--ADMIN_LIST_REFERRALS_LEVEL_2--}</STRONG><br />
+		<strong>{--ADMIN_LIST_REFERRALS_LEVEL_1--}<u>$content[level]</u>{--ADMIN_LIST_REFERRALS_LEVEL_2--}</strong><br />
 		$content[info]
 	</TD>
 </TR>
 <TR>
-	<TD width="5%" align="center" class="admin_header bottom2 right2"><STRONG>{--_UID--}</STRONG></TD>
-	<TD width="5%" align="center" class="admin_header bottom2 right2"><STRONG>{--REFS_COUNT--}</STRONG></TD>
-	<TD width="35%" align="center" class="admin_header bottom2 right2"><STRONG>{--SURNAME_FAMILY--}</STRONG></TD>
-	<TD width="35%" align="center" class="admin_header bottom2 right2"><STRONG>{--ADDY--}</STRONG></TD>
-	<TD width="10%" align="center" class="admin_header bottom2 right2"><STRONG>{--ACCOUNT_STATUS--}</STRONG></TD>
-	<TD width="10%" align="center" class="admin_header bottom2"><STRONG>{--MEMBER_JOINED--}</STRONG></TD>
+	<TD width="5%" align="center" class="admin_header bottom2 right2"><strong>{--_UID--}</strong></TD>
+	<TD width="5%" align="center" class="admin_header bottom2 right2"><strong>{--REFS_COUNT--}</strong></TD>
+	<TD width="35%" align="center" class="admin_header bottom2 right2"><strong>{--SURNAME_FAMILY--}</strong></TD>
+	<TD width="35%" align="center" class="admin_header bottom2 right2"><strong>{--ADDY--}</strong></TD>
+	<TD width="10%" align="center" class="admin_header bottom2 right2"><strong>{--ACCOUNT_STATUS--}</strong></TD>
+	<TD width="10%" align="center" class="admin_header bottom2"><strong>{--MEMBER_JOINED--}</strong></TD>
 </TR>
 $content[rows]
 <TR>
diff --git a/templates/de/html/admin/admin_list_refs_norefs.tpl b/templates/de/html/admin/admin_list_refs_norefs.tpl
index c95b7713ae..920e411c5d 100644
--- a/templates/de/html/admin/admin_list_refs_norefs.tpl
+++ b/templates/de/html/admin/admin_list_refs_norefs.tpl
@@ -1,5 +1,5 @@
 <TR>
 	<TD colspan="6" class="admin_title bottom2" height="20">
-		<STRONG>{--ADMIN_LIST_USER_NOREFS_1--}<U>$content[uid]</U>{--ADMIN_LIST_USER_NOREFS_2--}</STRONG>
+		<strong>{--ADMIN_LIST_USER_NOREFS_1--}<u>$content[uid]</u>{--ADMIN_LIST_USER_NOREFS_2--}</strong>
 	</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_sponsor.tpl b/templates/de/html/admin/admin_list_sponsor.tpl
index 803a363591..cbac6e9999 100644
--- a/templates/de/html/admin/admin_list_sponsor.tpl
+++ b/templates/de/html/admin/admin_list_sponsor.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <TR>
   <TD colspan="4" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_LIST_SPONSOR_ACCOUNTS--}</STRONG>
+    <strong>{--ADMIN_LIST_SPONSOR_ACCOUNTS--}</strong>
   </TD>
 </TR>
 {!__SPONSOR_ROWS!}
 <TR>
   <TD colspan="4" class="admin_footer" style="padding: 5px">
-    <FONT class="admin_notes tiny">{--ADMIN_LIST_SPONSOR_NOTES--}</FONT>
+    <div class="admin_notes tiny">{--ADMIN_LIST_SPONSOR_NOTES--}</div>
   </TD>
 </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl
index 60df811cf7..d7bb74dd5a 100644
--- a/templates/de/html/admin/admin_list_sponsor_details.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_details.tpl
@@ -1,16 +1,16 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center" width="520">
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30" style="padding: 5px">
-    <STRONG class="big">{--ADMIN_SPONSOR_DETAILS--}:</STRONG>
+    <div class="big">{--ADMIN_SPONSOR_DETAILS--}:</STRONG>
   </TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2" height="25">{--SPONSOR_ID--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{!__SPONSOR_ID!} [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{!__SPONSOR_STATUS!}</A></STRONG>&nbsp;]</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_ID!} [&nbsp;<strong><a href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{!__SPONSOR_STATUS!}</a></strong>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_COMPANY_DATA--}:</STRONG>
+    <strong>{--ADMIN_SPONSOR_COMPANY_DATA--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -27,7 +27,7 @@
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_PERSONA_DATA--}:</STRONG>
+    <strong>{--ADMIN_SPONSOR_PERSONA_DATA--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -60,71 +60,71 @@
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_EMAIL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;<A href="{!__SPONSOR_EMAIL!}">{!__SPONSOR_EMAIL_VALUE!}</A>&nbsp;</TD>
+  <TD class="bottom2">&nbsp;<a href="{!__SPONSOR_EMAIL!}">{!__SPONSOR_EMAIL_VALUE!}</a>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_URL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;[&nbsp;<A href="{!__SPONSOR_URL!}" target="_blank"><STRONG>{--ADMIN_TEST_URL--}</STRONG></A>&nbsp;]&nbsp;</TD>
+  <TD class="bottom2">&nbsp;[&nbsp;<a href="{!__SPONSOR_URL!}" target="_blank"><strong>{--ADMIN_TEST_URL--}</strong></a>&nbsp;]&nbsp;</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_WARNINGS_POINTS--}:</STRONG>
+    <strong>{--ADMIN_SPONSOR_WARNINGS_POINTS--}:</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_RECEIVE_WARNINGS_SHORT--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_RECEIVE_WARNINGS_SHORT--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_REC_WARNING!}</TD>
 <TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_WARNING_INTERVAL_SHORT--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_WARNING_INTERVAL_SHORT--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_INTERVAL!}</TD>
 <TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_AMOUNT--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><STRONG>{!__SPONSOR_AMOUNT!}</STRONG></A>&nbsp;]</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_AMOUNT--}:</strong>&nbsp;</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><strong>{!__SPONSOR_AMOUNT!}</strong></a>&nbsp;]</TD>
 <TR>
 </TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_USED--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><STRONG>{!__SPONSOR_USED!}</STRONG></A>&nbsp;]</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_USED--}:</strong>&nbsp;</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><strong>{!__SPONSOR_USED!}</strong></a>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_OTHER_DETAILS--}:</STRONG>
+    <strong>{--ADMIN_SPONSOR_OTHER_DETAILS--}:</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_CREATED--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_CREATED--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_CREATED!}</TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--ADMIN_LAST_ONLINE--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--ADMIN_LAST_ONLINE--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_LAST_ONLINE!}</TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--ADMIN_LAST_CHANGE--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--ADMIN_LAST_CHANGE--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_LAST_CHANGE!}</TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--REMOTE_IP--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--REMOTE_IP--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_REMOTE_ADR!}</TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_REFID--}:</STRONG>&nbsp;</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_REFID--}:</strong>&nbsp;</TD>
   <TD align="center" class="bottom2">{!__SPONSOR_REFID!}</TD>
 </TR>
 <TR>
-  <TD align="right" class="bottom2 right2">{--SPONSOR_REFERRALS--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={!__SPONSOR_ID!}"><STRONG>{!__SPONSOR_REFS!}</STRONG></A>&nbsp;]</TD>
+  <TD align="right" class="bottom2 right2">{--SPONSOR_REFERRALS--}:</strong>&nbsp;</TD>
+  <TD align="center" class="bottom2">[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={!__SPONSOR_ID!}"><strong>{!__SPONSOR_REFS!}</strong></a>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" class="admin_footer" style="padding: 5px">
-    <DIV align="center"><STRONG>{--ADMIN_SPONSOR_ACTIONS--}:</STRONG></DIV>
-    <UL>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit">{--ADMIN_SPONSOR_EDIT--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_DEL--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_LOCK--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={!__SPONSOR_ID!}">{--ADMIN_LIST_SPONSOR_ORDERS--}</A>&nbsp;] (<STRONG>{!__SPONSOR_ORDERS!}</STRONG>)</LI>
-    </UL>
+    <div align="center"><strong>{--ADMIN_SPONSOR_ACTIONS--}:</strong></div>
+    <ul>
+      <li>&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit">{--ADMIN_SPONSOR_EDIT--}</a>&nbsp;]</li>
+      <li>&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_DEL--}</a>&nbsp;]</li>
+      <li>&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_LOCK--}</a>&nbsp;]</li>
+      <li>&nbsp;[&nbsp;<a href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={!__SPONSOR_ID!}">{--ADMIN_LIST_SPONSOR_ORDERS--}</a>&nbsp;] (<strong>{!__SPONSOR_ORDERS!}</strong>)</li>
+    </ul>
   </TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_list_sponsor_pay.tpl b/templates/de/html/admin/admin_list_sponsor_pay.tpl
index da0996f8ad..2d022d8e45 100644
--- a/templates/de/html/admin/admin_list_sponsor_pay.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="640" class="admin_table dashed" align="center">
 <TR>
   <TD colspan="5" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--SPONSOR_LIST_PAYMENT_TYPES_TITLE--}</STRONG>
+    <strong>{--SPONSOR_LIST_PAYMENT_TYPES_TITLE--}</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2" width="160"><STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--SPONSOR_PAYTYPE_NAME--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_RATE--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2" width="160"><strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong></TD>
 </TR>
 {!__LIST_ROWS!}
 <TR>
@@ -21,4 +21,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_404.tpl b/templates/de/html/admin/admin_list_sponsor_pay_404.tpl
index 801c7874b7..65483e1133 100644
--- a/templates/de/html/admin/admin_list_sponsor_pay_404.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_404.tpl
@@ -1,5 +1,5 @@
 <TR>
   <TD colspan="5" align="center" class="switch_sw$content[sw] bottom2">
-    <STRONG>{--ENTRY_404_1--}$content{--ENTRY_404_2--}</STRONG>
+    <strong>{--ENTRY_404_1--}$content{--ENTRY_404_2--}</strong>
   </TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
index 6526b4f88e..26daee944f 100644
--- a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
@@ -1,17 +1,17 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST" target="_self">
+<div align="center">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="640">
 <TR>
   <TD align="center" colspan="5" class="admin_header bottom2" height="40">
-    <STRONG>{--SPONSOR_DELETE_PAY_ENTRIES--}</STRONG>
+    <strong>{--SPONSOR_DELETE_PAY_ENTRIES--}</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2" width="160"><STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--SPONSOR_PAYTYPE_NAME--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_RATE--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2" width="160"><strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong></TD>
 </TR>
 {!__SPONSOR_ROWS!}
 <TR>
@@ -21,5 +21,5 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
index d9c3683875..5a96fc3581 100644
--- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
@@ -1,17 +1,17 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST" target="_self">
+<div align="center">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pay" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="640">
 <TR>
   <TD align="center" colspan="5" class="admin_header bottom2" height="40">
-    <STRONG>{--SPONSOR_EDIT_PAY_ENTRIES--}</STRONG>
+    <strong>{--SPONSOR_EDIT_PAY_ENTRIES--}</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="center" class="admin_title bottom2 right2" width="20"><STRONG>{--ID_SELECT--}</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="160"><STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2" width="150"><STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2" width="160"><STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="20"><strong>{--ID_SELECT--}</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="160"><strong>{--SPONSOR_PAYTYPE_NAME--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_RATE--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2" width="150"><strong>{--SPONSOR_PAYTYPE_MIN_COUNT2--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2" width="160"><strong>{--SPONSOR_PAYTYPE_CURRENCY--}:</strong></TD>
 </TR>
 {!__SPONSOR_ROWS!}
 <TR>
@@ -21,5 +21,5 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl
index 438c7e507f..556f25f399 100644
--- a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl
@@ -1,6 +1,6 @@
 <TR>
   <TD class="switch_sw$content[sw] bottom2 right2" align="center" height="29">
-    <STRONG>$content[id]</STRONG>
+    <strong>$content[id]</strong>
     <INPUT type="hidden" name="id[$content[id]]" class="admin_normal" value="1">
   </TD>
   <TD class="switch_sw$content[sw] bottom2 right2">
diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl
index 41618d5652..b6d33dd704 100644
--- a/templates/de/html/admin/admin_list_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_row.tpl
@@ -1,30 +1,30 @@
 <TR>
-  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100"><STRONG>{--ID_SELECT--}</STRONG></TD>
-  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2"><STRONG>{--SURNAME_FAMILY--}:</STRONG></TD>
-  <TD align="center" class="switch_sw$content[sw] bottom2" width="160"><STRONG>{--SPONSOR_POINTS_LEFT--}:</STRONG></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100"><strong>{--ID_SELECT--}</strong></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2"><strong>{--SURNAME_FAMILY--}:</strong></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2" width="160"><strong>{--SPONSOR_POINTS_LEFT--}:</strong></TD>
 </TR>
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100">
-    [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</A></STRONG>&nbsp;]
+    [&nbsp;<strong><a href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</a></strong>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2">
-    <A href="$content[email]">$content[gender] $content[sname] $content[fname]</A>
+    <a href="$content[email]">$content[gender] $content[sname] $content[fname]</a>
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2" width="160">
-    [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</A></STRONG>&nbsp;]
+    [&nbsp;<strong><a href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</a></strong>&nbsp;]
   </TD>
 </TR>
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100">
-    <STRONG>{--_STATUS--}</STRONG>:
+    <strong>{--_STATUS--}</strong>:
   </TD>
-  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="160"><STRONG>{--SPONSOR_CREATED--}:</STRONG></TD>
-  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="160"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG></TD>
-  <TD align="center" class="switch_sw$content[sw] bottom2" width="160"><STRONG>{--REMOTE_IP--}:</STRONG></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="160"><strong>{--SPONSOR_CREATED--}:</strong></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="160"><strong>{--ADMIN_LAST_ONLINE--}:</strong></TD>
+  <TD align="center" class="switch_sw$content[sw] bottom2" width="160"><strong>{--REMOTE_IP--}:</strong></TD>
 </TR>
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100">
-    [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]">$content[status]</A></STRONG>&nbsp;]
+    [&nbsp;<strong><a href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]">$content[status]</a></strong>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="120">
     $content[created]
diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl
index 4f7d4ed00c..a54aa33429 100644
--- a/templates/de/html/admin/admin_list_task_ext_rows.tpl
+++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl
@@ -6,7 +6,7 @@
 		$content[admin]
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
-		<A title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</A>
+		<a title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 		$content[infos]
diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl
index e860779f04..e281f392c9 100644
--- a/templates/de/html/admin/admin_list_transfer.tpl
+++ b/templates/de/html/admin/admin_list_transfer.tpl
@@ -1,22 +1,22 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=del_transfer" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=del_transfer" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="admin_table dashed">
 	<TR>
 		<TD colspan="6" align="center" class="admin_title2 bottom2" height="30">
-			<STRONG>{!__TRANSFER_TITLE!}</STRONG>
+			<strong>{!__TRANSFER_TITLE!}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD width="80" align="center" class="admin_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_ID--}</STRONG></TD>
+		<strong>{--TRANSFER_ID--}</strong></TD>
 		<TD width="120" align="center" class="admin_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_STAMP--}</STRONG></TD>
+		<strong>{--TRANSFER_STAMP--}</strong></TD>
 		<TD width="120" align="center" class="admin_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_FROM_UID--}</STRONG></TD>
+		<strong>{--TRANSFER_FROM_UID--}</strong></TD>
 		<TD width="120" align="center" class="admin_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_TO_UID--}</STRONG></TD>
+		<strong>{--TRANSFER_TO_UID--}</strong></TD>
 		<TD width="230" align="center" class="admin_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_POINTS_REASON--}</STRONG></TD>
-		<TD width="70" align="center" class="admin_title2 bottom2"><STRONG>{!POINTS!}</STRONG>
+		<strong>{--TRANSFER_POINTS_REASON--}</strong></TD>
+		<TD width="70" align="center" class="admin_title2 bottom2"><strong>{!POINTS!}</strong>
 		</TD>
 	</TR>
 	{!__TRANSFER_ROWS!}
@@ -26,4 +26,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_list_transfer_row.tpl b/templates/de/html/admin/admin_list_transfer_row.tpl
index 7f977967e4..f24662976f 100644
--- a/templates/de/html/admin/admin_list_transfer_row.tpl
+++ b/templates/de/html/admin/admin_list_transfer_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><STRONG>$content[idx]</STRONG>
+	<TD class="switch_sw$content[sw] bottom2 right2" align="center"><strong>$content[idx]</strong>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[stamp]</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[from_link]</TD>
diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl
index f4984095f5..82c1a4948d 100644
--- a/templates/de/html/admin/admin_list_unconfirmed.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed.tpl
@@ -1,27 +1,26 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="admin_table dashed">
 <TR>
 	<TD width="260" align="center" class="bottom2 right2">
-	{--EMAIL_SENDER--}:<BR />
-	<STRONG><A
-		href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__LIST_UNCON_SENDER!}">{!__LIST_UNCON_SENDER!}</A></STRONG>
+	{--EMAIL_SENDER--}:<br />
+	<strong><a href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__LIST_UNCON_SENDER!}">{!__LIST_UNCON_SENDER!}</a></strong>
 	</TD>
 	<TD width="260" align="center" class="bottom2">
-	{--EMAIL_SUBJECT--}:<BR />
-	<STRONG>{!__LIST_UNCON_SUBJECT!}</STRONG></TD>
+	{--EMAIL_SUBJECT--}:<br />
+	<strong>{!__LIST_UNCON_SUBJECT!}</strong></TD>
 </TR>
 <TR>
-	<TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<BR />
-	<STRONG><A
+	<TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<br />
+	<strong><a
 		href="{!URL!}/modules.php?module=frametester&amp;url={!__LIST_UNCON_URL!}"
-		target="_blank">{--ADMIN_TEST_URL--}</A></STRONG></TD>
-	<TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<BR />
-	<STRONG>{!__LIST_UNCON_STAMP!}</STRONG></TD>
+		target="_blank">{--ADMIN_TEST_URL--}</a></strong></TD>
+	<TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<br />
+	<strong>{!__LIST_UNCON_STAMP!}</strong></TD>
 </TR>
 <TR>
-	<TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<BR />
-	<STRONG>{!__LIST_UNCON_TEXT!}</STRONG></TD>
-	<TD align="center" class="bottom2">{--USERS_LINKS--}:<BR />
-	<STRONG>{!__LIST_UNCO_UNCONFIRMED!}</STRONG></TD>
+	<TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<br />
+	<strong>{!__LIST_UNCON_TEXT!}</strong></TD>
+	<TD align="center" class="bottom2">{--USERS_LINKS--}:<br />
+	<strong>{!__LIST_UNCO_UNCONFIRMED!}</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" height="5" class="seperator">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_list_unconfirmed_header.tpl b/templates/de/html/admin/admin_list_unconfirmed_header.tpl
index 49c86e64be..d725883cdb 100644
--- a/templates/de/html/admin/admin_list_unconfirmed_header.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed_header.tpl
@@ -2,8 +2,8 @@
 	class="admin_table">
 	<TR>
 		<TD width="10%" align="center" class="admin_title bottom2 top2 right2"
-			height="26"><STRONG>{--ID_SELECT--}</TD>
-		<TD width="10%" align="center" class="admin_title bottom2 top2 right2"><STRONG>{--MAILID_LINK--}</TD>
-		<TD width="45%" align="center" class="admin_title bottom2 top2 right2"><STRONG>{--SURNAME_FAMILY--}</TD>
-		<TD width="35%" align="center" class="admin_title bottom2 top2"><STRONG>{--ACCOUNT_STATUS--}</TD>
+			height="26"><strong>{--ID_SELECT--}</TD>
+		<TD width="10%" align="center" class="admin_title bottom2 top2 right2"><strong>{--MAILID_LINK--}</TD>
+		<TD width="45%" align="center" class="admin_title bottom2 top2 right2"><strong>{--SURNAME_FAMILY--}</TD>
+		<TD width="35%" align="center" class="admin_title bottom2 top2"><strong>{--ACCOUNT_STATUS--}</TD>
 	</TR>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_list_unconfirmed_row.tpl b/templates/de/html/admin/admin_list_unconfirmed_row.tpl
index d467474255..c0898cc293 100644
--- a/templates/de/html/admin/admin_list_unconfirmed_row.tpl
+++ b/templates/de/html/admin/admin_list_unconfirmed_row.tpl
@@ -1,8 +1,8 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[u_link]</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><A
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><a
 		href="{!URL!}/mailid.php?uid=$content[uid]&amp;$content[link]=$content[id]"
-		target="_blank">{--CLICK_NOW--}</A></TD>
+		target="_blank">{--CLICK_NOW--}</a></TD>
 	<TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[email]</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2">$content[status]</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_list_user.tpl b/templates/de/html/admin/admin_list_user.tpl
index 1acc3841ef..42854d7a8e 100644
--- a/templates/de/html/admin/admin_list_user.tpl
+++ b/templates/de/html/admin/admin_list_user.tpl
@@ -2,7 +2,7 @@
 	align="center" class="admin_table dashed">
 	<TR>
 		<TD class="admin_header bottom2" colspan="{!__COLSPAN2!}" height="30" align="center">
-			<STRONG>{!__TITLE!}:</STRONG>
+			<strong>{!__TITLE!}:</strong>
 		</TD>
 	</TR>
 	{!__ALPHA_SORT!}
diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl
index a9b8cbb854..438652b3a4 100644
--- a/templates/de/html/admin/admin_list_user_row.tpl
+++ b/templates/de/html/admin/admin_list_user_row.tpl
@@ -1,10 +1,10 @@
 <TR>
 	<TD width="5" class="switch_sw$content[sw] top2 seperator">&nbsp;</TD>
-	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><STRONG>{--_UID--}:</STRONG></TD>
-	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><STRONG>{--GENDER--}:</STRONG></TD>
-	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><STRONG>{--SURNAME--}:</STRONG></TD>
-	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><STRONG>{--FAMILY_NAME--}:</STRONG></TD>
-	<TD width="20%" align="center" class="switch_sw$content[sw] top2"><STRONG>{--USER_NICKNAME--}:</STRONG></TD>
+	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><strong>{--_UID--}:</strong></TD>
+	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><strong>{--GENDER--}:</strong></TD>
+	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><strong>{--SURNAME--}:</strong></TD>
+	<TD width="20%" align="center" class="right2 top2 switch_sw$content[sw]"><strong>{--FAMILY_NAME--}:</strong></TD>
+	<TD width="20%" align="center" class="switch_sw$content[sw] top2"><strong>{--USER_NICKNAME--}:</strong></TD>
 </TR>
 <TR>
 	<TD width="5" class="switch_sw$content[sw] seperator bottom2">&nbsp;</TD>
@@ -16,11 +16,11 @@
 </TR>
 <TR>
 	<TD width="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--ADDY--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--REMOTE_IP--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--REF_UID--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--ACCOUNT_STATUS--}:</STRONG></TD>
-	<TD align="center" class="switch_sw$content[sw]"><STRONG>{--UNCONFIRMED_LINKS--}:</STRONG></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--ADDY--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--REMOTE_IP--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--REF_UID--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--ACCOUNT_STATUS--}:</strong></TD>
+	<TD align="center" class="switch_sw$content[sw]"><strong>{--UNCONFIRMED_LINKS--}:</strong></TD>
 </TR>
 <TR>
 	<TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
@@ -32,11 +32,11 @@
 </TR>
 <TR>
 	<TD width="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--TOTAL_POINTS--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--MAILS_SENT--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--CLICK_RATE--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--POINTS_LOCKED--}:</STRONG></TD>
-	<TD align="center" class="switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--TOTAL_POINTS--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--MAILS_SENT--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--CLICK_RATE--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--POINTS_LOCKED--}:</strong></TD>
+	<TD align="center" class="switch_sw$content[sw]"><strong>{--__UNUSED--}:</strong></TD>
 </TR>
 <TR>
 	<TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
@@ -48,11 +48,11 @@
 </TR>
 <TR>
 	<TD width="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--LOCK_REASON--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--LOCK_TIMESTAMP--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
-	<TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
-	<TD align="center" class="switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--LOCK_REASON--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--LOCK_TIMESTAMP--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--__UNUSED--}:</strong></TD>
+	<TD align="center" class="right2 switch_sw$content[sw]"><strong>{--__UNUSED--}:</strong></TD>
+	<TD align="center" class="switch_sw$content[sw]"><strong>{--__UNUSED--}:</strong></TD>
 </TR>
 <TR>
 	<TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_list_user_sort.tpl b/templates/de/html/admin/admin_list_user_sort.tpl
index 5c72f8c3e3..21ac15c780 100644
--- a/templates/de/html/admin/admin_list_user_sort.tpl
+++ b/templates/de/html/admin/admin_list_user_sort.tpl
@@ -2,7 +2,7 @@
 	<TD class="bottom2" colspan="{!__COLSPAN2!}" align="center">
 	<TABLE border="0" cellspacing="0" cellpadding="0" width="520">
 		<TR>
-			<TD class="admin_sortlinks">{--SORT_BY--}&nbsp;<STRONG>[</STRONG>&nbsp;{!__SORT_LIST!}&nbsp;<STRONG>]</STRONG>
+			<TD class="admin_sortlinks">{--SORT_BY--}&nbsp;<strong>[</strong>&nbsp;{!__SORT_LIST!}&nbsp;<strong>]</strong>
 			</TD>
 		</TR>
 	</TABLE>
diff --git a/templates/de/html/admin/admin_list_user_sort_form.tpl b/templates/de/html/admin/admin_list_user_sort_form.tpl
index 98fb3d5848..b388f37bec 100644
--- a/templates/de/html/admin/admin_list_user_sort_form.tpl
+++ b/templates/de/html/admin/admin_list_user_sort_form.tpl
@@ -3,8 +3,8 @@
 	<TABLE border="0" cellspacing="0" cellpadding="0" width="520">
 		<TR>
 			<TD align="center">&nbsp; <!--
-        <FORM action="{!URL!}/modules.php?module=admin&amp;what=list_user" method="POST" style="margin-bottom: 0px">
-        </FORM>
+        <form action="{!URL!}/modules.php?module=admin&amp;what=list_user" method="POST" style="margin-bottom: 0px">
+        </form>
 	   //--></TD>
 		</TR>
 	</TABLE>
diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl
index f2c2a5ce53..f535809cfa 100644
--- a/templates/de/html/admin/admin_list_wernis_main.tpl
+++ b/templates/de/html/admin/admin_list_wernis_main.tpl
@@ -1,13 +1,13 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%" class="admin_table dashed">
 <TR>
-	<TD class="admin_header bottom2 right2" align="center" width="60"><STRONG>{--ID_SELECT--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="90"><STRONG>{--_UID--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center"><STRONG>{--WERNIS_ADMIN_WDS66_ACCOUNT--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center"><STRONG>{--WERNIS_ADMIN_TRANSFERED--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--WERNIS_ADMIN_TIMESTAMP--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--WERNIS_ADMIN_TYPE--}</STRONG></TD>
-	<TD class="admin_header bottom2 right2" align="center" width="160"><STRONG>{--WERNIS_ADMIN_API_MESSAGE--}</STRONG></TD>
-	<TD class="admin_header bottom2" align="center" width="160"><STRONG>{--WERNIS_ADMIN_API_STATUS--}</STRONG></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="60"><strong>{--ID_SELECT--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="90"><strong>{--_UID--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center"><strong>{--WERNIS_ADMIN_WDS66_ACCOUNT--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center"><strong>{--WERNIS_ADMIN_TRANSFERED--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--WERNIS_ADMIN_TIMESTAMP--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--WERNIS_ADMIN_TYPE--}</strong></TD>
+	<TD class="admin_header bottom2 right2" align="center" width="160"><strong>{--WERNIS_ADMIN_API_MESSAGE--}</strong></TD>
+	<TD class="admin_header bottom2" align="center" width="160"><strong>{--WERNIS_ADMIN_API_STATUS--}</strong></TD>
 </TR>
 $content
 <TR>
diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl
index 4c442dc458..85f711a3f3 100644
--- a/templates/de/html/admin/admin_lock_sponsor.tpl
+++ b/templates/de/html/admin/admin_lock_sponsor.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__ID!}" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR>
   <TD align="center" class="admin_title bottom2">
-    <STRONG class="admin_done">{!__HEADER_MESSAGE!}</STRONG>
+    <div class="admin_done">{!__HEADER_MESSAGE!}</STRONG>
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
@@ -20,7 +20,7 @@
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
   <TD align="center">
-    <TEXTAREA name="reason" class="admin_normal" rows="5" cols="50"></TEXTAREA>
+    <textarea name="reason" class="admin_normal" rows="5" cols="50"></textarea>
   </TD>
 </TR>
 <TR><TD height="5" class="seperator bottom2">&nbsp;</TD></TR>
@@ -31,4 +31,4 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl
index 6e58ed8b63..521d053eb3 100644
--- a/templates/de/html/admin/admin_lock_user.tpl
+++ b/templates/de/html/admin/admin_lock_user.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=lock_user&amp;u_id={!__UID!}"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2"><STRONG
-			class="admin_done">{!__HEADER_VALUE!}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2"><strong
+			class="admin_done">{!__HEADER_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
@@ -17,15 +17,15 @@
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">[&nbsp;<A href="{!__EMAIL!}">{!__SNAME!}
-		{!__FNAME!}</A>&nbsp;]</TD>
+		<TD align="center">[&nbsp;<a href="{!__EMAIL!}">{!__SNAME!}
+		{!__FNAME!}</a>&nbsp;]</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center"><TEXTAREA name="reason" class="admin_normal"
-			rows="5" cols="50"></TEXTAREA></TD>
+		<TD align="center"><textarea name="reason" class="admin_normal"
+			rows="5" cols="50"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator bottom2">&nbsp;</TD>
@@ -37,4 +37,4 @@
 			value="{--YES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl
index c369a05a77..66c2bf2596 100644
--- a/templates/de/html/admin/admin_login_form.tpl
+++ b/templates/de/html/admin/admin_login_form.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;$content[target]=$content[value]"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
@@ -7,7 +7,7 @@
 		<TD colspan="2" height="14" class="admin_title seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD colspan="2" align="center" class="admin_title"><STRONG>{--ADMIN_LOGIN_NOW--}</STRONG>
+		<TD colspan="2" align="center" class="admin_title"><strong>{--ADMIN_LOGIN_NOW--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -29,7 +29,7 @@
 		<TD width="50%" valign="top" align="right">{--ENTER_ADMIN_PASS--}:&nbsp;&nbsp;</TD>
 		<TD width="50%" valign="top">
 			<INPUT type="password" name="pass" size="10" maxlength="100" class="admin_normal" />
-			<DIV class="admin_note">[<A href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASSWORD--}</A>]</DIV>
+			<div class="admin_note">[<a href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASSWORD--}</a>]</div>
 		</TD>
 	</TR>
 	{!__MSG_PASS!}
@@ -38,16 +38,16 @@
 	</TR>
 	<TR>
 		<TD width="50%" align="right">{--SELECT_TIMEOUT--}:&nbsp;&nbsp;</TD>
-		<TD width="50%"><SELECT name="timeout" size="1" class="admin_select">
-			<OPTION value="86400">{--TIMEOUT_ONE_DAY--}</OPTION>
-			<OPTION value="172800">{--TIMEOUT_TWO_DAYS--}</OPTION>
-			<OPTION value="259200">{--TIMEOUT_THREE_DAYS--}</OPTION>
-			<OPTION value="604800">{--TIMEOUT_ONE_WEEK--}</OPTION>
-			<OPTION value="1209600">{--TIMEOUT_TWO_WEEKS--}</OPTION>
-			<OPTION value="2592000">{--TIMEOUT_ONE_MONTH--}</OPTION>
-			<OPTION value="15984000">{--TIMEOUT_HALF_YEAR--}</OPTION>
-			<OPTION value="31536000" selected>{--TIMEOUT_FULL_YEAR--}</OPTION>
-		</SELECT></TD>
+		<TD width="50%"><select name="timeout" size="1" class="admin_select">
+			<option value="86400">{--TIMEOUT_ONE_DAY--}</option>
+			<option value="172800">{--TIMEOUT_TWO_DAYS--}</option>
+			<option value="259200">{--TIMEOUT_THREE_DAYS--}</option>
+			<option value="604800">{--TIMEOUT_ONE_WEEK--}</option>
+			<option value="1209600">{--TIMEOUT_TWO_WEEKS--}</option>
+			<option value="2592000">{--TIMEOUT_ONE_MONTH--}</option>
+			<option value="15984000">{--TIMEOUT_HALF_YEAR--}</option>
+			<option value="31536000" selected>{--TIMEOUT_FULL_YEAR--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
@@ -63,4 +63,4 @@
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_login_msg.tpl b/templates/de/html/admin/admin_login_msg.tpl
index aaa894e4ab..ed7fb8f635 100644
--- a/templates/de/html/admin/admin_login_msg.tpl
+++ b/templates/de/html/admin/admin_login_msg.tpl
@@ -1,4 +1,4 @@
 <TR>
-	<TD colspan="2" class="admin_error" align="center"><STRONG>$content</STRONG>
+	<TD colspan="2" class="admin_error" align="center"><strong>$content</strong>
 	</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_logout.tpl b/templates/de/html/admin/admin_logout.tpl
index 2bc9ba4a3f..724e62794c 100644
--- a/templates/de/html/admin/admin_logout.tpl
+++ b/templates/de/html/admin/admin_logout.tpl
@@ -1,19 +1,19 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_DONE--}</STRONG><BR />
-		<BR />
-		<A class="admin_content"
-			href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
-		<BR />
-		<A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
+		<TD align="center" class="admin_content"><strong>{--ADMIN_LOGOUT_DONE--}</strong><br />
+		<br />
+		<a class="admin_content"
+			href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</a><br />
+		<br />
+		<a class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</a><br />
 		</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_logout_form.tpl b/templates/de/html/admin/admin_logout_form.tpl
index 501d3b9a02..e76999db1d 100644
--- a/templates/de/html/admin/admin_logout_form.tpl
+++ b/templates/de/html/admin/admin_logout_form.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;action=logout"
+<form action="{!URL!}/modules.php?module=admin&amp;action=logout"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="370">
 	<TR>
-		<TD align="center" class="admin_title bottom2" height="30"><STRONG>{--ADMIN_LOGOUT_NOW--}</STRONG>
+		<TD align="center" class="admin_title bottom2" height="30"><strong>{--ADMIN_LOGOUT_NOW--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -29,4 +29,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_logout_sql_patches_install.tpl b/templates/de/html/admin/admin_logout_sql_patches_install.tpl
index 1c4c067e28..a485602f68 100644
--- a/templates/de/html/admin/admin_logout_sql_patches_install.tpl
+++ b/templates/de/html/admin/admin_logout_sql_patches_install.tpl
@@ -1,18 +1,18 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR />
-		<BR />
-		<A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
-		<BR />
-		<A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
+		<TD align="center" class="admin_content"><strong>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</strong><br />
+		<br />
+		<a class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</a><br />
+		<br />
+		<a class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</a><br />
 		</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl
index bfb68a2b83..b343d8ddb8 100644
--- a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl
+++ b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl
@@ -1,17 +1,17 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD align="center" class="admin_content">
-			<STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}</STRONG><BR />
-			<BR />
-			<A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASS_LINK--}</A>
+			<strong>{--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}</strong><br />
+			<br />
+			<a class="admin_content" href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASS_LINK--}</a>
 		</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_maintenance_form.tpl b/templates/de/html/admin/admin_maintenance_form.tpl
index bc685b6912..e8ca2ba858 100644
--- a/templates/de/html/admin/admin_maintenance_form.tpl
+++ b/templates/de/html/admin/admin_maintenance_form.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=maintenance"
+<form action="{!URL!}/modules.php?module=admin&amp;what=maintenance"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="380"
 	class="admin_table dashed" align="center">
@@ -21,4 +21,4 @@
 			value="{--ADMIN_CHANGE_MAINTENANCE_MODE--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl
index 244eeafdd4..478f423a2d 100644
--- a/templates/de/html/admin/admin_member_add.tpl
+++ b/templates/de/html/admin/admin_member_add.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=mem_add" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=mem_add" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 	<TR>
 		<TD height="8" colspan="5"></TD>
@@ -19,8 +19,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_WHAT_NAME--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table">{!__WHAT_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
+		<TD align="center" class="admin_table">{!__WHAT_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_WHAT_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -30,8 +30,8 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--SELECT_PARENT_MENU--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table">{!__ACTION_SELECTION!} <BR />
-		<SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
+		<TD align="center" class="admin_table">{!__ACTION_SELECTION!}<br />
+		<span class="admin_note">({--CREATE_ACTION_FIRST--})</span></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -51,11 +51,11 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--MENU_IS_VISIBLE--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table"><SELECT
+		<TD align="center" class="admin_table"><select
 			class="admin_select" name="visible" size="1">
-			<OPTION value="Y">{--YES--}</OPTION>
-			<OPTION value="N">{--NO--}</OPTION>
-		</SELECT></TD>
+			<option value="Y">{--YES--}</option>
+			<option value="N">{--NO--}</option>
+		</select></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -65,11 +65,11 @@
 		<TD width="10">&nbsp;</TD>
 		<TD align="right">{--MENU_IS_ACTIVE--}:</TD>
 		<TD width="10">&nbsp;</TD>
-		<TD align="center" class="admin_table"><SELECT
+		<TD align="center" class="admin_table"><select
 			class="admin_select" name="active" size="1">
-			<OPTION value="N">{--YES--}</OPTION>
-			<OPTION value="Y">{--NO--}</OPTION>
-		</SELECT></TD>
+			<option value="N">{--YES--}</option>
+			<option value="Y">{--NO--}</option>
+		</select></TD>
 		<TD width="10">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -91,4 +91,4 @@
 		<TD class="admin_table" height="8" colspan="5"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl
index ff85429015..bfe53acb1d 100644
--- a/templates/de/html/admin/admin_member_selection_box.tpl
+++ b/templates/de/html/admin/admin_member_selection_box.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php" method="GET">
+<form action="{!URL!}/modules.php" method="GET">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 	<TR>
 		<TD class="admin_title bottom2" height="25">
@@ -13,9 +13,9 @@
 			<INPUT type="hidden" name="module" value="admin" />
 			<INPUT type="hidden" name="what" value="$content" />
 			{--ADMIN_SELECT_USER--}:
-			<SELECT name="u_id" size="1" class="admin_select">
+			<select name="u_id" size="1" class="admin_select">
 				{!_MEMBER_SELECTION!}
-			</SELECT>
+			</select>
 		</TD>
 	</TR>
 	<TR>
@@ -31,4 +31,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_menu_404_row.tpl b/templates/de/html/admin/admin_menu_404_row.tpl
index 9f7545443e..46e2d0fcef 100644
--- a/templates/de/html/admin/admin_menu_404_row.tpl
+++ b/templates/de/html/admin/admin_menu_404_row.tpl
@@ -1,5 +1,5 @@
 <TR>
 	<TD colspan="2" align="center"
-		class="error fatal switch_sw$content[sw]"><STRONG>{--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--}</STRONG>
+		class="error fatal switch_sw$content[sw]"><strong>{--ENTRY_404_1--}$content[sel]{--ENTRY_404_2--}</strong>
 	</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_menu_failed.tpl b/templates/de/html/admin/admin_menu_failed.tpl
index 015ea69ea1..58bdf3d1ea 100644
--- a/templates/de/html/admin/admin_menu_failed.tpl
+++ b/templates/de/html/admin/admin_menu_failed.tpl
@@ -1,16 +1,16 @@
-<BR />
-<BR />
+<br />
+<br />
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="420" class="admin_table dashed">
 	<TR>
-		<TD align="center" height="40" class="admin_header bottom2"><STRONG>{--ADMIN_MENU_PROBLEM_TITLE--}:</STRONG>
+		<TD align="center" height="40" class="admin_header bottom2"><strong>{--ADMIN_MENU_PROBLEM_TITLE--}:</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" height="40"><FONT class="admin_failed">$content</FONT>
+		<TD align="center" height="40"><div class="admin_failed">$content</div>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_menu_hints.tpl b/templates/de/html/admin/admin_menu_hints.tpl
index 04c5f54bf0..74cfbc14d6 100644
--- a/templates/de/html/admin/admin_menu_hints.tpl
+++ b/templates/de/html/admin/admin_menu_hints.tpl
@@ -1,8 +1,8 @@
-<DIV align="center" style="margin-left: 5px; margin-right: 5px">
+<div align="center" style="margin-left: 5px; margin-right: 5px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%">
 	<TR>
 		<TD height="7" colspan="3" class="seperator">&nbsp;</TD>
 	</TR>
 	$content
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_menu_hints_row.tpl b/templates/de/html/admin/admin_menu_hints_row.tpl
index 622c958677..cdcaac16de 100644
--- a/templates/de/html/admin/admin_menu_hints_row.tpl
+++ b/templates/de/html/admin/admin_menu_hints_row.tpl
@@ -1,5 +1,5 @@
 <TR>
-	<TD align="center" class="admin_desc_header" colspan="3"><STRONG>$content[title]:</STRONG>
+	<TD align="center" class="admin_desc_header" colspan="3"><strong>$content[title]:</strong>
 	</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/admin/admin_menu_overview_row.tpl b/templates/de/html/admin/admin_menu_overview_row.tpl
index 14ccc9dd60..dd330bd0e5 100644
--- a/templates/de/html/admin/admin_menu_overview_row.tpl
+++ b/templates/de/html/admin/admin_menu_overview_row.tpl
@@ -3,7 +3,7 @@
 		<INPUT type="checkbox" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" class="admin_normal" />
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
-		<A href="{!URL!}/modules.php?module=admin&amp;what=$content[mode]edit&amp;sub=$content[action]">$content[action]</A>
+		<a href="{!URL!}/modules.php?module=admin&amp;what=$content[mode]edit&amp;sub=$content[action]">$content[action]</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 		$content[what]
diff --git a/templates/de/html/admin/admin_menu_unknown_okay.tpl b/templates/de/html/admin/admin_menu_unknown_okay.tpl
index 0a72b2b7c7..bfbb201681 100644
--- a/templates/de/html/admin/admin_menu_unknown_okay.tpl
+++ b/templates/de/html/admin/admin_menu_unknown_okay.tpl
@@ -12,7 +12,7 @@
 		<TD class="admin_fatal seperator" height="7">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center"><STRONG>{!__OK_VALUE!}</STRONG></TD>
+		<TD align="center"><strong>{!__OK_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="admin_fatal seperator" height="14" colspan="3">&nbsp;</TD>
diff --git a/templates/de/html/admin/admin_mini_online.tpl b/templates/de/html/admin/admin_mini_online.tpl
index be775baf0e..596f6186dc 100644
--- a/templates/de/html/admin/admin_mini_online.tpl
+++ b/templates/de/html/admin/admin_mini_online.tpl
@@ -1,22 +1,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="170" class="admin_table dashed">
 	<TR>
 		<TD colspan="3" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--USER_NOW_ONLINE--}</STRONG></TD>
+		<strong>{--USER_NOW_ONLINE--}</strong></TD>
 	</TR>
 	<TR>
-		<TD width="85%" class="bottom2" align="right"><FONT
-			class="medium">{--GUESTS_ONLINE--}:</FONT></TD>
+		<TD width="85%" class="bottom2" align="right"><div class="medium">{--GUESTS_ONLINE--}:</div></TD>
 		<TD width="5%" class="bottom2 seperator">&nbsp;</TD>
-		<TD width="10%" class="bottom2"><STRONG>{!_GUESTS_ONLINE!}</STRONG></TD>
+		<TD width="10%" class="bottom2"><strong>{!_GUESTS_ONLINE!}</strong></TD>
 	</TR>
 	<TR>
-		<TD class="bottom2" align="right"><FONT class="medium">{--MEMBERS_ONLINE--}:</FONT></TD>
+		<TD class="bottom2" align="right"><div class="medium">{--MEMBERS_ONLINE--}:</div></TD>
 		<TD class="bottom2 seperator">&nbsp;</TD>
-		<TD class="bottom2"><STRONG>{!_MEMBERS_ONLINE!}</STRONG></TD>
+		<TD class="bottom2"><strong>{!_MEMBERS_ONLINE!}</strong></TD>
 	</TR>
 	<TR>
-		<TD align="right"><FONT class="medium">{--ADMINS_ONLINE--}:</FONT></TD>
+		<TD align="right"><div class="medium">{--ADMINS_ONLINE--}:</div></TD>
 		<TDclass"seperator">&nbsp;</TD>
-		<TD><STRONG>{!_ADMINS_ONLINE!}</STRONG></TD>
+		<TD><strong>{!_ADMINS_ONLINE!}</strong></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_mmenu_delete.tpl b/templates/de/html/admin/admin_mmenu_delete.tpl
index efed40f1ca..f47171adc9 100644
--- a/templates/de/html/admin/admin_mmenu_delete.tpl
+++ b/templates/de/html/admin/admin_mmenu_delete.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
-		<TD align="center" colspan="2"><STRONG>{--DEL_MEMBER_MENU--}</STRONG>
+		<TD align="center" colspan="2"><strong>{--DEL_MEMBER_MENU--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -20,4 +20,4 @@
 			value="{--DEL_ENTRIES--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_mmenu_edit.tpl b/templates/de/html/admin/admin_mmenu_edit.tpl
index f96ccb278f..16eb03096f 100644
--- a/templates/de/html/admin/admin_mmenu_edit.tpl
+++ b/templates/de/html/admin/admin_mmenu_edit.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="520">
 	<TR>
 		<TD align="center" colspan="2" class="admin_header" height="40">
-		<STRONG>{--EDIT_MEMBER_MENU--}</STRONG></TD>
+		<strong>{--EDIT_MEMBER_MENU--}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" class="admin_header bottom2">
@@ -21,4 +21,4 @@
 			value="{--SUBMIT_CHANGES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_mmenu_overview.tpl b/templates/de/html/admin/admin_mmenu_overview.tpl
index 2d2fc5eb41..1774cd80c8 100644
--- a/templates/de/html/admin/admin_mmenu_overview.tpl
+++ b/templates/de/html/admin/admin_mmenu_overview.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
+<form action="{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <TR>
-	<TH class="admin_title bottom2 right2" align="center" width="5%" height="30"><STRONG>{--ID_SELECT--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center" width="25%"><STRONG>{--DISPLAY_ACTION--}</STRONG></TH>
-	<TH class="admin_title bottom2 right2" align="center" width="25%"><STRONG>{--DISPLAY_WHAT--}</STRONG></TH>
-	<TH class="admin_title bottom2" align="center" width="25%"><STRONG>{--DISPLAY_TITLE--}</STRONG></TH>
-	<TH class="admin_title bottom2" align="center" width="20%"><STRONG>{--SORT_NAVIGATION--}</STRONG></TH>
+	<TH class="admin_title bottom2 right2" align="center" width="5%" height="30"><strong>{--ID_SELECT--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center" width="25%"><strong>{--DISPLAY_ACTION--}</strong></TH>
+	<TH class="admin_title bottom2 right2" align="center" width="25%"><strong>{--DISPLAY_WHAT--}</strong></TH>
+	<TH class="admin_title bottom2" align="center" width="25%"><strong>{--DISPLAY_TITLE--}</strong></TH>
+	<TH class="admin_title bottom2" align="center" width="20%"><strong>{--SORT_NAVIGATION--}</strong></TH>
 </TR>
 {!__MENU_ROWS!}
 <TR>
@@ -17,4 +17,4 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_mmenu_status.tpl b/templates/de/html/admin/admin_mmenu_status.tpl
index 723afc05c0..be9d4e01c2 100644
--- a/templates/de/html/admin/admin_mmenu_status.tpl
+++ b/templates/de/html/admin/admin_mmenu_status.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}"
 	method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
@@ -7,8 +7,8 @@
 		<TD colspan="4" height="5" class="admin_title seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_MEMBER_MENU--}</STRONG><BR />
-		<BR />
+		<TD align="center" colspan="4" class="admin_title"><strong>{--CHANGE_MEMBER_MENU--}</strong><br />
+		<br />
 		{--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--}</TD>
 	</TR>
 	<TR>
@@ -25,4 +25,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_mods_edit.tpl b/templates/de/html/admin/admin_mods_edit.tpl
index 9b0d8aae6b..e7333e68f3 100644
--- a/templates/de/html/admin/admin_mods_edit.tpl
+++ b/templates/de/html/admin/admin_mods_edit.tpl
@@ -1,14 +1,14 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_mods"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_mods"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="680"
 	class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" height="25"><STRONG>{--MODS_NAME--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_TITLE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_LOCKED--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_HIDDEN--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_ADMIN--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_MEMBER--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" height="25"><strong>{--MODS_NAME--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_TITLE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_LOCKED--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_HIDDEN--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_ADMIN--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_MEMBER--}</strong></TD>
 	</TR>
 	{!__MODS_ROWS!}
 	<TR>
@@ -18,4 +18,4 @@
 			value="{--SAVE_CHANGES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_mods_list.tpl b/templates/de/html/admin/admin_mods_list.tpl
index c325599421..972fd382b5 100644
--- a/templates/de/html/admin/admin_mods_list.tpl
+++ b/templates/de/html/admin/admin_mods_list.tpl
@@ -1,13 +1,13 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_mods" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_mods" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="680" class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2" height="25"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_NAME--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_TITLE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_LOCKED--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_HIDDEN--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_IS_ADMIN--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2"><STRONG>{--MODS_IS_MEMBER--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2" height="25"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_NAME--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_TITLE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_LOCKED--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_HIDDEN--}</strong></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_IS_ADMIN--}</strong></TD>
+		<TD align="center" class="admin_title bottom2"><strong>{--MODS_IS_MEMBER--}</strong></TD>
 	</TR>
 	{!__MODS_ROWS!}
 	<TR>
@@ -17,8 +17,8 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--MODS_ADMIN_EDIT_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_mods_stats.tpl b/templates/de/html/admin/admin_mods_stats.tpl
index 6c4947b6be..71e1b67669 100644
--- a/templates/de/html/admin/admin_mods_stats.tpl
+++ b/templates/de/html/admin/admin_mods_stats.tpl
@@ -1,12 +1,11 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_TITLE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2"><STRONG>{--MODS_CLICKS--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_TITLE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2"><strong>{--MODS_CLICKS--}</strong></TD>
 	</TR>
 	{!__MODS_ROWS!}
 	<TR>
-		<TD colspan="2" class="admin_footer"><FONT
-			class="admin_note">{--MODS_ADMIN_EDIT_NOTE--}</FONT></TD>
+		<TD colspan="2" class="admin_footer"><div class="admin_note">{--MODS_ADMIN_EDIT_NOTE--}</div></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_mods_stats2.tpl b/templates/de/html/admin/admin_mods_stats2.tpl
index 60249751e4..926ebb79da 100644
--- a/templates/de/html/admin/admin_mods_stats2.tpl
+++ b/templates/de/html/admin/admin_mods_stats2.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2 right2"><STRONG>{--MODS_WHAT_ACTION--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2"><STRONG>{--MODS_CLICKS--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2 right2"><strong>{--MODS_WHAT_ACTION--}</strong></TD>
+		<TD align="center" class="admin_title bottom2"><strong>{--MODS_CLICKS--}</strong></TD>
 	</TR>
 	{!__MODS_ROWS!}
 	<TR>
diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl
index 28c2ad840d..cd8dc07473 100644
--- a/templates/de/html/admin/admin_newsletter.tpl
+++ b/templates/de/html/admin/admin_newsletter.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=send_newsletter"
+<form action="{!URL!}/modules.php?module=admin&amp;what=send_newsletter"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" align="center" width="430">
 	<TR>
 		<TD colspan="5" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_NL_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_NL_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" height="5" class="seperator">&nbsp;</TD>
@@ -69,8 +69,8 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD>{--ENTER_NL_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><TEXTAREA name="text" class="admin_normal"
-			rows="14" cols="25"></TEXTAREA></TD>
+		<TD align="center"><textarea name="text" class="admin_normal"
+			rows="14" cols="25"></textarea></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -85,6 +85,6 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_NEWSLETTER_NOTE--}</DIV>
+<div class="admin_note">{--ADMIN_NEWSLETTER_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl
index 56773176d8..c1f12a86b9 100644
--- a/templates/de/html/admin/admin_newsletter_nohtml.tpl
+++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=send_newsletter"
+<form action="{!URL!}/modules.php?module=admin&amp;what=send_newsletter"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" align="center" width="430">
 	<TR>
 		<TD colspan="5" class="admin_title bottom2" align="center" height="30">
-		<STRONG>{--ADMIN_NL_TITLE--}</STRONG></TD>
+		<strong>{--ADMIN_NL_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" height="5" class="seperator">&nbsp;</TD>
@@ -46,8 +46,8 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD>{--ENTER_NL_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center"><TEXTAREA name="text" class="admin_normal"
-			rows="14" cols="25"></TEXTAREA></TD>
+		<TD align="center"><textarea name="text" class="admin_normal"
+			rows="14" cols="25"></textarea></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -63,6 +63,6 @@
 		<TD width="10" class="admin_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_NEWSLETTER_NOTE--}</DIV>
+<div class="admin_note">{--ADMIN_NEWSLETTER_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_newsletter_tsk.tpl b/templates/de/html/admin/admin_newsletter_tsk.tpl
index b2f0902ef4..a8df99826d 100644
--- a/templates/de/html/admin/admin_newsletter_tsk.tpl
+++ b/templates/de/html/admin/admin_newsletter_tsk.tpl
@@ -1,6 +1,6 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_newsletter"
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_newsletter"
 	method="POST" style="margin-bottom: 0px"><INPUT type="hidden"
 	name="uid" value="$content[uid]"> <INPUT type="hidden"
 	name="id" value="$content[id]"> <INPUT type="submit"
 	name="unsub" class="admin_submit" value="{--ADMIN_NL_UNSUBSCRIBE--}">
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_online_header.tpl b/templates/de/html/admin/admin_online_header.tpl
index 02d18de820..a172cf1b37 100644
--- a/templates/de/html/admin/admin_online_header.tpl
+++ b/templates/de/html/admin/admin_online_header.tpl
@@ -8,7 +8,7 @@
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
 				<TD width="10">&nbsp;</TD>
-				<TD><STRONG>{--ADMIN_ONLINE_DETAILS--}</STRONG></TD>
+				<TD><strong>{--ADMIN_ONLINE_DETAILS--}</strong></TD>
 			</TR>
 		</TABLE>
 		</TD>
@@ -17,12 +17,12 @@
 		<TD colspan="8" height="10" class="seperator bottom">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" width="5%" class="admin_title bottom right"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" width="10%" class="admin_title bottom right"><STRONG>{--_UID--}:</STRONG></TD>
-		<TD align="center" width="10%" class="admin_title bottom right"><STRONG>{--REMOTE_IP--}:</STRONG></TD>
-		<TD align="center" width="5%" class="admin_title bottom right"><STRONG>{--_REFID--}:</STRONG></TD>
-		<TD align="center" width="10%" class="admin_title bottom right"><STRONG>{--_MODULE--}:</STRONG></TD>
-		<TD align="center" width="10%" class="admin_title bottom right"><STRONG>{--MENU_ACTION--}:</STRONG></TD>
-		<TD align="center" width="5%" class="admin_title bottom right"><STRONG>{--MENU_WHAT--}:</STRONG></TD>
-		<TD align="center" width="10%" class="admin_title bottom"><STRONG>{--LAST_SEEN--}:</STRONG></TD>
+		<TD align="center" width="5%" class="admin_title bottom right"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" width="10%" class="admin_title bottom right"><strong>{--_UID--}:</strong></TD>
+		<TD align="center" width="10%" class="admin_title bottom right"><strong>{--REMOTE_IP--}:</strong></TD>
+		<TD align="center" width="5%" class="admin_title bottom right"><strong>{--_REFID--}:</strong></TD>
+		<TD align="center" width="10%" class="admin_title bottom right"><strong>{--_MODULE--}:</strong></TD>
+		<TD align="center" width="10%" class="admin_title bottom right"><strong>{--MENU_ACTION--}:</strong></TD>
+		<TD align="center" width="5%" class="admin_title bottom right"><strong>{--MENU_WHAT--}:</strong></TD>
+		<TD align="center" width="10%" class="admin_title bottom"><strong>{--LAST_SEEN--}:</strong></TD>
 	</TR>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_optimize.tpl b/templates/de/html/admin/admin_optimize.tpl
index b6c54bd81a..1bc978c309 100644
--- a/templates/de/html/admin/admin_optimize.tpl
+++ b/templates/de/html/admin/admin_optimize.tpl
@@ -2,25 +2,25 @@
 	class="admin_table dashed">
 	<TR>
 		<TD width="120" class="admin_title bottom2 right2" align="center"
-			height="24"><STRONG>{--OPTIMIZE_DBNAME--}:</STRONG></TD>
-		<TD width="110" class="admin_title bottom2 right2" align="center"><STRONG>{--OPTIMIZE_REPAIRED--}:</STRONG></TD>
-		<TD width="110" class="admin_title bottom2 right2" align="center"><STRONG>{--OPTIMIZE_OPTIMIZED--}:</STRONG></TD>
-		<TD width="120" class="admin_title bottom2 right2" align="center"><STRONG>{--OPTIMIZE_TOTAL_SIZE--}:</STRONG></TD>
-		<TD width="120" class="admin_title bottom2" align="center"><STRONG>{--OPTIMIZE_GAIN_SIZE--}:</STRONG></TD>
+			height="24"><strong>{--OPTIMIZE_DBNAME--}:</strong></TD>
+		<TD width="110" class="admin_title bottom2 right2" align="center"><strong>{--OPTIMIZE_REPAIRED--}:</strong></TD>
+		<TD width="110" class="admin_title bottom2 right2" align="center"><strong>{--OPTIMIZE_OPTIMIZED--}:</strong></TD>
+		<TD width="120" class="admin_title bottom2 right2" align="center"><strong>{--OPTIMIZE_TOTAL_SIZE--}:</strong></TD>
+		<TD width="120" class="admin_title bottom2" align="center"><strong>{--OPTIMIZE_GAIN_SIZE--}:</strong></TD>
 	</TR>
 	{!__TABLE_ROWS!}
 	<TR>
 		<TD colspan="5" class="admin_footer"
 			style="padding-top: 15px; padding-bottom: 15px";>
-		{--OPTIMIZE_DB_TOTAL_TABLES--}: <STRONG>{!__TOTAL_TABS!}</STRONG><BR />
-		{--OPTIMIZE_DB_TOTAL_SIZE--}: <STRONG>{!__TOTAL_SIZE!}
-		{--KBYTES--}</STRONG><BR />
-		{--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <STRONG>{!__TOTAL_CALLS!}</STRONG><BR />
-		{--OPTIMIZE_DB_TOTAL_OPTI--}: <STRONG>{!__TOTAL_OPTIMIZED!}
-		{--KBYTES--}</STRONG><BR />
-		{--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <STRONG>{!__NOW_OPTIMIZED!}</STRONG><BR />
-		{--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <STRONG>{!__NOW_SAVED!}
-		{--KBYTES--}</STRONG><BR />
+		{--OPTIMIZE_DB_TOTAL_TABLES--}: <strong>{!__TOTAL_TABS!}</strong><br />
+		{--OPTIMIZE_DB_TOTAL_SIZE--}: <strong>{!__TOTAL_SIZE!}
+		{--KBYTES--}</strong><br />
+		{--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <strong>{!__TOTAL_CALLS!}</strong><br />
+		{--OPTIMIZE_DB_TOTAL_OPTI--}: <strong>{!__TOTAL_OPTIMIZED!}
+		{--KBYTES--}</strong><br />
+		{--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <strong>{!__NOW_OPTIMIZED!}</strong><br />
+		{--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <strong>{!__NOW_SAVED!}
+		{--KBYTES--}</strong><br />
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_overview_footer.tpl b/templates/de/html/admin/admin_overview_footer.tpl
index afce7a5911..2890eb1c4f 100644
--- a/templates/de/html/admin/admin_overview_footer.tpl
+++ b/templates/de/html/admin/admin_overview_footer.tpl
@@ -8,5 +8,5 @@
 	</TD>
 </TR>
 </TABLE>
-</DIV>
-</FORM>
+</div>
+</form>
diff --git a/templates/de/html/admin/admin_overview_footer_task.tpl b/templates/de/html/admin/admin_overview_footer_task.tpl
index f09ecb560d..784c486bcd 100644
--- a/templates/de/html/admin/admin_overview_footer_task.tpl
+++ b/templates/de/html/admin/admin_overview_footer_task.tpl
@@ -8,8 +8,8 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
-	<STRONG>{--TASK_DELETE_MODE_NOTE--}</STRONG>
-</DIV>
+<div class="admin_note">
+	<strong>{--TASK_DELETE_MODE_NOTE--}</strong>
+</div>
diff --git a/templates/de/html/admin/admin_overview_header.tpl b/templates/de/html/admin/admin_overview_header.tpl
index 98a7295b63..a8e22dba59 100644
--- a/templates/de/html/admin/admin_overview_header.tpl
+++ b/templates/de/html/admin/admin_overview_header.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;action=login" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;action=login" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="95%" align="center" class="admin_table">
 	<TR>
 		<TD colspan="7" align="center" class="admin_task_header top2 left2 right2">
-			<STRONG class="admin_welcome">{--ADMIN_TASK_SYSTEM_WELCOME--}</STRONG>
+			<div class="admin_welcome">{--ADMIN_TASK_SYSTEM_WELCOME--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="top2 bottom2 right2 left2 admin_header"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_ASSIGNED_ADMIN--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_REGISTER_EXTENSION--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_INFOS--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_MEMBER_UID--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_TYPE--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_CREATED--}</STRONG></TD>
+		<TD align="center" class="top2 bottom2 right2 left2 admin_header"><strong>{--ID_SELECT--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_INFOS--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_MEMBER_UID--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_TYPE--}</strong></TD>
+		<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_CREATED--}</strong></TD>
 	</TR>
diff --git a/templates/de/html/admin/admin_overview_header_task.tpl b/templates/de/html/admin/admin_overview_header_task.tpl
index 87036f0e34..7a487ff370 100644
--- a/templates/de/html/admin/admin_overview_header_task.tpl
+++ b/templates/de/html/admin/admin_overview_header_task.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=$content[type]" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=$content[type]" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="95%" align="center" class="admin_table">
-	<TR>
-		<TD colspan="7" align="center" class="admin_task_header top2 left2 right2">
-			<STRONG class="admin_welcome">$content[message]</STRONG>
-		</TD>
-	</TR>
-	<TR>
-		<TD align="center" class="top2 bottom2 right2 left2 admin_header"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_ASSIGNED_ADMIN--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_REGISTER_EXTENSION--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_INFOS--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_MEMBER_UID--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_TYPE--}</STRONG></TD>
-		<TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_CREATED--}</STRONG></TD>
-	</TR>
+<TR>
+	<TD colspan="7" align="center" class="admin_task_header top2 left2 right2">
+		<div class="admin_welcome">$content[message]</STRONG>
+	</TD>
+</TR>
+<TR>
+	<TD align="center" class="top2 bottom2 right2 left2 admin_header"><strong>{--ID_SELECT--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_INFOS--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_MEMBER_UID--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_TYPE--}</strong></TD>
+	<TD align="center" class="top2 bottom2 right2 admin_header"><strong>{--ADMIN_TASK_CREATED--}</strong></TD>
+</TR>
diff --git a/templates/de/html/admin/admin_overview_list.tpl b/templates/de/html/admin/admin_overview_list.tpl
index ddc23bd13f..fc0db4ecf6 100644
--- a/templates/de/html/admin/admin_overview_list.tpl
+++ b/templates/de/html/admin/admin_overview_list.tpl
@@ -2,8 +2,8 @@
 	align="center" class="admin_table">
 	<TR>
 		<TD colspan="3" align="center"
-			class="admin_task_header top2 bottom2 left2 right2"><STRONG
-			class="admin_welcome">{--ADMIN_SELECTED_TASKS_ASSIGN--}:</STRONG></TD>
+			class="admin_task_header top2 bottom2 left2 right2"><strong
+			class="admin_welcome">{--ADMIN_SELECTED_TASKS_ASSIGN--}:</strong></TD>
 	</TR>
 	{!__TASK_ROWS!}
 </TABLE>
diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl
index 4f7d4ed00c..a54aa33429 100644
--- a/templates/de/html/admin/admin_overview_list_ext_rows.tpl
+++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl
@@ -6,7 +6,7 @@
 		$content[admin]
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
-		<A title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</A>
+		<a title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 		$content[infos]
diff --git a/templates/de/html/admin/admin_overview_row.tpl b/templates/de/html/admin/admin_overview_row.tpl
index dffbb41b66..8db41c9512 100644
--- a/templates/de/html/admin/admin_overview_row.tpl
+++ b/templates/de/html/admin/admin_overview_row.tpl
@@ -1,16 +1,16 @@
 <TR>
 	<TD width="79%" class="switch_sw$content[sw] bottom2 left2">
-	<UL style="margin-left: 0px">
-		<LI style="white-space: normal">{--ADMIN_TASK_SUBJECT--}: <STRONG>$content[subj]</STRONG></LI>
+	<ul style="margin-left: 0px">
+		<li style="white-space: normal">{--ADMIN_TASK_SUBJECT--}: <strong>$content[subj]</strong></li>
 		$content[add]
-		<LI style="white-space: normal">{--ADMIN_TASK_TEXT--}:
-		$content[text]</LI>
-		<LI style="white-space: normal">
-		<DIV style="text-align: right"><A
-			href="#ext_$content[extension]">{--TOP--}</A></DIV>
-		</LI>
-		<LI style="white-space: normal">{--ADMIN_TASK_CREATED--}: <STRONG>$content[created]</STRONG></LI>
-	</UL>
+		<li style="white-space: normal">{--ADMIN_TASK_TEXT--}:
+		$content[text]</li>
+		<li style="white-space: normal">
+		<div style="text-align: right"><a
+			href="#ext_$content[extension]">{--TOP--}</a></div>
+		</li>
+		<li style="white-space: normal">{--ADMIN_TASK_CREATED--}: <strong>$content[created]</strong></li>
+	</ul>
 	</TD>
 	<TD width="20%" class="switch_sw$content[sw] bottom2" align="right"
-		valign="top" style="padding-top: 40px">
\ No newline at end of file
+		valign="top" style="padding-top: 40px">
diff --git a/templates/de/html/admin/admin_overview_task.tpl b/templates/de/html/admin/admin_overview_task.tpl
index 6c2baf60a6..2ca5b74874 100644
--- a/templates/de/html/admin/admin_overview_task.tpl
+++ b/templates/de/html/admin/admin_overview_task.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" align="center" class="admin_table dashed">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--TASK_ADMIN_OVERVIEW_HEADER--}</STRONG></TD>
+		<strong>{--TASK_ADMIN_OVERVIEW_HEADER--}</strong></TD>
 	</TR>
 	<TR>
 		<TD width="290" class="seperator" align="center">&nbsp;</TD>
@@ -11,43 +11,43 @@
 		<TD align="center" valign="top">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="275" class="admin_table dashed">
 			<TR>
-				<TD colspan="3" class="admin_title2 bottom2"><STRONG>{--TASK_ADMIN_OVERVIEW_MAILS--}:</STRONG>
+				<TD colspan="3" class="admin_title2 bottom2"><strong>{--TASK_ADMIN_OVERVIEW_MAILS--}:</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_MAIL_ADMIN--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw1 bottom2"><STRONG>{!__MAIL_ADMIN_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw1 bottom2"><strong>{!__MAIL_ADMIN_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw2 bottom2">{--TASK_ADMIN_MAIL_TEMP--}:</TD>
 				<TD width="10" class="switch_sw2 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw2 bottom2"><STRONG>{!__MAIL_TEMP_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw2 bottom2"><strong>{!__MAIL_TEMP_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_MAIL_SEND--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw1 bottom2"><STRONG>{!__MAIL_SEND_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw1 bottom2"><strong>{!__MAIL_SEND_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw2 bottom2">{--TASK_ADMIN_MAIL_DELETED--}:</TD>
 				<TD width="10" class="switch_sw2 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw2 bottom2"><STRONG>{!__MAIL_DELETED_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw2 bottom2"><strong>{!__MAIL_DELETED_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_MAIL_BONUS_SEND--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw1 bottom2"><STRONG>{!__MAIL_BONUS_SEND_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw1 bottom2"><strong>{!__MAIL_BONUS_SEND_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw2">{--TASK_ADMIN_MAIL_BONUS_AP--}:</TD>
 				<TD width="10" class="switch_sw2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw2"><STRONG>{!__MAIL_BONUS_AP_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw2"><strong>{!__MAIL_BONUS_AP_VALUE!}</strong>
 				</TD>
 			</TR>
 		</TABLE>
@@ -56,43 +56,43 @@
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="275"
 			class="admin_table dashed">
 			<TR>
-				<TD colspan="3" class="admin_title2 bottom2"><STRONG>{--TASK_ADMIN_OVERVIEW_TASKS--}:</STRONG>
+				<TD colspan="3" class="admin_title2 bottom2"><strong>{--TASK_ADMIN_OVERVIEW_TASKS--}:</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_NEW_TASKS--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw1 bottom2"><STRONG>{!__TASK_NEW_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw1 bottom2"><strong>{!__TASK_NEW_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw2 bottom2">{--TASK_ADMIN_UPDATE_TASKS--}:</TD>
 				<TD width="10" class="switch_sw2 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw2 bottom2"><STRONG>{!__TASK_UPDATE_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw2 bottom2"><strong>{!__TASK_UPDATE_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_CLOSED_TASKS--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw1 bottom2"><STRONG>{!__TASK_CLOSED_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw1 bottom2"><strong>{!__TASK_CLOSED_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw2 bottom2">{--TASK_ADMIN_YOUR_TASKS--}:</TD>
 				<TD width="10" class="switch_sw2 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw2 bottom2"><STRONG>{!__TASK_YOUR_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw2 bottom2"><strong>{!__TASK_YOUR_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_DELETED_TASKS--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw1 bottom2"><STRONG>{!__TASK_DELETED_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw1 bottom2"><strong>{!__TASK_DELETED_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw2">{--TASK_ADMIN_SOLVED_TASKS--}:</TD>
 				<TD width="10" class="switch_sw2 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw2"><STRONG>{!__TASK_SOLVED_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw2"><strong>{!__TASK_SOLVED_VALUE!}</strong>
 				</TD>
 			</TR>
 		</TABLE>
@@ -106,25 +106,25 @@
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="275"
 			class="admin_table dashed">
 			<TR>
-				<TD colspan="3" class="admin_title2 bottom2"><STRONG>{--TASK_ADMIN_OVERVIEW_MEMBERS--}:</STRONG>
+				<TD colspan="3" class="admin_title2 bottom2"><strong>{--TASK_ADMIN_OVERVIEW_MEMBERS--}:</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD width="240" align="right" class="switch_sw1 bottom2">{--TASK_ADMIN_CONFIRMED--}:</TD>
 				<TD width="10" class="switch_sw1 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD width="25" align="center" class="switch_sw1 bottom2"><STRONG>{!__CONFIRMED_VALUE!}</STRONG>
+				<TD width="25" align="center" class="switch_sw1 bottom2"><strong>{!__CONFIRMED_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw2 bottom2">{--TASK_ADMIN_UNCONFIRMED--}:</TD>
 				<TD width="10" class="switch_sw2 bottom2 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw2 bottom2"><STRONG>{!__UNCONFIRMED_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw2 bottom2"><strong>{!__UNCONFIRMED_VALUE!}</strong>
 				</TD>
 			</TR>
 			<TR>
 				<TD align="right" class="switch_sw1">{--TASK_ADMIN_LOCKED--}:</TD>
 				<TD width="10" class="switch_sw1 seperator" height="5">&nbsp;</TD>
-				<TD align="center" class="switch_sw1"><STRONG>{!__LOCKED_VALUE!}</STRONG>
+				<TD align="center" class="switch_sw1"><strong>{!__LOCKED_VALUE!}</strong>
 				</TD>
 			</TR>
 		</TABLE>
diff --git a/templates/de/html/admin/admin_overview_task_extras.tpl b/templates/de/html/admin/admin_overview_task_extras.tpl
index 2287e61dbe..e899185d9d 100644
--- a/templates/de/html/admin/admin_overview_task_extras.tpl
+++ b/templates/de/html/admin/admin_overview_task_extras.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="275"
 	class="admin_table dashed">
 	<TR>
-		<TD colspan="3" class="admin_title2 bottom2"><STRONG>{--TASK_ADMIN_OVERVIEW_EXTRAS--}:</STRONG>
+		<TD colspan="3" class="admin_title2 bottom2"><strong>{--TASK_ADMIN_OVERVIEW_EXTRAS--}:</strong>
 		</TD>
 	</TR>
 	$content
diff --git a/templates/de/html/admin/admin_overview_task_rows.tpl b/templates/de/html/admin/admin_overview_task_rows.tpl
index 6362b34bfe..7436d8e619 100644
--- a/templates/de/html/admin/admin_overview_task_rows.tpl
+++ b/templates/de/html/admin/admin_overview_task_rows.tpl
@@ -7,7 +7,7 @@
 		class="switch_sw$content[row_sw] $content[bottom] seperator"
 		height="5">&nbsp;</TD>
 	<TD width="25" align="center"
-		class="switch_sw$content[row_sw] $content[bottom]"><STRONG>$content[row_link]</STRONG>
+		class="switch_sw$content[row_sw] $content[bottom]"><strong>$content[row_link]</strong>
 	</TD>
 </TR>
 <!-- row template for extended overview -->
diff --git a/templates/de/html/admin/admin_patches.tpl b/templates/de/html/admin/admin_patches.tpl
index d91334e4d5..deb9eb3e44 100644
--- a/templates/de/html/admin/admin_patches.tpl
+++ b/templates/de/html/admin/admin_patches.tpl
@@ -4,7 +4,7 @@
 		<TD height="10" colspan="5" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" colspan="5"><STRONG>{--NEW_PATCHES_AVAILABLE--}</STRONG>
+		<TD align="center" colspan="5"><strong>{--NEW_PATCHES_AVAILABLE--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -12,18 +12,18 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="center" width="32%" class="admin_title bottom2 right2"><STRONG>{--PATCH_FNAME--}:</STRONG></TD>
-		<TD align="center" width="32%" class="admin_title bottom2 right2"><STRONG>{--PATCH_CTIME--}:</STRONG></TD>
-		<TD align="center" width="32%" class="admin_title bottom2"><STRONG>{--PATCH_FSIZE--}:</STRONG></TD>
+		<TD align="center" width="32%" class="admin_title bottom2 right2"><strong>{--PATCH_FNAME--}:</strong></TD>
+		<TD align="center" width="32%" class="admin_title bottom2 right2"><strong>{--PATCH_CTIME--}:</strong></TD>
+		<TD align="center" width="32%" class="admin_title bottom2"><strong>{--PATCH_FSIZE--}:</strong></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	{!__PATCH_ROWS!}
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="2" align="right" class="bottom2 right2"><STRONG>{--ADMIN_TOTAL_PATCH_SIZES--}:&nbsp;&nbsp;</STRONG>
+		<TD colspan="2" align="right" class="bottom2 right2"><strong>{--ADMIN_TOTAL_PATCH_SIZES--}:&nbsp;&nbsp;</strong>
 		</TD>
-		<TD class="bottom2" align="center"><STRONG>{!__TOTAL_SIZE!}
-		{--KBYTES--}</STRONG></TD>
+		<TD class="bottom2" align="center"><strong>{!__TOTAL_SIZE!}
+		{--KBYTES--}</strong></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_patches_row.tpl b/templates/de/html/admin/admin_patches_row.tpl
index c35b9fc89f..390226054b 100644
--- a/templates/de/html/admin/admin_patches_row.tpl
+++ b/templates/de/html/admin/admin_patches_row.tpl
@@ -1,7 +1,7 @@
 <TR>
 	<TD rowspan="2" width="10" class="seperator">&nbsp;</TD>
-	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><A
-		href="$content[patch_url]">$content[patch_title]</A></TD>
+	<TD align="center" class="switch_sw$content[sw] bottom2 right2"><a
+		href="$content[patch_url]">$content[patch_title]</a></TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[patch_ctime]</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2">$content[patch_size]
 	{--KBYTES--}</TD>
@@ -9,6 +9,6 @@
 </TR>
 <TR>
 	<TD colspan="3" class="switch_sw$content[sw] bottom2">
-	<DIV align="center"><STRONG>{--PATCH_DESCRIPTION--}:</STRONG></DIV>
+	<div align="center"><strong>{--PATCH_DESCRIPTION--}:</strong></div>
 	$content[patch_desc]</TD>
 </TR>
diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl
index 32bccd2d75..c7d44e34dc 100644
--- a/templates/de/html/admin/admin_payout_accept_form.tpl
+++ b/templates/de/html/admin/admin_payout_accept_form.tpl
@@ -1,17 +1,17 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=$_GET[pid]&amp;task=$content"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="380"
 	class="admin_table dashed" align="center">
 	<TR>
-		<TD class="admin_title bottom2" align="center" height="30"><STRONG>{--PAYOUT_ACCEPT_PAYOUT_INTRO--}</STRONG>
+		<TD class="admin_title bottom2" align="center" height="30"><strong>{--PAYOUT_ACCEPT_PAYOUT_INTRO--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">{--PAYOUT_RECEIVER_ACCEPT--}:<BR />
+		<TD align="center">{--PAYOUT_RECEIVER_ACCEPT--}:<br />
 		{--PAYOUT_USERDATA_VALUE--}</TD>
 	</TR>
 	<TR>
@@ -21,8 +21,8 @@
 		<TD class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR />
-		<TEXTAREA name="text" class="admin_normal" rows="5" cols="30"></TEXTAREA>
+		<TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<br />
+		<textarea name="text" class="admin_normal" rows="5" cols="30"></textarea>
 		</TD>
 	</TR>
 	<TR>
@@ -35,4 +35,4 @@
 			value="{--PAYOUT_ACCEPT_PAYOUT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl
index 7ab169d75e..ca0604e433 100644
--- a/templates/de/html/admin/admin_payout_add_new.tpl
+++ b/templates/de/html/admin/admin_payout_add_new.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_payouts"
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_payouts"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed" align="center">
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="40">
-		<STRONG>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</STRONG><BR />
-		<FONT class="admin_note">({--ADMIN_PAYOUT_ADD_NEW_NOTE--})</FONT></TD>
+		<strong>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</strong><br />
+		<div class="admin_note">({--ADMIN_PAYOUT_ADD_NEW_NOTE--})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -23,7 +23,7 @@
 		<TD align="right">{--ADMIN_PAYOUT_RATE--}</TD>
 		<TD class="seperator">&nbsp;</TD>
 		<TD><INPUT type="text" name="rate" class="admin_normal" size="5"
-			maxlength="10"><FONT class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</FONT></TD>
+			maxlength="10"><div class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -32,7 +32,7 @@
 		<TD align="right">{--ADMIN_PAYOUT_MIN_POINTS--}:</TD>
 		<TD class="seperator">&nbsp;</TD>
 		<TD><INPUT type="text" name="mpoi" class="admin_normal" size="5"
-			maxlength="10"><FONT class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</FONT></TD>
+			maxlength="10"><div class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</div></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -40,17 +40,17 @@
 	<TR>
 		<TD align="right">{--ADMIN_PAYOUT_ALLOW_URLS--}:</TD>
 		<TD class="seperator">&nbsp;</TD>
-		<TD><SELECT name="allow_url" class="admin_select" size="1">
-			<OPTION value="N">{--NO--}</OPTION>
-			<OPTION value="Y">{--YES--}</OPTION>
-		</SELECT></TD>
+		<TD><select name="allow_url" class="admin_select" size="1">
+			<option value="N">{--NO--}</option>
+			<option value="Y">{--YES--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator bottom2">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD colspan="3" align="center" class="admin_title bottom2" height="40">
-		<STRONG>{--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:</STRONG></TD>
+		<strong>{--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -103,11 +103,11 @@
 	<TR>
 		<TD align="right">{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:</TD>
 		<TD class="seperator">&nbsp;</TD>
-		<TD><SELECT name="ytrans" size="1" class="admin_select">
-			<OPTION value="md5">MD5</OPTION>
-			<OPTION value="base64">Base64</OPTION>
-			<OPTION value="xxx" selected>None</OPTION>
-		</SELECT></TD>
+		<TD><select name="ytrans" size="1" class="admin_select">
+			<option value="md5">MD5</option>
+			<option value="base64">Base64</option>
+			<option value="xxx" selected>None</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="bottom2 seperator">&nbsp;</TD>
@@ -119,6 +119,6 @@
 			value="{--ADMIN_PAYOUT_ADD_NEW--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_PAYOUT_YOUR_URL_NOTE--}</DIV>
+<div class="admin_note">{--ADMIN_PAYOUT_YOUR_URL_NOTE--}</div>
diff --git a/templates/de/html/admin/admin_payout_failed_transfer.tpl b/templates/de/html/admin/admin_payout_failed_transfer.tpl
index 89681009a3..89cc60cdf4 100644
--- a/templates/de/html/admin/admin_payout_failed_transfer.tpl
+++ b/templates/de/html/admin/admin_payout_failed_transfer.tpl
@@ -1,10 +1,10 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="400" class="admin_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2" height="40"><STRONG>{--ADMIN_PAYOUT_TRANSFER_FAILED--}:</STRONG>
+		<TD align="center" class="admin_title bottom2" height="40"><strong>{--ADMIN_PAYOUT_TRANSFER_FAILED--}:</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" height="40"><STRONG>$content</STRONG></TD>
+		<TD align="center" height="40"><strong>$content</strong></TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl
index 2a67f66294..e088241aac 100644
--- a/templates/de/html/admin/admin_payout_overview_form.tpl
+++ b/templates/de/html/admin/admin_payout_overview_form.tpl
@@ -1,9 +1,9 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=accept&amp;pid=$content[pid]&amp;task=$content[tid]"
 	method="POST"><INPUT type="submit" class="admin_submit"
-	value="{--PAYOUT_ACCEPT_PAYOUT--}"></FORM>
-<BR />
-<FORM
+	value="{--PAYOUT_ACCEPT_PAYOUT--}"></form>
+<br />
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=reject&amp;pid=$content[pid]&amp;task=$content[tid]"
 	method="POST"><INPUT type="submit" class="admin_delete"
-	value="{--PAYOUT_REJECT_PAYOUT--}"></FORM>
+	value="{--PAYOUT_REJECT_PAYOUT--}"></form>
diff --git a/templates/de/html/admin/admin_payout_reject_form.tpl b/templates/de/html/admin/admin_payout_reject_form.tpl
index d3b11092e0..27e7dd89db 100644
--- a/templates/de/html/admin/admin_payout_reject_form.tpl
+++ b/templates/de/html/admin/admin_payout_reject_form.tpl
@@ -1,17 +1,17 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=$_GET[pid]&amp;task=$content"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="380"
 	class="admin_table dashed" align="center">
 	<TR>
-		<TD class="admin_title bottom2" align="center" height="30"><STRONG>{--PAYOUT_REJECT_PAYOUT_INTRO--}</STRONG>
+		<TD class="admin_title bottom2" align="center" height="30"><strong>{--PAYOUT_REJECT_PAYOUT_INTRO--}</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">{--PAYOUT_RECEIVER_REJECT--}:<BR />
+		<TD align="center">{--PAYOUT_RECEIVER_REJECT--}:<br />
 		{--PAYOUT_USERDATA_VALUE--}</TD>
 	</TR>
 	<TR>
@@ -21,8 +21,8 @@
 		<TD class="seperator" height="5">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR />
-		<TEXTAREA name="text" class="admin_normal" rows="5" cols="30"></TEXTAREA>
+		<TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<br />
+		<textarea name="text" class="admin_normal" rows="5" cols="30"></textarea>
 		</TD>
 	</TR>
 	<TR>
@@ -35,4 +35,4 @@
 			value="{--PAYOUT_REJECT_PAYOUT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_points.tpl b/templates/de/html/admin/admin_points.tpl
index 2a60542c78..214f23eeac 100644
--- a/templates/de/html/admin/admin_points.tpl
+++ b/templates/de/html/admin/admin_points.tpl
@@ -1,14 +1,14 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_points&sub=ref" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_points&sub=ref" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 	<TR>
 		<TD align="center" colspan="3" class="admin_title" height="30">
-			<STRONG>{--EDIT_DEL_REFDEPTH--}</STRONG>
+			<strong>{--EDIT_DEL_REFDEPTH--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="admin_title bottom2 right2" width="30" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_title bottom2 right2" width="275" align="center"><STRONG>{--REF_LEVEL--}:</STRONG></TD>
-		<TD class="admin_title bottom2" width="275" align="center"><STRONG>{--REF_PERCENT--}:</STRONG></TD>
+		<TD class="admin_title bottom2 right2" width="30" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_title bottom2 right2" width="275" align="center"><strong>{--REF_LEVEL--}:</strong></TD>
+		<TD class="admin_title bottom2" width="275" align="center"><strong>{--REF_PERCENT--}:</strong></TD>
 	</TR>
 	{!__LEVEL_ROWS!}
 	<TR>
@@ -19,8 +19,8 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_REFERAL_LEVEL_ZERO_NOTICE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_points_del.tpl b/templates/de/html/admin/admin_points_del.tpl
index b02e450f69..6f6458795c 100644
--- a/templates/de/html/admin/admin_points_del.tpl
+++ b/templates/de/html/admin/admin_points_del.tpl
@@ -1,10 +1,10 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=del"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="500">
 	<TR>
-		<TD align="center" height="30" class="bottom2 admin_title"><STRONG>{--DELETE_REF_DEPTHS--}:</STRONG></TD>
+		<TD align="center" height="30" class="bottom2 admin_title"><strong>{--DELETE_REF_DEPTHS--}:</strong></TD>
 	</TR>
 	{!__LEVEL_ROWS!}
 	<TR>
@@ -14,4 +14,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_points_del_row.tpl b/templates/de/html/admin/admin_points_del_row.tpl
index 7589e43ac7..db4493c441 100644
--- a/templates/de/html/admin/admin_points_del_row.tpl
+++ b/templates/de/html/admin/admin_points_del_row.tpl
@@ -2,16 +2,17 @@
 	<TD height="5" class="seperator"></TD>
 </TR>
 <TR>
-	<TD align="center" class="switch_sw$content[sw]"><STRONG>{--REF_LEVEL--}
-	$content[lvl]:</STRONG></TD>
+	<TD align="center" class="switch_sw$content[sw]"><strong>{--REF_LEVEL--}
+	$content[lvl]:</strong></TD>
 </TR>
 <TR>
 	<TD height="5" class="switch_sw$content[sw]"></TD>
 </TR>
 <TR>
-	<TD align="center" class="switch_sw$content[sw]">$content[per]% <FONT
-		class="tiny">({--ID_SELECT--} $content[id])</FONT> <INPUT
-		type="hidden" name="id[$content[id]]" value="1" size="35"></TD>
+	<TD align="center" class="switch_sw$content[sw]">
+		$content[per]% <div class="tiny">({--ID_SELECT--} $content[id])</div>
+		<INPUT type="hidden" name="id[$content[id]]" value="1" size="35">
+	</TD>
 </TR>
 <TR>
 	<TD height="5" class="switch_sw$content[sw] bottom"
diff --git a/templates/de/html/admin/admin_points_edit.tpl b/templates/de/html/admin/admin_points_edit.tpl
index d40d4a3af8..f7f0a5f2f1 100644
--- a/templates/de/html/admin/admin_points_edit.tpl
+++ b/templates/de/html/admin/admin_points_edit.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=config_points&sub=ref&amp;do=edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="550">
 	<TR>
 		<TD align="center" colspan="2" height="30" class="bottom2 admin_title">
-		<STRONG>{--EDIT_REF_DEPTHS--}:</STRONG></TD>
+		<strong>{--EDIT_REF_DEPTHS--}:</strong></TD>
 	</TR>
 	{!__LEVEL_ROWS!}
 	<TR>
@@ -15,4 +15,4 @@
 			value="{--CHANGE_REF--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_points_edit_row.tpl b/templates/de/html/admin/admin_points_edit_row.tpl
index 9d905c84d7..e0c3f40da3 100644
--- a/templates/de/html/admin/admin_points_edit_row.tpl
+++ b/templates/de/html/admin/admin_points_edit_row.tpl
@@ -1,6 +1,6 @@
 <TR>
-	<TD colspan="2" align="center" class="bottom2" height="30"><STRONG>{--REF_DEPTHS_ID--}
-	$content[id]:</STRONG></TD>
+	<TD colspan="2" align="center" class="bottom2" height="30"><strong>{--REF_DEPTHS_ID--}
+	$content[id]:</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" height="5" class="switch_sw$content[sw]"></TD>
diff --git a/templates/de/html/admin/admin_refbanner.tpl b/templates/de/html/admin/admin_refbanner.tpl
index a2be801901..22e957c592 100644
--- a/templates/de/html/admin/admin_refbanner.tpl
+++ b/templates/de/html/admin/admin_refbanner.tpl
@@ -1,21 +1,21 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=refbanner"
+<form action="{!URL!}/modules.php?module=admin&amp;what=refbanner"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="admin_table dashed">
 	<TR>
 		<TD width="10" class="admin_title seperator bottom2">&nbsp;</TD>
 		<TD align="center" colspan="6" class="admin_header bottom2"
-			height="30"><STRONG>{--EDIT_DEL_REFBANNER--}</STRONG></TD>
+			height="30"><strong>{--EDIT_DEL_REFBANNER--}</strong></TD>
 		<TD width="10" class="admin_title seperator bottom2">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD class="admin_header seperator bottom2" width="10">&nbsp;</TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--REF_URL--}:</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--REF_TITLE--}:</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--REF_CNTR--}:</STRONG></TD>
-		<TD class="admin_header bottom2 right2" align="center"><STRONG>{--REF_CLIX--}</STRONG></TD>
-		<TD class="admin_header bottom2" align="center"><STRONG>{--REF_VIS--}:</STRONG></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--REF_URL--}:</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--REF_TITLE--}:</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--REF_CNTR--}:</strong></TD>
+		<TD class="admin_header bottom2 right2" align="center"><strong>{--REF_CLIX--}</strong></TD>
+		<TD class="admin_header bottom2" align="center"><strong>{--REF_VIS--}:</strong></TD>
 		<TD class="admin_header seperator bottom2" width="10">&nbsp;</TD>
 	</TR>
 	{!__BANNER_ROWS!}
@@ -29,4 +29,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_refbanner_edit.tpl b/templates/de/html/admin/admin_refbanner_edit.tpl
index 3905ac688f..134d6d8a4e 100644
--- a/templates/de/html/admin/admin_refbanner_edit.tpl
+++ b/templates/de/html/admin/admin_refbanner_edit.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=refbanner&amp;mode=edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
@@ -6,7 +6,7 @@
 	<TR>
 		<TD width="10" class="admin_header bottom2 seperator">&nbsp;</TD>
 		<TD align="center" colspan="3" class="admin_header bottom2"
-			height="30"><STRONG>{--EDIT_REFBANNER--}</STRONG></TD>
+			height="30"><strong>{--EDIT_REFBANNER--}</strong></TD>
 		<TD width="10" class="admin_header bottom2 seperator">&nbsp;</TD>
 	</TR>
 	{!__BANNER_ROWS!}
@@ -19,4 +19,4 @@
 		<TD class="admin_footer seperator" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_reg.tpl b/templates/de/html/admin/admin_reg.tpl
index 78a7fba496..aa7b603c8c 100644
--- a/templates/de/html/admin/admin_reg.tpl
+++ b/templates/de/html/admin/admin_reg.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	align="center" class="admin_table dashed">
 	<TR>
-		<TD class="admin_header" colspan="8" align="center"><STRONG>{--ADMIN_UNCONFIRMED_ACCOUNTS--}:</STRONG>
+		<TD class="admin_header" colspan="8" align="center"><strong>{--ADMIN_UNCONFIRMED_ACCOUNTS--}:</strong>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl
index c289f99295..7f76d17aa1 100644
--- a/templates/de/html/admin/admin_reg_form.tpl
+++ b/templates/de/html/admin/admin_reg_form.tpl
@@ -1,11 +1,11 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=admin&amp;action=login" method="POST">
+<div align="center">
+<form action="{!URL!}/modules.php?module=admin&amp;action=login" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table register">
 	<TR>
 		<TD colspan="2" align="center" class="admin_title">
-			<STRONG class="admin_fatal">{--ADMIN_NOT_REGISTERED--}</STRONG><BR />
-		<BR />
-		<STRONG>{--ADMIN_REGISTER_NOW--}</STRONG></TD>
+			<div class="admin_fatal">{--ADMIN_NOT_REGISTERED--}</STRONG><br />
+		<br />
+		<strong>{--ADMIN_REGISTER_NOW--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
@@ -40,5 +40,5 @@
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_reg_row.tpl b/templates/de/html/admin/admin_reg_row.tpl
index 93a75afdbe..f7dc3e3aff 100644
--- a/templates/de/html/admin/admin_reg_row.tpl
+++ b/templates/de/html/admin/admin_reg_row.tpl
@@ -6,6 +6,6 @@
 	<TD align="center" class="switch_sw$content[sw] top2 right2">$content[email]</TD>
 	<TD align="center" class="switch_sw$content[sw] top2 right2">$content[ip]</TD>
 	<TD align="center" class="switch_sw$content[sw] top2 right2">$content[ref]</TD>
-	<TD align="center" class="switch_sw$content[sw] top2"><A
-		href="{!URL!}/confirm.php?hash=$content[hash]" target="_blank">{--CONFIRMATION_LINK--}</A></TD>
+	<TD align="center" class="switch_sw$content[sw] top2"><a
+		href="{!URL!}/confirm.php?hash=$content[hash]" target="_blank">{--CONFIRMATION_LINK--}</a></TD>
 </TR>
diff --git a/templates/de/html/admin/admin_reset_pass_done.tpl b/templates/de/html/admin/admin_reset_pass_done.tpl
index cb5264a3e0..f740c3ef7a 100644
--- a/templates/de/html/admin/admin_reset_pass_done.tpl
+++ b/templates/de/html/admin/admin_reset_pass_done.tpl
@@ -1,8 +1,8 @@
-<BR />
+<br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_RESET_PASS_DONE_TITLE--}</STRONG>
+		<strong>{--ADMIN_RESET_PASS_DONE_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -12,7 +12,7 @@
 </TR>
 <TR>
 	<TD class="admin_footer">
-		&raquo;&raquo;&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin">{--ADMIN_CONTINUE_LOGIN--}</A></STRONG>
+		&raquo;&raquo;&nbsp;<strong><a href="{!URL!}/modules.php?module=admin">{--ADMIN_CONTINUE_LOGIN--}</a></strong>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl
index e9aa51e0bb..804616817d 100644
--- a/templates/de/html/admin/admin_reset_password.tpl
+++ b/templates/de/html/admin/admin_reset_password.tpl
@@ -1,9 +1,8 @@
-<BR />
-<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<form action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30" colspan="2">
-		<STRONG>{--ADMIN_RESET_PASSWORD_TITLE--}</STRONG>
+		<strong>{--ADMIN_RESET_PASSWORD_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -21,8 +20,8 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_RESET_PASSWORD_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl
index 454b5a5072..029d084cd2 100644
--- a/templates/de/html/admin/admin_reset_password_form.tpl
+++ b/templates/de/html/admin/admin_reset_password_form.tpl
@@ -1,9 +1,8 @@
-<BR />
-<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<form action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30" colspan="2">
-		<STRONG>{--ADMIN_RESET_PASSWORD_TITLE--}</STRONG>
+		<strong>{--ADMIN_RESET_PASSWORD_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -11,8 +10,8 @@
 		{--ADMIN_SHOW_LOGIN--}
 	</TD>
 	<TD width="50%" class="bottom2">
-		<STRONG>$content[login]</STRONG><BR />
-		[<A href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_CHANGE_LOGIN--}</A>]
+		<strong>$content[login]</strong><br />
+		[<a href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_CHANGE_LOGIN--}</a>]
 	</TD>
 </TR>
 <TR>
@@ -40,8 +39,8 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_RESET_PASSWORD_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl
index b8c3dcc40e..97d6f11317 100644
--- a/templates/de/html/admin/admin_send_bonus_form.tpl
+++ b/templates/de/html/admin/admin_send_bonus_form.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode={!__MODE!}"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
@@ -10,11 +10,11 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--SELECT_CATEGORY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="cat" size="1" class="admin_select">
-			<OPTION value="" disabled>{--PLEASE_SELECT--}</OPTION>
-			<OPTION value="0">{--ALL_MEMBERS--} ({!__ALL_VALUE!})</OPTION>
+		<TD><select name="cat" size="1" class="admin_select">
+			<option value="" disabled>{--PLEASE_SELECT--}</option>
+			<option value="0">{--ALL_MEMBERS--} ({!__ALL_VALUE!})</option>
 			{!__OPTION_LINES!}
-		</SELECT></TD>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -68,8 +68,8 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ENTER_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="text" class="admin_normal" rows="10"
-			cols="50"></TEXTAREA></TD>
+		<TD><textarea name="text" class="admin_normal" rows="10"
+			cols="50"></textarea></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -98,4 +98,4 @@
 		<TD colspan="5" height="10" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_send_bonus_select.tpl b/templates/de/html/admin/admin_send_bonus_select.tpl
index 4d491c765f..1b5336f51b 100644
--- a/templates/de/html/admin/admin_send_bonus_select.tpl
+++ b/templates/de/html/admin/admin_send_bonus_select.tpl
@@ -1,20 +1,20 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="admin_table dashed" width="520">
 	<TR>
-		<TD align="center" class="admin_header bottom2" height="30"><STRONG>{--ADMIN_SEND_BONUS_MAILS--}</STRONG></TD>
+		<TD align="center" class="admin_header bottom2" height="30"><strong>{--ADMIN_SEND_BONUS_MAILS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px"
-			class="bottom2"><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;<A
-			href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=normal">{--ADMIN_SEND_BONUS_NORMAL--}</A><BR />
-		<BR />
-		<FONT class="admin_note">{--ADMIN_SEND_BONUS_NORMAL_NOTES--}</FONT></TD>
+			class="bottom2"><strong><BIG>&middot;</BIG></strong>&nbsp;<a
+			href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=normal">{--ADMIN_SEND_BONUS_NORMAL--}</a><br />
+		<br />
+		<div class="admin_note">{--ADMIN_SEND_BONUS_NORMAL_NOTES--}</div></TD>
 	</TR>
 	<TR>
 		<TD style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px">
-		<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;<A
-			href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=html">{--ADMIN_SEND_BONUS_HTML--}</A><BR />
-		<BR />
-		<FONT class="admin_note">{--ADMIN_SEND_BONUS_HTML_NOTES--}</FONT></TD>
+		<strong><BIG>&middot;</BIG></strong>&nbsp;<a
+			href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=html">{--ADMIN_SEND_BONUS_HTML--}</a><br />
+		<br />
+		<div class="admin_note">{--ADMIN_SEND_BONUS_HTML_NOTES--}</div></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_send_reset_link.tpl b/templates/de/html/admin/admin_send_reset_link.tpl
index fc7db05f5c..eeb26a2a1e 100644
--- a/templates/de/html/admin/admin_send_reset_link.tpl
+++ b/templates/de/html/admin/admin_send_reset_link.tpl
@@ -1,9 +1,8 @@
-<BR />
-<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<form action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30" colspan="2">
-		<STRONG>{--ADMIN_SEND_RESET_LINK_TITLE--}</STRONG>
+		<strong>{--ADMIN_SEND_RESET_LINK_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -21,8 +20,8 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_SEND_RESET_LINK_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_settings_saved.tpl b/templates/de/html/admin/admin_settings_saved.tpl
index 7d0d1dcf97..130519a763 100644
--- a/templates/de/html/admin/admin_settings_saved.tpl
+++ b/templates/de/html/admin/admin_settings_saved.tpl
@@ -1,9 +1,8 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-	class="admin_table dashed">
-	<TR>
-		<TD class="admin_title2 bottom2">{--MESSAGE_HEADER--}</TD>
-	</TR>
-	<TR>
-		<TD class="admin_message"><STRONG>$content</STRONG></TD>
-	</TR>
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed">
+<TR>
+	<TD class="admin_title2 bottom2">{--MESSAGE_HEADER--}</TD>
+</TR>
+<TR>
+	<TD class="admin_message"><strong>$content</strong></TD>
+</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_sponsor_paytypes.tpl b/templates/de/html/admin/admin_sponsor_paytypes.tpl
index e8b58bc71d..2c0e4f682c 100644
--- a/templates/de/html/admin/admin_sponsor_paytypes.tpl
+++ b/templates/de/html/admin/admin_sponsor_paytypes.tpl
@@ -1,5 +1,5 @@
-<DIV align="center">
-  {!__LIST_CONTENT!}<BR />
-  <BR />
+<div align="center">
+  {!__LIST_CONTENT!}<br />
+  <br />
   {!__ADD_CONTENT!}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl
index 4afdb5f3b8..52cabdea90 100644
--- a/templates/de/html/admin/admin_sub_points.tpl
+++ b/templates/de/html/admin/admin_sub_points.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=sub_points&amp;u_id={!__UID!}" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=sub_points&amp;u_id={!__UID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="admin_table dashed">
 	<TR>
@@ -6,8 +6,8 @@
 	</TR>
 	<TR>
 		<TD class="admin_title" colspan="3" align="center">
-		{--ADMIN_SUB_POINTS_FROM_USER--}:<BR />
-		<STRONG>{!__USER_VALUE!}</STRONG></TD>
+		{--ADMIN_SUB_POINTS_FROM_USER--}:<br />
+		<strong>{!__USER_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD>
@@ -27,8 +27,8 @@
 	<TR>
 		<TD align="right">{--ENTER_SUB_REASON--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="reason" class="admin_normal" rows="5"
-			cols="20"></TEXTAREA></TD>
+		<TD><textarea name="reason" class="admin_normal" rows="5"
+			cols="20"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="3" colspan="3" class="seperator">&nbsp;</TD>
@@ -43,4 +43,4 @@
 			value="{--ADMIN_SUB_POINTS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl
index a85e1b991f..ed3e724dce 100644
--- a/templates/de/html/admin/admin_sub_points_all.tpl
+++ b/templates/de/html/admin/admin_sub_points_all.tpl
@@ -1,4 +1,4 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=admin&amp;what=sub_points&amp;u_id=all"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
@@ -27,8 +27,8 @@
 	<TR>
 		<TD align="right">{--ENTER_SUB_REASON--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="reason" class="admin_normal" rows="5"
-			cols="20"></TEXTAREA></TD>
+		<TD><textarea name="reason" class="admin_normal" rows="5"
+			cols="20"></textarea></TD>
 	</TR>
 	<TR>
 		<TD height="3" colspan="3" class="seperator">&nbsp;</TD>
@@ -43,4 +43,4 @@
 			value="{--ADMIN_SUB_POINTS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_task_holiday.tpl b/templates/de/html/admin/admin_task_holiday.tpl
index 7b311926ee..81282e4787 100644
--- a/templates/de/html/admin/admin_task_holiday.tpl
+++ b/templates/de/html/admin/admin_task_holiday.tpl
@@ -1,2 +1,2 @@
-<A
-	href="{!URL!}/modules.php?module=admin&amp;what=del_holiday&amp;u_id=$content">{--HOLIDAY_ADMIN_DEL_LINK--}</A>
\ No newline at end of file
+<a
+	href="{!URL!}/modules.php?module=admin&amp;what=del_holiday&amp;u_id=$content">{--HOLIDAY_ADMIN_DEL_LINK--}</a>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_theme_404.tpl b/templates/de/html/admin/admin_theme_404.tpl
index 4236f6ab8d..14ba35d709 100644
--- a/templates/de/html/admin/admin_theme_404.tpl
+++ b/templates/de/html/admin/admin_theme_404.tpl
@@ -1,7 +1 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-	width="400" class="admin_done dashed">
-	<TR>
-		<TD align="center" height="40"><STRONG class="admin_failed">{--ADMIN_THEME_NOTHING_FOUND--}</STRONG>
-		</TD>
-	</TR>
-</TABLE>
\ No newline at end of file
+<!-- @DEPRECATED -->
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_theme_edit.tpl b/templates/de/html/admin/admin_theme_edit.tpl
index 8b60fcbe3e..99e75f78ad 100644
--- a/templates/de/html/admin/admin_theme_edit.tpl
+++ b/templates/de/html/admin/admin_theme_edit.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=theme_edit"
+<form action="{!URL!}/modules.php?module=admin&amp;what=theme_edit"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
@@ -21,6 +21,6 @@
 			value="{--ADMIN_DELETE_ENTRIES--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">{--ADMIN_THEME_NEW_DEFAULT_THEME--}</DIV>
+<div class="admin_note">{--ADMIN_THEME_NEW_DEFAULT_THEME--}</div>
diff --git a/templates/de/html/admin/admin_theme_edit_row.tpl b/templates/de/html/admin/admin_theme_edit_row.tpl
index 5939f66836..f436c8390d 100644
--- a/templates/de/html/admin/admin_theme_edit_row.tpl
+++ b/templates/de/html/admin/admin_theme_edit_row.tpl
@@ -16,7 +16,7 @@
 		$content[email]
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
-		<A href="$content[url_link]" target="_blank">$content[url_title]</A>
+		<a href="$content[url_link]" target="_blank">$content[url_title]</a>
 	</TD>
 	<TD class="switch_sw$content[sw] bottom2 right2" align="center">
 		v$content[ver]
diff --git a/templates/de/html/admin/admin_theme_import.tpl b/templates/de/html/admin/admin_theme_import.tpl
index ee422fd3b5..213590fce1 100644
--- a/templates/de/html/admin/admin_theme_import.tpl
+++ b/templates/de/html/admin/admin_theme_import.tpl
@@ -11,7 +11,7 @@
 	{!__THEME_LIST!}
 	<TR>
 		<TD colspan="6" class="admin_footer">
-			<FONT class="admin_note">{--ADMIN_THEME_LIST_NOTE--}</FONT>
+			<div class="admin_note">{--ADMIN_THEME_LIST_NOTE--}</div>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_theme_installed.tpl b/templates/de/html/admin/admin_theme_installed.tpl
index 382d64d53b..a0744eb548 100644
--- a/templates/de/html/admin/admin_theme_installed.tpl
+++ b/templates/de/html/admin/admin_theme_installed.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	width="400" class="admin_done dashed">
 	<TR>
-		<TD align="center" height="40"><STRONG>{--ADMIN_THEME_ALREADY_INSTALLED_1--}$content{--ADMIN_THEME_ALREADY_INSTALLED_2--}</STRONG>
+		<TD align="center" height="40"><strong>{--ADMIN_THEME_ALREADY_INSTALLED_1--}$content{--ADMIN_THEME_ALREADY_INSTALLED_2--}</strong>
 		</TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/admin/admin_theme_list.tpl b/templates/de/html/admin/admin_theme_list.tpl
index ac7cb3fe9b..2e45e46359 100644
--- a/templates/de/html/admin/admin_theme_list.tpl
+++ b/templates/de/html/admin/admin_theme_list.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <TR>
 	<TD colspan="5" align="center" class="admin_title bottom2" height="30">
-		<STRONG>{--ADMIN_THEME_NEW_FOUND_TITLE--}:</STRONG>
+		<strong>{--ADMIN_THEME_NEW_FOUND_TITLE--}:</strong>
 	</TD>
 </TR>
 <TR>
@@ -14,10 +14,10 @@
 {!__THEMES_ROWS!}
 <TR>
 	<TD colspan="2" align="center" class="admin_title right2">
-		{--ADMIN_THEME_TOTAL_FOUND--}:&nbsp;<STRONG>{!__TTHEME_VALUE!}</STRONG>
+		{--ADMIN_THEME_TOTAL_FOUND--}:&nbsp;<strong>{!__TTHEME_VALUE!}</strong>
 	</TD>
 	<TD colspan="3" align="right" class="admin_title right2">
-		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<STRONG>{!__TKBYTES_VALUE!} {--KBYTES--}</STRONG>
+		{--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<strong>{!__TKBYTES_VALUE!} {--KBYTES--}</strong>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl
index 7e9ebf9798..4e50b88596 100644
--- a/templates/de/html/admin/admin_unlock_emails.tpl
+++ b/templates/de/html/admin/admin_unlock_emails.tpl
@@ -1,21 +1,21 @@
-<FORM actiom="{!URL!}/modules.php?module=admin&amp;what=unlock_emails"
+<form actiom="{!URL!}/modules.php?module=admin&amp;what=unlock_emails"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed" width="99%">
 	<TR>
 		<TD colspan="8" align="center" class="admin_header bottom2"
-			height="35"><STRONG class="admin_misc">{--ADMIN_UNLOCK_EMAILS--}</STRONG>
+			height="35"><div class="admin_misc">{--ADMIN_UNLOCK_EMAILS--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="admin_header right2" align="center" width="10"><STRONG>{--ID_SELECT--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_SENDER--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_SUBJECT--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_URL--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_CATEGORY--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_PAYMENT--}</STRONG></TD>
-		<TD class="admin_header right2" align="center"><STRONG>{--EMAIL_TIMESTAMP--}</STRONG></TD>
-		<TD class="admin_header" style="white-space: nowrap" align="center"><STRONG>{--EMAIL_TSEND--}</STRONG></TD>
+		<TD class="admin_header right2" align="center" width="10"><strong>{--ID_SELECT--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_SENDER--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_SUBJECT--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_URL--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_CATEGORY--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_PAYMENT--}</strong></TD>
+		<TD class="admin_header right2" align="center"><strong>{--EMAIL_TIMESTAMP--}</strong></TD>
+		<TD class="admin_header" style="white-space: nowrap" align="center"><strong>{--EMAIL_TSEND--}</strong></TD>
 	</TR>
 	{!__UNLOCK_ROWS!}
 	<TR>
@@ -33,4 +33,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl
index f2427de9f0..1efb1979c2 100644
--- a/templates/de/html/admin/admin_unlock_emails_redir.tpl
+++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl
@@ -1,11 +1,11 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=unlock_emails"
+<form action="{!URL!}/modules.php?module=admin&amp;what=unlock_emails"
 	method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="admin_table dashed">
 	<TR>
 		<TD class="admin_header bottom2" width="10">&nbsp;</TD>
 		<TD class="admin_header bottom2" colspan="2" align="center"
-			height="35"><STRONG class="admin_misc">{--ADMIN_REJECTED_URLS--}</STRONG>
+			height="35"><div class="admin_misc">{--ADMIN_REJECTED_URLS--}</STRONG>
 		</TD>
 		<TD class="admin_header bottom2" width="10">&nbsp;</TD>
 	</TR>
@@ -19,4 +19,4 @@
 		<TD class="admin_header" width="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_unlock_emails_row.tpl b/templates/de/html/admin/admin_unlock_emails_row.tpl
index ef3b2e1eeb..e2398be795 100644
--- a/templates/de/html/admin/admin_unlock_emails_row.tpl
+++ b/templates/de/html/admin/admin_unlock_emails_row.tpl
@@ -11,13 +11,13 @@
 		$content[subj]
 	</TD>
 	<TD class="switch_sw$content[sw] top2 right2" align="center">
-		<A href="$content[tester]" target="_blank">{--ADMIN_TEST_URL--}</A>
+		<a href="$content[tester]" target="_blank">{--ADMIN_TEST_URL--}</a>
 	</TD>
 	<TD class="switch_sw$content[sw] top2 right2 admin_misc" align="center">
-		<STRONG title="$content[cat_title]">$content[cat_link]</STRONG>
+		<div class="admin_note" title="$content[cat_title]">$content[cat_link]</STRONG>
 	</TD>
 	<TD class="switch_sw$content[sw] top2 right2 admin_misc" align="center">
-		<STRONG title="$content[pay_title]">$content[pay_link]</STRONG>
+		<div class="admin_note" title="$content[pay_title]">$content[pay_link]</STRONG>
 	</TD>
 	<TD class="switch_sw$content[sw] top2 right2 admin_misc" align="center">
 		$content[ordered]
diff --git a/templates/de/html/admin/admin_unlock_sponsor.tpl b/templates/de/html/admin/admin_unlock_sponsor.tpl
index 83a7232309..1ae088e5cd 100644
--- a/templates/de/html/admin/admin_unlock_sponsor.tpl
+++ b/templates/de/html/admin/admin_unlock_sponsor.tpl
@@ -1,16 +1,16 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=unlock_sponsor" method="POST">
+<div align="center">
+<form action="{!URL!}/modules.php?module=admin&amp;what=unlock_sponsor" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="admin_table dashed">
 <TR>
   <TD colspan="4" class="admin_title bottom2" height="30" align="center">
-    <STRONG>{--ADMIN_SPONSOR_UNLOCK_TITLE--}</STRONG>
+    <strong>{--ADMIN_SPONSOR_UNLOCK_TITLE--}</strong>
   </TD>
 </TR>
 <TR>
-  <TD align="center" class="admin_title bottom2 right2"><STRONG>{--ID_SELECT--}</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2"><STRONG>{--SURNAME_FAMILY--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2 right2"><STRONG>{--REMOTE_IP--}:</STRONG></TD>
-  <TD align="center" class="admin_title bottom2"><STRONG>{--SPONSOR_CREATED--}:</STRONG></TD>
+  <TD align="center" class="admin_title bottom2 right2"><strong>{--ID_SELECT--}</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2"><strong>{--SURNAME_FAMILY--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2 right2"><strong>{--REMOTE_IP--}:</strong></TD>
+  <TD align="center" class="admin_title bottom2"><strong>{--SPONSOR_CREATED--}:</strong></TD>
 </TR>
 {!__SPONSOR_ROWS!}
 <TR>
@@ -20,9 +20,9 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
 
 <P align="center">
-  <STRONG class="admin_note">{--ADMIN_SPONSOR_UNLOCK_NOTES--}</STRONG>
+  <div class="admin_note">{--ADMIN_SPONSOR_UNLOCK_NOTES--}</strong>
 </P>
diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
index 342088e018..88648518af 100644
--- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
@@ -3,7 +3,7 @@
 		<INPUT type="checkbox" title="{--ID_SELECT--} $content[id]" name="id[$content[id]]" class="admin_normal" value="1" />
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
-		<A href="$content[email]">$content[gender] $content[surname] $content[family]</A>
+		<a href="$content[email]">$content[gender] $content[surname] $content[family]</a>
 	</TD>
 	<TD align="center" class="switch_sw$content[sw] bottom2 right2">
 		$content[remote]
diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
index 5425675099..88b63e2a03 100644
--- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
+++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=unlock_surfbar_urls" method="POST">
+<form action="{!URL!}/modules.php?module=admin&amp;what=unlock_surfbar_urls" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="600">
 <TR>
 	<TD align="center" colspan="5" class="admin_title" height="30">
-		<STRONG>{--ADMIN_UNLOCK_SURFBAR_URLS_TITLE--}</STRONG>
+		<strong>{--ADMIN_UNLOCK_SURFBAR_URLS_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
-	<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
-	<TD class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}</STRONG></TD>
-	<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_SURFBAR_URL--}</STRONG></TD>
-	<TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_TEST_URL--}</STRONG></TD>
-	<TD class="admin_title bottom2" align="center"><STRONG>{--ADMIN_SURFBAR_REGISTERED--}</STRONG></TD>
+	<TD class="admin_title bottom2 right2" align="center"><strong>{--ID_SELECT--}</strong></TD>
+	<TD class="admin_title bottom2 right2" align="center"><strong>{--_UID--}</strong></TD>
+	<TD class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_SURFBAR_URL--}</strong></TD>
+	<TD class="admin_title bottom2 right2" align="center"><strong>{--ADMIN_TEST_URL--}</strong></TD>
+	<TD class="admin_title bottom2" align="center"><strong>{--ADMIN_SURFBAR_REGISTERED--}</strong></TD>
 </TR>
 $content
 <TR>
@@ -21,4 +21,4 @@ $content
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/admin/admin_update_download.tpl b/templates/de/html/admin/admin_update_download.tpl
index 5e78bb232b..6179e0bba1 100644
--- a/templates/de/html/admin/admin_update_download.tpl
+++ b/templates/de/html/admin/admin_update_download.tpl
@@ -2,7 +2,7 @@
 	align="center" class="admin_table dashed" align="center">
 	<TR>
 		<TD class="admin_title bottom2" align="center" colspan="3" height="30">
-		<STRONG class="big">{--NEW_VERSION_AVAILABLE--}</STRONG></TD>
+		<div class="big">{--NEW_VERSION_AVAILABLE--}</STRONG></TD>
 	</TR>
 	<TR>
 		<TD height="10" colspan="3" class="seperator">&nbsp;</TD>
@@ -10,7 +10,7 @@
 	<TR>
 		<TD align="right" width="350">{--YOUR_VERSION_IS--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>v{!FULL_VERSION!} {!CURR_SVN_REVISION!}</STRONG></TD>
+		<TD><strong>v{!FULL_VERSION!} {!CURR_SVN_REVISION!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="2" colspan="3" class="seperator">&nbsp;</TD>
@@ -18,7 +18,7 @@
 	<TR>
 		<TD align="right" width="350">{--ONLINE_VERSION_IS--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>v{!__ONLINE_VERSION!} {!__ONLINE_REVISION!}</STRONG></TD>
+		<TD><strong>v{!__ONLINE_VERSION!} {!__ONLINE_REVISION!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="2" colspan="3" class="seperator">&nbsp;</TD>
@@ -26,7 +26,7 @@
 	<TR>
 		<TD align="right" width="350">{--UPDATE_CREATE_TIME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>{!__ONLINE_CHANGE!}</STRONG></TD>
+		<TD><strong>{!__ONLINE_CHANGE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="2" colspan="3" class="seperator">&nbsp;</TD>
@@ -39,7 +39,7 @@
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
 				<TD colspan="2" class="admin_title bottom2" align="center"
-					height="30"><STRONG class="big">{--DOWNLOAD_NEW_VERSION--}</STRONG>
+					height="30"><div class="big">{--DOWNLOAD_NEW_VERSION--}</strong>
 				</TD>
 			</TR>
 			<TR>
@@ -47,7 +47,7 @@
 					{--DOWNLOAD_SVN--}:
 				</TD>
 				<TD width="50%" align="center">
-					<STRONG><A href="{!SERVER_URL!}/cms/index/wht/svn" target="_blank">{--DOWNLOAD_NOW--}</A></STRONG>
+					<strong><a href="{!SERVER_URL!}/cms/index/wht/svn" target="_blank">{--DOWNLOAD_NOW--}</a></strong>
 				</TD>
 			</TR>
 		</TABLE>
diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl
index 7d006d7b1f..ea2d21d6bf 100644
--- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl
+++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl
@@ -1,9 +1,8 @@
-<BR />
-<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<form action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
 <TR>
 	<TD class="admin_title bottom2" height="30" colspan="2">
-		<STRONG>{--ADMIN_VALIDATE_HASH_TITLE--}</STRONG>
+		<strong>{--ADMIN_VALIDATE_HASH_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -22,8 +21,8 @@
 	</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="admin_note">
+<div class="admin_note">
 	{--ADMIN_VALIDATE_HASH_NOTE--}
-</DIV>
+</div>
diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl
index 11a66a0c50..fc4bf8f2f9 100644
--- a/templates/de/html/admin/admin_welcome.tpl
+++ b/templates/de/html/admin/admin_welcome.tpl
@@ -1,17 +1,15 @@
-<STRONG>: : : Willkommen zum Administrationsbereich : : :</STRONG>
-<BR />
+<strong>: : : Willkommen zum Administrationsbereich : : :</strong>
+<br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 	<TR>
 		<TD>
-		<DIV align="left" class="tiny">&nbsp;&nbsp;&nbsp;Hallo $username
-		!</DIV>
+			<div align="left" class="tiny">&nbsp;&nbsp;Hallo $username!</div>
 		</TD>
-		<TD align="center" width="300" class="dashed"><FONT class="tiny">
-		Aktueller Admin:&nbsp;[<STRONG title="Erweiterung admins nicht installiert.">{!__ADMIN_LOGIN!}</STRONG>]
-		</FONT></TD>
-		<TD align="center" width="100" class="top2 bottom2 right2"><FONT
-			class="tiny"> <A class="menu_blur admin_logout"
-			href="{!URL!}/modules.php?module=admin&amp;action=logout">Ausloggen</A>
-		</FONT></TD>
+		<TD align="center" width="300" class="dashed"><div class="tiny">
+		Aktueller Admin:&nbsp;[<div class="admin_note" title="Erweiterung admins nicht installiert.">{!__ADMIN_LOGIN!}</div>]
+		</div></TD>
+		<TD align="center" width="100" class="top2 bottom2 right2"><div class="tiny"> <a class="menu_blur admin_logout"
+			href="{!URL!}/modules.php?module=admin&amp;action=logout">Ausloggen</a>
+		</div></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_welcome_admins.tpl b/templates/de/html/admin/admin_welcome_admins.tpl
index ff34da8b30..52daabdd91 100644
--- a/templates/de/html/admin/admin_welcome_admins.tpl
+++ b/templates/de/html/admin/admin_welcome_admins.tpl
@@ -1,18 +1,17 @@
-<STRONG>: : : Willkommen zum Administrationsbereich : : :</STRONG>
-<BR />
+<strong>: : : Willkommen zum Administrationsbereich : : :</strong>
+<br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 	<TR>
 		<TD>
-		<DIV align="left" class="tiny">&nbsp;&nbsp;&nbsp;Hallo $username
-		!</DIV>
+		<div align="left" class="tiny">&nbsp;&nbsp;&nbsp;Hallo $username
+		!</div>
 		</TD>
-		<TD align="center" width="300" class="dashed"><FONT class="tiny">
-		Aktueller Admin:&nbsp;[<A
-			href="{!URL!}/modules.php?module=admin&amp;what=admins_edit&admin={!__ADMIN_ID!}"><STRONG>{!__ADMIN_LOGIN!}</STRONG></A>]
-		</FONT></TD>
-		<TD align="center" width="100" class="top2 bottom2 right2"><FONT
-			class="tiny"> <A class="menu_blur admin_logout"
-			href="{!URL!}/modules.php?module=admin&amp;action=logout">Ausloggen</A>
-		</FONT></TD>
+		<TD align="center" width="300" class="dashed"><div class="tiny">
+		Aktueller Admin:&nbsp;[<a
+			href="{!URL!}/modules.php?module=admin&amp;what=admins_edit&admin={!__ADMIN_ID!}"><strong>{!__ADMIN_LOGIN!}</strong></a>]
+		</div></TD>
+		<TD align="center" width="100" class="top2 bottom2 right2"><div class="tiny">
+			<a class="menu_blur admin_logout" href="{!URL!}/modules.php?module=admin&amp;action=logout">Ausloggen</a>
+		</div></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/admin/admin_yoomedia_error.tpl b/templates/de/html/admin/admin_yoomedia_error.tpl
index 751883a632..c1266f0366 100644
--- a/templates/de/html/admin/admin_yoomedia_error.tpl
+++ b/templates/de/html/admin/admin_yoomedia_error.tpl
@@ -3,6 +3,6 @@
 		<TD class="admin_title bottom2">{--ADMIN_YOOMEDIA_ERROR_TITLE--}</TD>
 	</TR>
 	<TR>
-		<TD align="center"><STRONG>$content</STRONG></TD>
+		<TD align="center"><strong>$content</strong></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/agb.tpl b/templates/de/html/agb.tpl
index f633347e30..38a718230d 100644
--- a/templates/de/html/agb.tpl
+++ b/templates/de/html/agb.tpl
@@ -219,6 +219,6 @@ genannter Grunds&auml;tze ausgelegt.</div>
 
 <div class="agb_para">Stand: 19.10.2003</div>
 
-<div class="agb_para"><strong>&copy; 2003, <I>Name</I>,
+<div class="agb_para"><strong>&copy; 2003, <em>Name</em>,
 Wohnort</strong></div>
 </div>
diff --git a/templates/de/html/beg/beg_banner.tpl b/templates/de/html/beg/beg_banner.tpl
index 86d66955ce..cd95886b62 100644
--- a/templates/de/html/beg/beg_banner.tpl
+++ b/templates/de/html/beg/beg_banner.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>beg_banner.tpl</STRONG>
+<strong>beg_banner.tpl</strong>
 und m&ouml;chte ge&auml;ndert werden!
diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl
index ba1ed5d995..31335415e5 100644
--- a/templates/de/html/beg/beg_done.tpl
+++ b/templates/de/html/beg/beg_done.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 	<TR>
 		<TD align="center">
-		<P>{--BEG_UID_STEAL_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_UID_STEAL_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_UID_STEAL_3--}</P>
-		<P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
+		<P>{--BEG_UID_STEAL_1--}<strong>{!__BEG_UID!}</strong>{--BEG_UID_STEAL_2--}<strong>{!__BEG_POINTS!}</strong>{--BEG_UID_STEAL_3--}</P>
+		<P>{--BEG_CLICKS_1--}<strong>{!__BEG_CLICKS!}</strong>{--BEG_CLICKS_2--}</P>
 		<P align="right">{--BEG_THANKS_FOR_CLICK--}</P>
 		</TD>
 	</TR>
diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl
index a1ac14fbe3..fb2bbf2db7 100644
--- a/templates/de/html/beg/beg_failed.tpl
+++ b/templates/de/html/beg/beg_failed.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 	<TR>
 		<TD align="center">
-		<P>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</P>
-		<P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
+		<P>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>{!__BEG_UID!}</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>{!__BEG_POINTS!}</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</P>
+		<P>{--BEG_CLICKS_1--}<strong>{!__BEG_CLICKS!}</strong>{--BEG_CLICKS_2--}</P>
 		<P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
 		</TD>
 	</TR>
diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl
index 6f70747d45..9fd13d834a 100644
--- a/templates/de/html/beg/beg_link.tpl
+++ b/templates/de/html/beg/beg_link.tpl
@@ -8,17 +8,16 @@
 		<TD height="80%" align="center">
 		<TABLE border="0" cellspacing="0" cellpadding="0" class="beg_table dashed" width="620">
 			<TR>
-				<TD align="center" height="50" class="bottom2"><FONT
-					class="big">{--BEG_LINK_BY_1--}<STRONG>{!MAIN_TITLE!}</STRONG>{--BEG_LINK_BY_2--}</FONT><br />
-				{--BEG_LINK_USERID_1--}<U>{!__BEG_UID!}</U>{--BEG_LINK_USERID_2--}</TD>
+				<TD align="center" height="50" class="bottom2"><div class="big">{--BEG_LINK_BY_1--}<strong>{!MAIN_TITLE!}</strong>{--BEG_LINK_BY_2--}</div><br />
+				{--BEG_LINK_USERID_1--}<u>{!__BEG_UID!}</u>{--BEG_LINK_USERID_2--}</TD>
 			</TR>
 			<TR>
 				<TD align="center" height="120" class="beg_msg bottom2">
 				{!__BEG_MSG!}</TD>
 			</TR>
 			<TR>
-				<TD align="center" height="30"><A
-					href="{!URL!}/ref.php?ref={!__BEG_UID!}">{--BEG_CONTINUE_REGISTER--}</A>
+				<TD align="center" height="30"><a
+					href="{!URL!}/ref.php?ref={!__BEG_UID!}">{--BEG_CONTINUE_REGISTER--}</a>
 				</TD>
 			</TR>
 		</TABLE>
diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl
index 7b108fe198..766935458c 100644
--- a/templates/de/html/beg/beg_login.tpl
+++ b/templates/de/html/beg/beg_login.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 	<TR>
 		<TD align="center">
-		<P>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</P>
-		<P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
+		<P>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>{!__BEG_UID!}</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>{!__BEG_POINTS!}</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</P>
+		<P>{--BEG_CLICKS_1--}<strong>{!__BEG_CLICKS!}</strong>{--BEG_CLICKS_2--}</P>
 		<P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
 		</TD>
 	</TR>
diff --git a/templates/de/html/birthday/birthday_footer.tpl b/templates/de/html/birthday/birthday_footer.tpl
index baf57d0c85..b3ef119a36 100644
--- a/templates/de/html/birthday/birthday_footer.tpl
+++ b/templates/de/html/birthday/birthday_footer.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>birthday_footer.tpl</STRONG>
+<strong>birthday_footer.tpl</strong>
 !
diff --git a/templates/de/html/birthday/birthday_header.tpl b/templates/de/html/birthday/birthday_header.tpl
index b306d031f4..84f20d9ef5 100644
--- a/templates/de/html/birthday/birthday_header.tpl
+++ b/templates/de/html/birthday/birthday_header.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>birthday_header.tpl</STRONG>
+<strong>birthday_header.tpl</strong>
 !
diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl
index 5f4d2eee6f..a67c0b5ef2 100644
--- a/templates/de/html/birthday/birthday_msg.tpl
+++ b/templates/de/html/birthday/birthday_msg.tpl
@@ -1,8 +1,8 @@
-<STRONG class="big">Herzlichen Gl&uuml;ckwunsch zum Geburtstag!</STRONG> <br />
+<div class="big">Herzlichen Gl&uuml;ckwunsch zum Geburtstag!</STRONG> <br />
 <br />
 Hallo {!__GENDER!} {!__SNAME!} {!__FNAME!}!<br />
 <br />
-Wir das Team von <STRONG class="nobr">{!MAIN_TITLE!}</STRONG> w&uuml;schen Ihnen
+Wir das Team von <div class="nobr">{!MAIN_TITLE!}</STRONG> w&uuml;schen Ihnen
 alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben wir
-Ihnen soeben <STRONG class="nobr">{!__GIFT!} {!POINTS!}</STRONG> Ihrem Account
+Ihnen soeben <div class="nobr">{!__GIFT!} {!POINTS!}</STRONG> Ihrem Account
 gutgeschrieben!
diff --git a/templates/de/html/doubler/doubler_footer.tpl b/templates/de/html/doubler/doubler_footer.tpl
index 829e25c383..5b61aac937 100644
--- a/templates/de/html/doubler/doubler_footer.tpl
+++ b/templates/de/html/doubler/doubler_footer.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>doubler_footer.tpl</STRONG>
+<strong>doubler_footer.tpl</strong>
 !
diff --git a/templates/de/html/doubler/doubler_header.tpl b/templates/de/html/doubler/doubler_header.tpl
index 58c0e9490c..4059d88734 100644
--- a/templates/de/html/doubler/doubler_header.tpl
+++ b/templates/de/html/doubler/doubler_header.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>doubler_header.tpl</STRONG>
+<strong>doubler_header.tpl</strong>
 !
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index 9b44705739..3b47344449 100644
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -10,14 +10,14 @@
 		{--DOUBLER_ENTER_LOGIN_DATA--}<br />
 		{--DOUBLER_NOTE_FOR_PASSWORD--}<br />
 		<br />
-		<FORM action="{!URL!}/doubler.php?refid={!__REFID!}" method="POST"
+		<form action="{!URL!}/doubler.php?refid={!__REFID!}" method="POST"
 			style="margin-bottom: 0px">
 		<TABLE border="0" cellspacing="0" cellpadding="0"
 			class="guest_table dashed" width="520">
 			<TR>
 				<TD colspan="2" class="guest_title2 bottom2" height="30">
-					<STRONG>{!POINTS!}-{--DOUBLER_TITLE--}</STRONG><br />
-					<FONT class="doubler_error">{!__ERROR_MSG!}</FONT>
+					<strong>{!POINTS!}-{--DOUBLER_TITLE--}</strong><br />
+					<div class="doubler_error">{!__ERROR_MSG!}</div>
 				</TD>
 			</TR>
 			<TR>
@@ -51,41 +51,41 @@
 					value="{--DOUBLER_NOW--}" /></TD>
 			</TR>
 		</TABLE>
-		</FORM>
+		</form>
 		<br />
-		{--DOUBLER_ALREADY_PAYED_1--} <STRONG>{!__TOTAL_VALUE!}
-		{!POINTS!}</STRONG> {--DOUBLER_ALREADY_PAYED_2--}<br />
-		{--DOUBLER_POINTS_LEFT_1--} <STRONG>{!__LEFT_VALUE!}
-		{!POINTS!}</STRONG> {--DOUBLER_POINTS_LEFT_2--}<br />
-		{--DOUBLER_USAGE_COUNTER_1--} <STRONG>{!__DOUBLER_COUNTER!}</STRONG>
+		{--DOUBLER_ALREADY_PAYED_1--} <strong>{!__TOTAL_VALUE!}
+		{!POINTS!}</strong> {--DOUBLER_ALREADY_PAYED_2--}<br />
+		{--DOUBLER_POINTS_LEFT_1--} <strong>{!__LEFT_VALUE!}
+		{!POINTS!}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
+		{--DOUBLER_USAGE_COUNTER_1--} <strong>{!__DOUBLER_COUNTER!}</strong>
 		{--DOUBLER_USAGE_COUNTER_2--}<br />
 		<br />
-		{--DOUBLER_MINIMUM_IS--} <STRONG>{!__MIN_VALUE!} {!POINTS!}</STRONG>
-		{--DOUBLER_MAXIMUM_IS--} <STRONG>{!__MAX_VALUE!} {!POINTS!}</STRONG><br />
+		{--DOUBLER_MINIMUM_IS--} <strong>{!__MIN_VALUE!} {!POINTS!}</strong>
+		{--DOUBLER_MAXIMUM_IS--} <strong>{!__MAX_VALUE!} {!POINTS!}</strong><br />
 		{--DOUBLER_HAVE_FUN--}<br />
 		<br />
 		{!DOUBLER_PAYOUT_TIME!}<br />
 		<br />
-		{--DOUBLER_POINTS_1--} <STRONG>{!__CHARGE_VALUE!}%</STRONG>
+		{--DOUBLER_POINTS_1--} <strong>{!__CHARGE_VALUE!}%</strong>
 		{--DOUBLER_POINTS_2--}<br />
 		<br />
-		{--DOUBLER_EXAMPLE_1--} <STRONG>500 {!POINTS!}</STRONG> &raquo;&raquo;
-		{--DOUBLER_EXAMPLE_2--} <STRONG>1000 {!POINTS!}</STRONG>{--DOUBLER_EXAMPLE_3--}<br />
+		{--DOUBLER_EXAMPLE_1--} <strong>500 {!POINTS!}</strong> &raquo;&raquo;
+		{--DOUBLER_EXAMPLE_2--} <strong>1000 {!POINTS!}</strong>{--DOUBLER_EXAMPLE_3--}<br />
 		<br />
-		<STRONG class="big">{--DOUBLER_FULL_PAYOUT--}</STRONG><br />
+		<div class="big">{--DOUBLER_FULL_PAYOUT--}</strong><br />
 		<br />
-		{--DOUBLER_REFERRAL_1--} <STRONG>{!__REF_VALUE!}%</STRONG>
+		{--DOUBLER_REFERRAL_1--} <strong>{!__REF_VALUE!}%</strong>
 		{--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--}
-		{--DOUBLER_REFERRAL_4--} {--DOUBLER_REFERRAL_5--} <STRONG>100
-		{!POINTS!}</STRONG> {--DOUBLER_REFERRAL_6--} <STRONG>100 {!POINTS!}</STRONG>
-		{--DOUBLER_REFERRAL_8--} <STRONG>300 {!POINTS!}</STRONG>
+		{--DOUBLER_REFERRAL_4--} {--DOUBLER_REFERRAL_5--} <strong>100
+		{!POINTS!}</strong> {--DOUBLER_REFERRAL_6--} <strong>100 {!POINTS!}</strong>
+		{--DOUBLER_REFERRAL_8--} <strong>300 {!POINTS!}</strong>
 		{--DOUBLER_REFERRAL_8--} {--DOUBLER_REFERRAL_LINK--}<br />
-		{!__DOUBLER_MSG!} <br />
-		{--DOUBLER_NOT_YET_REGISTERED--} <A
-			href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</A><br />
+		{!__DOUBLER_MSG!}<br />
+		{--DOUBLER_NOT_YET_REGISTERED--} <a
+			href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</a><br />
 		<br />
-		{--DOUBLER_YOUR_ADVERTISING_HERE--} <A
-			href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</A><br />
+		{--DOUBLER_YOUR_ADVERTISING_HERE--} <a
+			href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</a><br />
 		<br />
 		{!__DOUBLER_BANNER!}<br />
 		<br />
diff --git a/templates/de/html/doubler/doubler_reflink.tpl b/templates/de/html/doubler/doubler_reflink.tpl
index 579741f8da..f78dcf25bb 100644
--- a/templates/de/html/doubler/doubler_reflink.tpl
+++ b/templates/de/html/doubler/doubler_reflink.tpl
@@ -1,3 +1,3 @@
 {--DOUBLER_MEMBER_YOUR_REFLINK--}:
-<A href="{!URL!}/doubler.php?refid=$content">{!URL!}/doubler.php?refid=$content</A>
+<a href="{!URL!}/doubler.php?refid=$content">{!URL!}/doubler.php?refid=$content</a>
 <br />
diff --git a/templates/de/html/ext/ext_active.tpl b/templates/de/html/ext/ext_active.tpl
index 39248db452..8fff08cab5 100644
--- a/templates/de/html/ext/ext_active.tpl
+++ b/templates/de/html/ext/ext_active.tpl
@@ -1,5 +1,3 @@
-Diese Erweiterung erzeugt unter &quot;Jetzt Online&quot; einen Link
-<I>Heute Online</I>
-, unter dem Sie die Mitglieder finden, die am aktuellen Tag wann als
-letztes Online waren. Zudem wird der aktuelle {!POINTS!}-Verdienst
-angezeigt.
+Diese Erweiterung erzeugt unter &quot;Jetzt Online&quot; einen Link <em>Heute
+Online</em>, unter dem Sie die Mitglieder finden, die am aktuellen Tag wann als
+letztes Online waren. Zudem wird der aktuelle {!POINTS!}-Verdienst angezeigt.
diff --git a/templates/de/html/ext/ext_cache.tpl b/templates/de/html/ext/ext_cache.tpl
index 3e48a4f09c..affb0bb66a 100644
--- a/templates/de/html/ext/ext_cache.tpl
+++ b/templates/de/html/ext/ext_cache.tpl
@@ -7,7 +7,7 @@ wird.
 <br />
 <br />
 <strong>Bitte l&ouml;schen Sie immer die Cache-Dateien aus dem
-Verzeichnis <U>/inc/cache/</U> vor Update/Neuinstallation der
+Verzeichnis <u>/inc/cache/</u> vor Update/Neuinstallation der
 Erweiterung----!</strong>
 <br />
 <br />
diff --git a/templates/de/html/ext/ext_primera.tpl b/templates/de/html/ext/ext_primera.tpl
index a757416c71..bfd7b9ba47 100644
--- a/templates/de/html/ext/ext_primera.tpl
+++ b/templates/de/html/ext/ext_primera.tpl
@@ -1,10 +1,10 @@
 Mit dieser Erweiterung k&ouml;nnen Sie Ihren Mitgliedern eine Auszahlung
-ihrer Internet-W&auml;hrung <A href="http://www.primusportal.de/r/Quix0r"
- target="_blank">Primera</A> auf ihr Primera-Account &uuml;berweisen
+ihrer Internet-W&auml;hrung <a href="http://www.primusportal.de/r/Quix0r"
+ target="_blank">Primera</a> auf ihr Primera-Account &uuml;berweisen
 lassen. Sie als Primera-Anbieter brauchen dazu selbstverst&auml;ndlich
-ein Primera-Account. Mehr dazu auf <A href="http://www.primusportal.de/r/Quix0r"
- target="_blank">www.primusportal.de</A>. Wenn Sie m&ouml;chten, k&ouml;nnen Sie
-auch ganz zu Primera wechseln. Sie unter <A target="_blank"
+ein Primera-Account. Mehr dazu auf <a href="http://www.primusportal.de/r/Quix0r"
+ target="_blank">www.primusportal.de</a>. Wenn Sie m&ouml;chten, k&ouml;nnen Sie
+auch ganz zu Primera wechseln. Sie unter <a target="_blank"
  href="{!URL!}/modules.php?module=admin&amp;what=config_other">Sonstige
-Einstellungen</A> die W&auml;hrung Ihres {!MT_WORD2!} von {!POINTS!} auf Primera
+Einstellungen</a> die W&auml;hrung Ihres {!MT_WORD2!} von {!POINTS!} auf Primera
 umstellen.
diff --git a/templates/de/html/ext/ext_rewrite.tpl b/templates/de/html/ext/ext_rewrite.tpl
index 32bc8e8480..6d815757a0 100644
--- a/templates/de/html/ext/ext_rewrite.tpl
+++ b/templates/de/html/ext/ext_rewrite.tpl
@@ -7,8 +7,8 @@ die Links etwas anders aussehen, als dass Sie es gew&ouml;hnt sind. :-)
 <strong>Vorsicht!</strong>
 Diese Erweiterung ist noch Alpha! Wenn Sie nicht funktionierende Links
 finden, melden Sie sich bitte
-<A href="http://www.mxchange.org/cms/index/wht/impressum"
-	target="_blank">bei mir direkt</A>
+<a href="http://www.mxchange.org/cms/index/wht/impressum"
+	target="_blank">bei mir direkt</a>
 (Mail bevorzugt, wegen besserer &Uuml;bertragung der fehlerhaften
 Links). Danke f&uuml;r Ihre Mithilfe! :-)
 <br />
diff --git a/templates/de/html/ext/ext_task.tpl b/templates/de/html/ext/ext_task.tpl
index 2942de338a..8daeec80ed 100644
--- a/templates/de/html/ext/ext_task.tpl
+++ b/templates/de/html/ext/ext_task.tpl
@@ -3,7 +3,7 @@ Willkommensseite im Admin-Bereich. Sie m&ouml;chten es sich ansehen?
 <br />
 <br />
 Loggen Sie sich hier ein:
-<A href="http://www.mxchange-demo.de/admin.php" target="_blank">http://www.mxchange-demo.de/admin.php</A>
+<a href="http://www.mxchange-demo.de/admin.php" target="_blank">http://www.mxchange-demo.de/admin.php</a>
 (Login und Password:
 <strong>demo</strong>
 )
diff --git a/templates/de/html/ext/ext_transfer.tpl b/templates/de/html/ext/ext_transfer.tpl
index fbb41a66a9..5170de170c 100644
--- a/templates/de/html/ext/ext_transfer.tpl
+++ b/templates/de/html/ext/ext_transfer.tpl
@@ -6,5 +6,5 @@ Gesamt&uuml;bersicht und k&ouml;nnen Eintr&auml;ge auch manuell
 l&ouml;schen. Zudem k&ouml;nnen Sie bestimmen, wie lang der Touring-Code
 (auch abschaltbar!) sein soll, wie viele Eintr&auml;ge maximal angezeigt
 werden soll und wie lange die Eintr&auml;ge g&uuml;ltig sind. Ist die
-<A href="{!URL!}/extensions/ext-autopurge.zip">AutoPurge-Erweiterung</A>
+<a href="{!URL!}/extensions/ext-autopurge.zip">AutoPurge-Erweiterung</a>
 installiert, werden um 00:00 Uhr veraltete Eintr&auml;ge entfernt.
diff --git a/templates/de/html/ext/ext_wernis.tpl b/templates/de/html/ext/ext_wernis.tpl
index b5f47ff62e..5a7b1e2872 100644
--- a/templates/de/html/ext/ext_wernis.tpl
+++ b/templates/de/html/ext/ext_wernis.tpl
@@ -1,11 +1,11 @@
 Mit dieser Erweiterung k&ouml;nnen Sie Ihren Mitgliedern eine Auszahlung
-ihrer Internet-W&auml;hrung <A target="_blank"
- href="http://www.wds66.com/ref.php?refid=10437">Wernis</A> auf ihr
+ihrer Internet-W&auml;hrung <a target="_blank"
+ href="http://www.wds66.com/ref.php?refid=10437">Wernis</a> auf ihr
 WDS66-Hauptaccount &uuml;berweisen lassen. Sie als Wernis-Anbieter brauchen
 dazu selbstverst&auml;ndlich ein Wernis-Account mit einem API-Account. Mehr
-dazu auf <A href="http://www.wds66.com/ref.php?refid=10437"
- target="_blank">www.wds66.com</A>. Wenn Sie m&ouml;chten, k&ouml;nnen Sie auch
-ganz zu Wernis wechseln. Sie unter <A target="_blank"
+dazu auf <a href="http://www.wds66.com/ref.php?refid=10437"
+ target="_blank">www.wds66.com</a>. Wenn Sie m&ouml;chten, k&ouml;nnen Sie auch
+ganz zu Wernis wechseln. Sie unter <a target="_blank"
  href="{!URL!}/modules.php?module=admin&amp;what=config_other">Sonstige
-Einstellungen</A> die W&auml;hrung Ihres {!MT_WORD2!} von {!POINTS!} auf Wernis
+Einstellungen</a> die W&auml;hrung Ihres {!MT_WORD2!} von {!POINTS!} auf Wernis
 umstellen.
diff --git a/templates/de/html/fatal_footer.tpl b/templates/de/html/fatal_footer.tpl
index e7bd270f55..ba6f794127 100644
--- a/templates/de/html/fatal_footer.tpl
+++ b/templates/de/html/fatal_footer.tpl
@@ -1,3 +1,3 @@
 	<br />
-	<DIV class="fatal_footer">$content</DIV>
-</DIV>
+	<div class="fatal_footer">$content</div>
+</div>
diff --git a/templates/de/html/fatal_header.tpl b/templates/de/html/fatal_header.tpl
index de3316e76d..33e64608b7 100644
--- a/templates/de/html/fatal_header.tpl
+++ b/templates/de/html/fatal_header.tpl
@@ -1 +1 @@
-<DIV class="fatal_box">
\ No newline at end of file
+<div class="fatal_box">
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_active_none_row.tpl b/templates/de/html/guest/guest_active_none_row.tpl
index 28ece558a3..2e3607c195 100644
--- a/templates/de/html/guest/guest_active_none_row.tpl
+++ b/templates/de/html/guest/guest_active_none_row.tpl
@@ -3,7 +3,7 @@
 	<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 		width="400" class="admin_done dashed">
 		<TR>
-			<TD align="center" height="40"><STRONG>{--GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY--}</STRONG>
+			<TD align="center" height="40"><strong>{--GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY--}</strong>
 			</TD>
 		</TR>
 	</TABLE>
diff --git a/templates/de/html/guest/guest_active_table.tpl b/templates/de/html/guest/guest_active_table.tpl
index 7c1c8e1060..08c2533a81 100644
--- a/templates/de/html/guest/guest_active_table.tpl
+++ b/templates/de/html/guest/guest_active_table.tpl
@@ -1,22 +1,22 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="guest_table dashed">
 	<TR>
-		<TD colspan="3" class="guest_title2 bottom2" height="30"><STRONG>{--GUEST_ACTIVE_HEADER--}</STRONG>
+		<TD colspan="3" class="guest_title2 bottom2" height="30"><strong>{--GUEST_ACTIVE_HEADER--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--_UID--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--_UID--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_POINTS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_POINTS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="guest_title2 bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__ACTIVE_ROWS!}
 	<TR>
 		<TD colspan="3" align="center" class="guest_footer" height="30">
-		<FONT class="member_note tiny">{--GUEST_ACTIVE_FOOTER--}</FONT></TD>
+		<div class="member_note tiny">{--GUEST_ACTIVE_FOOTER--}</div></TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl
index 55411e57e8..0bee3b4037 100644
--- a/templates/de/html/guest/guest_beg.tpl
+++ b/templates/de/html/guest/guest_beg.tpl
@@ -1,4 +1,4 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="beg_table dashed" width="500">
 	<TR>
@@ -7,7 +7,7 @@
 		<TD width="10" rowspan="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="beg_msg" height="60"><FONT class="big">{--BEG_GUEST_TRAILER--}</FONT><br />
+		<TD align="center" class="beg_msg" height="60"><div class="big">{--BEG_GUEST_TRAILER--}</div><br />
 		{!MAIN_TITLE!}</TD>
 	</TR>
 	<TR>
@@ -18,10 +18,10 @@
 	</TR>
 	<TR>
 		<TD align="left" class="beg_msg">
-		<P>{--BEG_GUEST_EARN_1--} <STRONG>{!__BEG_POINTS!}
-		{!POINTS!}</STRONG> {--BEG_GUEST_EARN_2--} <STRONG>{!__BEG_POINTS_MAX!}
-		{!POINTS!}</STRONG> {--BEG_GUEST_EARN_3--}</P>
-		<P>{--BEG_GUEST_TIMEOUT_1--} <STRONG>{!__BEG_TIMEOUT!}</STRONG>
+		<P>{--BEG_GUEST_EARN_1--} <strong>{!__BEG_POINTS!}
+		{!POINTS!}</strong> {--BEG_GUEST_EARN_2--} <strong>{!__BEG_POINTS_MAX!}
+		{!POINTS!}</strong> {--BEG_GUEST_EARN_3--}</P>
+		<P>{--BEG_GUEST_TIMEOUT_1--} <strong>{!__BEG_TIMEOUT!}</strong>
 		{--BEG_GUEST_TIMEOUT_2--}</P>
 		<P align="right">{--BEG_GUEST_HAVE_FUN--}</P>
 		</TD>
@@ -36,8 +36,8 @@
 		<TD height="5" class="beg_msg seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" height="30" class="beg_msg"><A
-			href="{!URL!}/ref.php?ref={!__BEG_UID!}">{--BEG_CONTINUE_REGISTER--}</A>
+		<TD align="center" height="30" class="beg_msg"><a
+			href="{!URL!}/ref.php?ref={!__BEG_UID!}">{--BEG_CONTINUE_REGISTER--}</a>
 		</TD>
 	</TR>
 	<TR>
@@ -47,4 +47,4 @@
 		<TD height="5" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl
index 3eb4dde932..c24b2ba522 100644
--- a/templates/de/html/guest/guest_confirm_link.tpl
+++ b/templates/de/html/guest/guest_confirm_link.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=index&amp;what=confirm"
+<form action="{!URL!}/modules.php?module=index&amp;what=confirm"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480"
 	class="admin_table dashed">
 	<TR>
 		<TD align="center" colspan="3" class="admin_title bottom2" height="30">
-		<STRONG class="big">{--REQUEST_CONFIRM_LINK_TITLE--}</STRONG></TD>
+		<div class="big">{--REQUEST_CONFIRM_LINK_TITLE--}</STRONG></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="6">&nbsp;</TD>
@@ -31,4 +31,4 @@
 			value="{--REQUEST_CONFIRM_LINK--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_confirm_table.tpl b/templates/de/html/guest/guest_confirm_table.tpl
index f85e597fa0..7139b3e62c 100644
--- a/templates/de/html/guest/guest_confirm_table.tpl
+++ b/templates/de/html/guest/guest_confirm_table.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="400" class="guest_table dashed">
 	<TR>
 		<TD align="center" height="40">
-			<STRONG class="guest_done">{!__CONFIRM_MSG!}</STRONG>
+			<div class="guest_done">{!__CONFIRM_MSG!}</STRONG>
 		</TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_content_footer.tpl b/templates/de/html/guest/guest_content_footer.tpl
index 4e2250395a..a61bf745e5 100644
--- a/templates/de/html/guest/guest_content_footer.tpl
+++ b/templates/de/html/guest/guest_content_footer.tpl
@@ -1,7 +1,7 @@
   </TD>
-  <TD valign="top"><DIV class="guest_skyscraper">
+  <TD valign="top"><div class="guest_skyscraper">
     <!-- 120x600 may fit here -->
-  </DIV></TD>
+  </div></TD>
 </TR>
 <TR>
   <TD align="center" valign="top" class="guest_advert">
diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index 961015c51f..6bc2485dd8 100644
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -1,67 +1,67 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="doubler_table dashed" width="520">
 	<TR>
-		<TD align="center" class="doubler_header bottom2"><STRONG
-			class="big">{--DOUBLER_GENERAL_INFOS--}:</STRONG></TD>
+		<TD align="center" class="doubler_header bottom2"><strong
+			class="big">{--DOUBLER_GENERAL_INFOS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="doubler_main bottom2"
 			style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
-		<UL>
+		<ul>
 
-			<LI>{--DOUBLER_MINIMUM_IS--} <STRONG>{!__MIN_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_MAXIMUM_IS--} <STRONG>{!__MAX_VALUE!}
-			{!POINTS!}</STRONG></LI>
-			<LI>{--DOUBLER_ALREADY_PAYED_1--} <STRONG>{!__TOTAL_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_ALREADY_PAYED_2--}</LI>
-			<LI>{--DOUBLER_POINTS_LEFT_1--} <STRONG>{!__LEFT_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_POINTS_LEFT_2--}</LI>
-			<LI>{--DOUBLER_USAGE_COUNTER_1--} <STRONG>{!__DOUBLER_COUNTER!}</STRONG>
-			{--DOUBLER_USAGE_COUNTER_2--}</LI>
-			<LI>{!DOUBLER_PAYOUT_TIME!}</LI>
-			<LI><STRONG>{--DOUBLER_FULL_PAYOUT--}</STRONG></LI>
-			<LI>{--DOUBLER_POINTS_1--} <STRONG>{!__CHARGE_VALUE!}%</STRONG>
-			{--DOUBLER_POINTS_2--}</LI>
-			<LI>{--DOUBLER_EXAMPLE_1--} <STRONG>500 {!POINTS!}</STRONG>
-			&raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <STRONG>1000 {!POINTS!}</STRONG>{--DOUBLER_EXAMPLE_3--}</LI>
-			<LI>{--DOUBLER_REFERRAL_1--} <STRONG>{!__REF_VALUE!}%</STRONG>
+			<li>{--DOUBLER_MINIMUM_IS--} <strong>{!__MIN_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{!__MAX_VALUE!}
+			{!POINTS!}</strong></li>
+			<li>{--DOUBLER_ALREADY_PAYED_1--} <strong>{!__TOTAL_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
+			<li>{--DOUBLER_POINTS_LEFT_1--} <strong>{!__LEFT_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
+			<li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{!__DOUBLER_COUNTER!}</strong>
+			{--DOUBLER_USAGE_COUNTER_2--}</li>
+			<li>{!DOUBLER_PAYOUT_TIME!}</li>
+			<li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
+			<li>{--DOUBLER_POINTS_1--} <strong>{!__CHARGE_VALUE!}%</strong>
+			{--DOUBLER_POINTS_2--}</li>
+			<li>{--DOUBLER_EXAMPLE_1--} <strong>500 {!POINTS!}</strong>
+			&raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {!POINTS!}</strong>{--DOUBLER_EXAMPLE_3--}</li>
+			<li>{--DOUBLER_REFERRAL_1--} <strong>{!__REF_VALUE!}%</strong>
 			{--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--}
 			{--DOUBLER_REFERRAL_4--}
-			<LI>{--DOUBLER_REFERRAL_5--} <STRONG>100 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_6--} <STRONG>100 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_8--} <STRONG>300 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_8--}</LI>
-			<LI>{--DOUBLER_REFERRAL_LINK--}</LI>
-			<LI>{--DOUBLER_TIMEOUT_1--} <STRONG>{!__TIMEOUT_MARK!}</STRONG>
-			{--DOUBLER_TIMEOUT_2--}</LI>
-			<LI>{--DOUBLER_HAVE_FUN--}</LI>
-			<LI><STRONG><A href="{!URL!}/doubler.php">{--DOUBLER_WANNA_TRY--}</A></STRONG></LI>
-			</OL>
+			<li>{--DOUBLER_REFERRAL_5--} <strong>100 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_6--} <strong>100 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_8--} <strong>300 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_8--}</li>
+			<li>{--DOUBLER_REFERRAL_LINK--}</li>
+			<li>{--DOUBLER_TIMEOUT_1--} <strong>{!__TIMEOUT_MARK!}</strong>
+			{--DOUBLER_TIMEOUT_2--}</li>
+			<li>{--DOUBLER_HAVE_FUN--}</li>
+			<li><strong><a href="{!URL!}/doubler.php">{--DOUBLER_WANNA_TRY--}</a></strong></li>
+			</ol>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="doubler_header bottom2"><STRONG
-			class="big">{--DOUBLER_REGISTER_ADVERT--}:</STRONG></TD>
+		<TD align="center" class="doubler_header bottom2"><strong
+			class="big">{--DOUBLER_REGISTER_ADVERT--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="doubler_main"
 			style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
-		<UL>
-			<LI>{--DOUBLER_NOT_YET_REGISTERED--} <A
-				href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</A></LI>
-			<LI>{--DOUBLER_YOUR_ADVERTISING_HERE--} <A
-				href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</A></LI>
-			</OL>
+		<ul>
+			<li>{--DOUBLER_NOT_YET_REGISTERED--} <a
+				href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</a></li>
+			<li>{--DOUBLER_YOUR_ADVERTISING_HERE--} <a
+				href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</a></li>
+			</ol>
 		</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
 
-<P align="center"><STRONG class="big">{--DOUBLER_ALREADY_PAYOUT--}:</STRONG><br />
+<P align="center"><div class="big">{--DOUBLER_ALREADY_PAYOUT--}:</strong><br />
 <br />
 {!__DOUBLER_PAYOUT_HISTORY!}</P>
 
-<P align="center"><STRONG class="big">{--DOUBLER_NEXT_PAYOUT--}:</STRONG><br />
+<P align="center"><div class="big">{--DOUBLER_NEXT_PAYOUT--}:</strong><br />
 <br />
 {!__DOUBLER_PAYOUT_NEXT!}</P>
diff --git a/templates/de/html/guest/guest_doubler_list.tpl b/templates/de/html/guest/guest_doubler_list.tpl
index addb76aced..3816bf171c 100644
--- a/templates/de/html/guest/guest_doubler_list.tpl
+++ b/templates/de/html/guest/guest_doubler_list.tpl
@@ -2,10 +2,10 @@
 	class="doubler_list dashed">
 	<TR>
 		<TD class="doubler_header bottom2 right2" align="center" width="100">
-		<STRONG>{--_UID--}</STRONG></TD>
+		<strong>{--_UID--}</strong></TD>
 		<TD class="doubler_header bottom2 right2" align="center" width="160">
-		<STRONG>{!POINTS!}</STRONG></TD>
-		<TD class="doubler_header bottom2" align="center" width="160"><STRONG>{--DOUBLER_TIMEMARK--}</STRONG>
+		<strong>{!POINTS!}</strong></TD>
+		<TD class="doubler_header bottom2" align="center" width="160"><strong>{--DOUBLER_TIMEMARK--}</strong>
 		</TD>
 	</TR>
 	$content
diff --git a/templates/de/html/guest/guest_goto_top.tpl b/templates/de/html/guest/guest_goto_top.tpl
index 6ea6a047f1..1100224f1a 100644
--- a/templates/de/html/guest/guest_goto_top.tpl
+++ b/templates/de/html/guest/guest_goto_top.tpl
@@ -1,4 +1,4 @@
 <TR>
-	<TD height="1%" align="center" class="guest_advert"><SMALL><A
-		href="#TOP">{--TOP--}</A></SMALL></TD>
+	<TD height="1%" align="center" class="guest_advert"><SMALL><a
+		href="#TOP">{--TOP--}</a></SMALL></TD>
 </TR>
diff --git a/templates/de/html/guest/guest_header.tpl b/templates/de/html/guest/guest_header.tpl
index 2dddc769b9..a16989b06a 100644
--- a/templates/de/html/guest/guest_header.tpl
+++ b/templates/de/html/guest/guest_header.tpl
@@ -2,17 +2,17 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
 	class="guest">
 	<TR>
-		<TD colspan="3" align="center" valign="top" class="guest_title"><A
-			name="TOP"></A> <!-- Ab hier Kopf! --> <STRONG><BIG>-&nbsp;-&nbsp;-
-		<A title="{!MAIN_TITLE!}"
+		<TD colspan="3" align="center" valign="top" class="guest_title"><a
+			name="TOP"></a> <!-- Ab hier Kopf! --> <strong><BIG>-&nbsp;-&nbsp;-
+		<a title="{!MAIN_TITLE!}"
 			style="cursor: default; background: none; text-decoration: none"
-			class="guest_header">{!MAIN_TITLE!}</A>&nbsp;-&nbsp;-&nbsp;-</BIG></STRONG><br />
+			class="guest_header">{!MAIN_TITLE!}</a>&nbsp;-&nbsp;-&nbsp;-</BIG></strong><br />
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
-				<TD width="200"><FONT class="guest_header">&nbsp;&nbsp;Hallo
-				$username!</FONT></TD>
-				<TD align="center"><FONT class="guest_header">{!SLOGAN!}</FONT></TD>
-				<TD width="200" align="right"><FONT class="guest_header">$date_time&nbsp;&nbsp;</FONT></TD>
+				<TD width="200"><div class="guest_header">&nbsp;&nbsp;Hallo
+				$username!</div></TD>
+				<TD align="center"><div class="guest_header">{!SLOGAN!}</div></TD>
+				<TD width="200" align="right"><div class="guest_header">$date_time&nbsp;&nbsp;</div></TD>
 			</TR>
 		</TABLE>
 		<!-- Bis hier Kopf! --></TD>
diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl
index 0dfee740af..500fa2b64f 100644
--- a/templates/de/html/guest/guest_login.tpl
+++ b/templates/de/html/guest/guest_login.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=index&amp;what=login"
+<form action="{!URL!}/modules.php?module=index&amp;what=login"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="guest_login dashed" width="480">
@@ -7,7 +7,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="7" align="center" class="guest_login_header"><STRONG>{--GUEST_WELCOME_MEMBER--}</STRONG>
+		<TD colspan="7" align="center" class="guest_login_header"><strong>{--GUEST_WELCOME_MEMBER--}</strong>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -35,22 +35,22 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD colspan="3" align="right">{--GUEST_SELECT_LIFETIME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="3"><SELECT name="lifetime" size="1"
+		<TD colspan="3"><select name="lifetime" size="1"
 			class="guest_select">
-			<OPTION value="3600">1 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="7200">2 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="21600">6 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="43200">12 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="86400">1 {--LIFE_DAYS--}</OPTION>
-			<OPTION value="172800">2 {--LIFE_DAYS--}</OPTION>
-			<OPTION value="604800">1 {--LIFE_WEEKS--}</OPTION>
-			<OPTION value="1209600">2 {--LIFE_WEEKS--}</OPTION>
-			<OPTION value="2592000">1 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="5184000">2 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="15552000">6 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="31536000">1 {--LIFE_YEARS--}</OPTION>
-			<OPTION value="60">{--LIFE_CLOSE_BROWSER--}</OPTION>
-		</SELECT></TD>
+			<option value="3600">1 {--LIFE_HOURS--}</option>
+			<option value="7200">2 {--LIFE_HOURS--}</option>
+			<option value="21600">6 {--LIFE_HOURS--}</option>
+			<option value="43200">12 {--LIFE_HOURS--}</option>
+			<option value="86400">1 {--LIFE_DAYS--}</option>
+			<option value="172800">2 {--LIFE_DAYS--}</option>
+			<option value="604800">1 {--LIFE_WEEKS--}</option>
+			<option value="1209600">2 {--LIFE_WEEKS--}</option>
+			<option value="2592000">1 {--LIFE_MONTHS--}</option>
+			<option value="5184000">2 {--LIFE_MONTHS--}</option>
+			<option value="15552000">6 {--LIFE_MONTHS--}</option>
+			<option value="31536000">1 {--LIFE_YEARS--}</option>
+			<option value="60">{--LIFE_CLOSE_BROWSER--}</option>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -68,9 +68,9 @@
 		<TD colspan="9" height="3" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
-<br />
-<FORM action="{!URL!}/modules.php?module=index&amp;what=login"
+</form>
+
+<form action="{!URL!}/modules.php?module=index&amp;what=login"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="guest_login dashed">
@@ -79,7 +79,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="3" align="center" class="guest_login_header"><STRONG>{--GUEST_GET_NEW_PASS--}</STRONG>
+		<TD colspan="3" align="center" class="guest_login_header"><strong>{--GUEST_GET_NEW_PASS--}</strong>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -91,7 +91,7 @@
 		<TD width="145" align="right">{--GUEST_ENTER_LOGIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="145"><INPUT type="text" name="id" class="guest_normal"
-			size="4" maxlength="9" />&nbsp;&nbsp;<STRONG>{--_OR--}</STRONG></TD>
+			size="4" maxlength="9" />&nbsp;&nbsp;<strong>{--_OR--}</strong></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -120,4 +120,4 @@
 		<TD colspan="5" height="3" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_menu_whats.tpl b/templates/de/html/guest/guest_menu_whats.tpl
index 693c056578..d120457c3b 100644
--- a/templates/de/html/guest/guest_menu_whats.tpl
+++ b/templates/de/html/guest/guest_menu_whats.tpl
@@ -1,3 +1,3 @@
 <TR>
-	<TD class="guest_menu_whats">&nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;&nbsp;$content</TD>
+	<TD class="guest_menu_whats">&nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;&nbsp;$content</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl
index bce02c644b..b8a1c4def5 100644
--- a/templates/de/html/guest/guest_nickname_login.tpl
+++ b/templates/de/html/guest/guest_nickname_login.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=index&amp;what=login"
+<form action="{!URL!}/modules.php?module=index&amp;what=login"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="guest_table dashed" width="540">
 	<TR>
 		<TD width="10" class="guest_title2 bottom2 seperator" height="30">&nbsp;</TD>
-		<TD colspan="8" class="guest_title2 bottom2"><STRONG>{--GUEST_WELCOME_MEMBER--}</STRONG>
+		<TD colspan="8" class="guest_title2 bottom2"><strong>{--GUEST_WELCOME_MEMBER--}</strong>
 		</TD>
 		<TD width="10" class="guest_title2 bottom2 seperator">&nbsp;</TD>
 	</TR>
@@ -32,22 +32,22 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD colspan="3" align="right">{--GUEST_SELECT_LIFETIME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="3"><SELECT name="lifetime" size="1"
+		<TD colspan="3"><select name="lifetime" size="1"
 			class="guest_select">
-			<OPTION value="3600">1 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="8200">2 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="21600">6 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="43200">12 {--LIFE_HOURS--}</OPTION>
-			<OPTION value="86400">1 {--LIFE_DAYS--}</OPTION>
-			<OPTION value="182800">2 {--LIFE_DAYS--}</OPTION>
-			<OPTION value="604800">1 {--LIFE_WEEKS--}</OPTION>
-			<OPTION value="1209600">2 {--LIFE_WEEKS--}</OPTION>
-			<OPTION value="2592000">1 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="5184000">2 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="15552000">6 {--LIFE_MONTHS--}</OPTION>
-			<OPTION value="31536000">1 {--LIFE_YEARS--}</OPTION>
-			<OPTION value="60">{--LIFE_CLOSE_BROWSER--}</OPTION>
-		</SELECT></TD>
+			<option value="3600">1 {--LIFE_HOURS--}</option>
+			<option value="8200">2 {--LIFE_HOURS--}</option>
+			<option value="21600">6 {--LIFE_HOURS--}</option>
+			<option value="43200">12 {--LIFE_HOURS--}</option>
+			<option value="86400">1 {--LIFE_DAYS--}</option>
+			<option value="182800">2 {--LIFE_DAYS--}</option>
+			<option value="604800">1 {--LIFE_WEEKS--}</option>
+			<option value="1209600">2 {--LIFE_WEEKS--}</option>
+			<option value="2592000">1 {--LIFE_MONTHS--}</option>
+			<option value="5184000">2 {--LIFE_MONTHS--}</option>
+			<option value="15552000">6 {--LIFE_MONTHS--}</option>
+			<option value="31536000">1 {--LIFE_YEARS--}</option>
+			<option value="60">{--LIFE_CLOSE_BROWSER--}</option>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -62,17 +62,15 @@
 		<TD width="10" class="guest_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<br />
-
-<FORM action="{!URL!}/modules.php?module=index&amp;what=login"
+<form action="{!URL!}/modules.php?module=index&amp;what=login"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
 	class="guest_table dashed" width="540">
 	<TR>
 		<TD width="10" class="guest_title2 bottom2 seperator">&nbsp;</TD>
-		<TD colspan="3" class="guest_title2 bottom2" height="30"><STRONG>{--GUEST_GET_NEW_PASS--}</STRONG>
+		<TD colspan="3" class="guest_title2 bottom2" height="30"><strong>{--GUEST_GET_NEW_PASS--}</strong>
 		</TD>
 		<TD width="10" class="guest_title2 bottom2 seperator">&nbsp;</TD>
 	</TR>
@@ -84,7 +82,7 @@
 		<TD width="145" align="right">{--GUEST_ENTER_LOGIN_NICKNAME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="145"><INPUT type="text" name="id" class="guest_normal"
-			size="10" maxlength="255">&nbsp;&nbsp;<STRONG>{--_OR--}</STRONG></TD>
+			size="10" maxlength="255">&nbsp;&nbsp;<strong>{--_OR--}</strong></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -110,4 +108,4 @@
 		<TD width="10" class="guest_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_no_rallyes.tpl b/templates/de/html/guest/guest_no_rallyes.tpl
index 5a7ca78804..971e3c5651 100644
--- a/templates/de/html/guest/guest_no_rallyes.tpl
+++ b/templates/de/html/guest/guest_no_rallyes.tpl
@@ -1,23 +1,23 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400"
 	class="guest_table dashed">
 	<TR>
-		<TD class="guest_title2 bottom2" height="25"><STRONG>Keine
-		Referal-Rallyes aktiv!</STRONG></TD>
+		<TD class="guest_title2 bottom2" height="25"><strong>Keine
+		Referal-Rallyes aktiv!</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" class="bottom2">
-		<DIV
+		<div
 			style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px"
 			align="center">Derzeit ist noch keine Rallye im Gange! Bitte
-		kommen Sie sp&auml;ter noch einmal wieder!</DIV>
+		kommen Sie sp&auml;ter noch einmal wieder!</div>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="guest_title2" height="25">
-		<DIV
+		<div
 			style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px"
 			align="center">&nbsp;<!-- Platz fuer Links, etc., dann aber das &nbsp; entfernen! -->
-		</DIV>
+		</div>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/guest/guest_rallye_expired_footer.tpl b/templates/de/html/guest/guest_rallye_expired_footer.tpl
index abf03262c1..2c2ce4712f 100644
--- a/templates/de/html/guest/guest_rallye_expired_footer.tpl
+++ b/templates/de/html/guest/guest_rallye_expired_footer.tpl
@@ -1,6 +1,7 @@
 <TR>
-	<TD colspan="4" class="guest_title2" height="25" align="center"><STRONG>{--RALLYE_HAPPY_WINNERS--}</STRONG>
+	<TD colspan="4" class="guest_title2" height="25" align="center">
+		<strong>{--RALLYE_HAPPY_WINNERS--}</strong>
 	</TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_rallye_expired_header.tpl b/templates/de/html/guest/guest_rallye_expired_header.tpl
index 14ef11c3c9..e469a32f65 100644
--- a/templates/de/html/guest/guest_rallye_expired_header.tpl
+++ b/templates/de/html/guest/guest_rallye_expired_header.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="530"
 	class="guest_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2" width="80" height="25"><STRONG>{--_RALLYE_PRICE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="50"><STRONG>{--_UID--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="200"><STRONG>{--RALLYE_GUEST_REFS--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="200"><STRONG>{--RALLYE_PRICE_IS--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="50"><strong>{--_UID--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="200"><strong>{--RALLYE_GUEST_REFS--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="200"><strong>{--RALLYE_PRICE_IS--}</strong></TD>
 	</TR>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_rallye_footer.tpl b/templates/de/html/guest/guest_rallye_footer.tpl
index 3c1919b201..8d3f45728b 100644
--- a/templates/de/html/guest/guest_rallye_footer.tpl
+++ b/templates/de/html/guest/guest_rallye_footer.tpl
@@ -1,11 +1,11 @@
 <TR>
 	<TD colspan="3" class="guest_title2" height="10" style="padding-top: 5px; padding-bottom: 5px">
-	<UL>
-		<LI><FONT class="guest_note">Es werden nur aktive User gewertet.</FONT></LI>
-		<LI><FONT class="guest_note">{!__RALLYE_MAX_USERS!}</FONT></LI>
-		<LI><FONT class="guest_note">{!__RALLYE_MIN_PRICES!}</FONT></LI>
-		<LI><FONT class="guest_note">Der Rechtsweg ist ausgeschlossen.</FONT></LI>
-	</UL>
+	<ul>
+		<li><div class="guest_note">Es werden nur aktive User gewertet.</div></li>
+		<li><div class="guest_note">{!__RALLYE_MAX_USERS!}</div></li>
+		<li><div class="guest_note">{!__RALLYE_MIN_PRICES!}</div></li>
+		<li><div class="guest_note">Der Rechtsweg ist ausgeschlossen.</div></li>
+	</ul>
 	</TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/guest/guest_rallye_header.tpl b/templates/de/html/guest/guest_rallye_header.tpl
index af9b835e50..bb91dc42fe 100644
--- a/templates/de/html/guest/guest_rallye_header.tpl
+++ b/templates/de/html/guest/guest_rallye_header.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="430"
 	class="guest_table dashed">
 	<TR>
-		<TD align="center" class="admin_title bottom2" width="80" height="25"><STRONG>{--_RALLYE_PRICE--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="50"><STRONG>{--_UID--}</STRONG></TD>
-		<TD align="center" class="admin_title bottom2" width="300"><STRONG>{--RALLYE_GUEST_REFS--}</STRONG></TD>
+		<TD align="center" class="admin_title bottom2" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="50"><strong>{--_UID--}</strong></TD>
+		<TD align="center" class="admin_title bottom2" width="300"><strong>{--RALLYE_GUEST_REFS--}</strong></TD>
 	</TR>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_rallye_show.tpl b/templates/de/html/guest/guest_rallye_show.tpl
index 9f5c5dc0f2..3adb264db8 100644
--- a/templates/de/html/guest/guest_rallye_show.tpl
+++ b/templates/de/html/guest/guest_rallye_show.tpl
@@ -1,57 +1,57 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%" class="guest_table dashed">
 	<TR>
 		<TD class="guest_title2 bottom2" height="25">
-			<STRONG>Referal-Rallye gestartet!</STRONG>
+			<strong>Referal-Rallye gestartet!</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="bottom2" align="left" style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
-		<UL>
-			<LI>Titel: <STRONG>{!__RALLYE_TITLE!}</STRONG></LI>
-			<LI>Start: <STRONG>{!__RALLYE_START!}</STRONG></LI>
-			<LI>Ende : <STRONG>{!__RALLYE_END!}</STRONG></LI>
-		</UL>
+		<ul>
+			<li>Titel: <strong>{!__RALLYE_TITLE!}</strong></li>
+			<li>Start: <strong>{!__RALLYE_START!}</strong></li>
+			<li>Ende : <strong>{!__RALLYE_END!}</strong></li>
+		</ul>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="guest_title2 bottom2" height="25">
-			<STRONG>...::&nbsp;{!__RALLYE_TITLE!}&nbsp;::...</STRONG>
+			<strong>...::&nbsp;{!__RALLYE_TITLE!}&nbsp;::...</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="bottom2">
-		<DIV
+		<div
 			style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-		{!__RALLYE_DESCR!}</DIV>
+		{!__RALLYE_DESCR!}</div>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2" height="25"><STRONG>{!__RALLYE_CAN_WIN_THIS!}:</STRONG>
+		<TD class="guest_title2 bottom2" height="25"><strong>{!__RALLYE_CAN_WIN_THIS!}:</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="bottom2">
-		<DIV
+		<div
 			style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
-		{!__RALLYE_PRICES!}</DIV>
+		{!__RALLYE_PRICES!}</div>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2" height="25"><STRONG>Aktueller
-		Stand der Rallye:</STRONG></TD>
+		<TD class="guest_title2 bottom2" height="25"><strong>Aktueller
+		Stand der Rallye:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="bottom2" align="center">
-		<DIV
+		<div
 			style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px"
-			align="center">{!__RALLYE_TOP_USERS!}</DIV>
+			align="center">{!__RALLYE_TOP_USERS!}</div>
 		</TD>
 	</TR>
 	<TR>
 		<TD class="guest_title2" height="25">
-		<DIV align="center" style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-			<STRONG>...::&nbsp;{!__RALLYE_EXTRAS!}&nbsp;::...</STRONG>
-		</DIV>
+		<div align="center" style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
+			<strong>...::&nbsp;{!__RALLYE_EXTRAS!}&nbsp;::...</strong>
+		</div>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/guest/guest_receive_table.tpl b/templates/de/html/guest/guest_receive_table.tpl
index 6c06c4997f..1db0e2b40a 100644
--- a/templates/de/html/guest/guest_receive_table.tpl
+++ b/templates/de/html/guest/guest_receive_table.tpl
@@ -2,10 +2,10 @@
 	class="register_header dashed">
 	<TR>
 		<TD width="60%" align="right" height="40" class="register_left">
-		<STRONG>{--MAX_PER_DAY--}:</STRONG>&nbsp;&nbsp;</TD>
-		<TD width="40%" class="register_right"><SELECT name="max_mails"
+		<strong>{--MAX_PER_DAY--}:</strong>&nbsp;&nbsp;</TD>
+		<TD width="40%" class="register_right"><select name="max_mails"
 			size="1" class="register_select">
 			{!__MAX_RECEIVE_OPTIONS!}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 2f5b22a980..488c5147cf 100644
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -1,5 +1,5 @@
-<FORM action="{!URL!}/modules.php?module=index&amp;what=register" method="POST" name="register">
-<DIV align="center">
+<form action="{!URL!}/modules.php?module=index&amp;what=register" method="POST" name="register">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="640"
 	class="guest_table dashed">
 	<TR>
@@ -19,12 +19,12 @@
 			<TR>
 				<TD width="50%" class="register_left">
 				{--GUEST_GENDER--}{!MUST_GENDER!}:&nbsp;&nbsp;</TD>
-				<TD width="50%" class="register_right"><SELECT name="gender"
+				<TD width="50%" class="register_right"><select name="gender"
 					size="1" class="guest_select">
-					<OPTION value="M">{--GENDER_M--}</OPTION>
-					<OPTION value="F">{--GENDER_F--}</OPTION>
-					<OPTION value="C">{--GENDER_C--}</OPTION>
-				</SELECT></TD>
+					<option value="M">{--GENDER_M--}</option>
+					<option value="F">{--GENDER_F--}</option>
+					<option value="C">{--GENDER_C--}</option>
+				</select></TD>
 			</TR>
 			<TR>
 				<TD colspan="2" height="7" class="seperator">&nbsp;</TD>
@@ -83,7 +83,7 @@
 				<TD colspan="2" height="7" class="seperator">&nbsp;</TD>
 			</TR>
 			<TR>
-				<TD colspan="2" align="center"><STRONG class="guest_failed">{!MUST_MARKER!}&nbsp;:&nbsp;{--REGISTER_MUST_SET_NOTE--}</STRONG>
+				<TD colspan="2" align="center"><div class="guest_failed">{!MUST_MARKER!}&nbsp;:&nbsp;{--REGISTER_MUST_SET_NOTE--}</STRONG>
 				</TD>
 			</TR>
 		</TABLE>
@@ -135,7 +135,7 @@
 	<TR>
 		<TD colspan="2" class="guest_title2 bottom2" height="30">
 		{--TERMS_OF_USAGE--}:<br />
-		<SPAN class="guest_failed">{--YOU_FINALIZE--}</SPAN></TD>
+		<span class="guest_failed">{--YOU_FINALIZE--}</span></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="7" class="seperator">&nbsp;</TD>
@@ -158,5 +158,5 @@
 			value="{--SUBMIT_REGISTER--}" /></TD>
 	</TR>
 </TABLE>
-</DIV>
-</FORM>
\ No newline at end of file
+</div>
+</form>
\ No newline at end of file
diff --git a/templates/de/html/guest/guest_register_refid_hide.tpl b/templates/de/html/guest/guest_register_refid_hide.tpl
index dd219f69b6..0cb7832b2f 100644
--- a/templates/de/html/guest/guest_register_refid_hide.tpl
+++ b/templates/de/html/guest/guest_register_refid_hide.tpl
@@ -2,7 +2,7 @@
 	<TD align="right" width="50%" class="register_left">
 		{--REFID_BY--}:&nbsp;&nbsp;</TD>
 	<TD width="50%" class="register_right">
-		<STRONG>$content</STRONG>
+		<strong>$content</strong>
 		<INPUT type="hidden" name="refid" value="$content" />
 	</TD>
 </TR>
diff --git a/templates/de/html/guest/guest_sponsor_act_row.tpl b/templates/de/html/guest/guest_sponsor_act_row.tpl
index e1419fb763..52e98d9edf 100644
--- a/templates/de/html/guest/guest_sponsor_act_row.tpl
+++ b/templates/de/html/guest/guest_sponsor_act_row.tpl
@@ -1,6 +1,6 @@
 <TR>
   <TD align="right" class="switch_sw$content[sw] bottom2 right2" width="225">$content[title]:&nbsp;</TD>
   <TD class="guest_title2 bottom2" style="padding-left: 2px; padding-right: 2px" width="225">
-    <FONT class="nobr"><STRONG>1 {!POINTS!}</STRONG> = <STRONG>$content[conv] $content[name]</STRONG></FONT>
+    <div class="nobr"><strong>1 {!POINTS!}</strong> = <strong>$content[conv] $content[name]</strong></div>
   </TD>
 </TR>
diff --git a/templates/de/html/guest/guest_sponsor_activate.tpl b/templates/de/html/guest/guest_sponsor_activate.tpl
index ed390cd74a..0f52739fc0 100644
--- a/templates/de/html/guest/guest_sponsor_activate.tpl
+++ b/templates/de/html/guest/guest_sponsor_activate.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=activate" method="POST">
+<div align="center">
+<form action="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=activate" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="400">
 <TR>
   <TD class="guest_title2 bottom2" align="center" height="30" colspan="2">
-    <STRONG>{--SPONSOR_SEND_ACTIVATION_LINK--}</STRONG>
+    <strong>{--SPONSOR_SEND_ACTIVATION_LINK--}</strong>
   </TD>
 </TR>
 <TD colspan="2" height="5" class="seperator">&nbsp;</TD></TR>
@@ -24,19 +24,19 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
 
-<DIV align="center">
-  <FONT class="guest_note">{--SPONSOR_HOWTO_GET_ACTIVATION_LINK--}</FONT>
-</DIV>
+<div align="center">
+  <div class="guest_note">{--SPONSOR_HOWTO_GET_ACTIVATION_LINK--}</div>
+</div>
 <br />
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table" width="100%">
 <TR>
   <TD align="center" height="30">
-    &raquo;&raquo;&nbsp;<A href="{!URL!}/modules.php?module=index&amp;what=sponsor_login">{--SPONSOR_BACK_TO_LOGIN--}</A><br />
+    &raquo;&raquo;&nbsp;<a href="{!URL!}/modules.php?module=index&amp;what=sponsor_login">{--SPONSOR_BACK_TO_LOGIN--}</a><br />
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl
index a6fc7ee7e8..ad35329f5c 100644
--- a/templates/de/html/guest/guest_sponsor_infos.tpl
+++ b/templates/de/html/guest/guest_sponsor_infos.tpl
@@ -1,8 +1,8 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="550">
 <TR>
   <TD class="guest_title bottom2">
-    <STRONG class="big">{--GUEST_SPONSOR_WANT_BECOME_HEADER--}</STRONG><br />
+    <div class="big">{--GUEST_SPONSOR_WANT_BECOME_HEADER--}</STRONG><br />
     {--GUEST_SPONSOR_INFOS_PRICING_HEADER--}
   </TD>
 </TR>
@@ -20,7 +20,7 @@
     <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="450">
     <TR>
       <TD colspan="2" align="center" class="guest_title2 bottom2" height="30">
-        <STRONG>{--GUEST_SPONSOR_ACTIONS_HEADER--}</STRONG>
+        <strong>{--GUEST_SPONSOR_ACTIONS_HEADER--}</strong>
       </TD>
     </TR>
 {!__SPONSOR_ACTIONS!}
@@ -29,4 +29,4 @@
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl
index 584251dfac..e18403fc5f 100644
--- a/templates/de/html/guest/guest_sponsor_login.tpl
+++ b/templates/de/html/guest/guest_sponsor_login.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=index&amp;what=sponsor_login" method="POST">
+<div align="center">
+<form action="{!URL!}/modules.php?module=index&amp;what=sponsor_login" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="400">
 <TR>
   <TD class="guest_title2 bottom2" align="center" height="30" colspan="2">
-    <STRONG>{--SPONSOR_LOGIN_WELCOME--}</STRONG>
+    <strong>{--SPONSOR_LOGIN_WELCOME--}</strong>
   </TD>
 </TR>
 <TD colspan="2" height="5" class="seperator">&nbsp;</TD></TR>
@@ -31,22 +31,22 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
 
 <br />
 
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table" width="100%">
 <TR>
   <TD align="center" height="30">
-    &raquo;&raquo;&nbsp;<A href="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass">{--SPONSOR_PASSWORD_LOST--}</A>
+    &raquo;&raquo;&nbsp;<a href="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass">{--SPONSOR_PASSWORD_LOST--}</a>
   </TD>
 </TR>
 <TR>
   <TD align="center" height="30">
-    &raquo;&raquo;&nbsp;<A href="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=activate">{--SPONSOR_ACTIVATION_LINK_LOST--}</A><br />
+    &raquo;&raquo;&nbsp;<a href="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=activate">{--SPONSOR_ACTIVATION_LINK_LOST--}</a><br />
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_sponsor_lost.tpl b/templates/de/html/guest/guest_sponsor_lost.tpl
index 4062b620cb..8c97b773b0 100644
--- a/templates/de/html/guest/guest_sponsor_lost.tpl
+++ b/templates/de/html/guest/guest_sponsor_lost.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass" method="POST">
+<div align="center">
+<form action="{!URL!}/modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="400">
 <TR>
   <TD class="guest_title2 bottom2" align="center" height="30" colspan="2">
-    <STRONG>{--SPONSOR_SEND_LOST_PASSWORD--}</STRONG>
+    <strong>{--SPONSOR_SEND_LOST_PASSWORD--}</strong>
   </TD>
 </TR>
 <TD colspan="2" height="5" class="seperator">&nbsp;</TD></TR>
@@ -32,19 +32,19 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
 
-<DIV align="center">
-  <FONT class="guest_note">{--SPONSOR_HOWTO_GET_LOST_PASSWORD--}</FONT>
-</DIV>
+<div align="center">
+  <div class="guest_note">{--SPONSOR_HOWTO_GET_LOST_PASSWORD--}</div>
+</div>
 <br />
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table" width="100%">
 <TR>
   <TD align="center" height="30">
-    &raquo;&raquo;&nbsp;<A href="{!URL!}/modules.php?module=index&amp;what=sponsor_login">{--SPONSOR_BACK_TO_LOGIN--}</A><br />
+    &raquo;&raquo;&nbsp;<a href="{!URL!}/modules.php?module=index&amp;what=sponsor_login">{--SPONSOR_BACK_TO_LOGIN--}</a><br />
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/guest/guest_sponsor_pay_row.tpl b/templates/de/html/guest/guest_sponsor_pay_row.tpl
index 8d77f2d867..d6631bc625 100644
--- a/templates/de/html/guest/guest_sponsor_pay_row.tpl
+++ b/templates/de/html/guest/guest_sponsor_pay_row.tpl
@@ -1,17 +1,17 @@
 <TR>
   <TD align="center" colspan="2" height="30" class="guest_title2 bottom2">
-    <STRONG>$content[name]:</STRONG>
+    <strong>$content[name]:</strong>
   </TD>
 </TR>
 <TR>
   <TD align="right" class="switch_sw$content[sw] right2" width="225" height="24">{--SPONSOR_PAYTYPE_COUNT--}:&nbsp;</TD>
   <TD class="guest_title2 bottom2" style="padding-left: 2px; padding-right: 2px" width="225">
-    <FONT class="nobr"><STRONG>$content[rate] {!POINTS!}</STRONG></FONT>
+    <div class="nobr"><strong>$content[rate] {!POINTS!}</strong></div>
   </TD>
 </TR>
 <TR>
   <TD align="right" class="switch_sw$content[sw] bottom2 right2" width="225" height="24">{--SPONSOR_PAYTYPE_VALUE--}:&nbsp;</TD>
   <TD class="guest_title2 bottom2" style="padding-left: 2px; padding-right: 2px" width="225">
-    <FONT class="nobr"><STRONG>$content[price] $content[curr]</STRONG></FONT>
+    <div class="nobr"><strong>$content[price] $content[curr]</strong></div>
   </TD>
 </TR>
diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 855899924b..93456548be 100644
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -1,5 +1,5 @@
 {!__SPONSOR_FORM_ERRORS!}
-<DIV align="center"><STRONG class="big">{--GUEST_SPONSOR_TITLE--}</STRONG></DIV>
+<div align="center"><div class="big">{--GUEST_SPONSOR_TITLE--}</STRONG></div>
 <br />
 {--GUEST_SPONSOR_TEASER_1--}<br />
 <br />
@@ -7,19 +7,19 @@
 <br />
 {--GUEST_SPONSOR_TEASER_3--}<br />
 <br />
-<FORM action="{!URL!}/modules.php?module=index&amp;what=sponsor_reg" method="POST">
+<form action="{!URL!}/modules.php?module=index&amp;what=sponsor_reg" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="guest_table dashed" width="530">
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_ENTER_COMPANY_DATA--}</STRONG>
+    <strong>{--SPONSOR_ENTER_COMPANY_DATA--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
 <TR>
   <TD class="bottom2" width="10" height="40">&nbsp;</TD>
   <TD class="bottom2" colspan="3" align="center">
-    <FONT class="guest_note">{--SPONSOR_COMPANY_NOTE--}</FONT>
+    <div class="guest_note">{--SPONSOR_COMPANY_NOTE--}</div>
   </TD>
   <TD class="bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -63,7 +63,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_ENTER_PERSONA_DATA--}</STRONG>
+    <strong>{--SPONSOR_ENTER_PERSONA_DATA--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -75,11 +75,11 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="gender" class="guest_select" size="1">
-      <OPTION value="M"{!__GENDER_M!}>{--GENDER_M--}</OPTION>
-      <OPTION value="F"{!__GENDER_F!}>{--GENDER_F--}</OPTION>
-      <OPTION value="C"{!__GENDER_C!}>{--GENDER_C--}</OPTION>
-    </SELECT>
+    <select name="gender" class="guest_select" size="1">
+      <option value="M"{!__GENDER_M!}>{--GENDER_M--}</option>
+      <option value="F"{!__GENDER_F!}>{--GENDER_F--}</option>
+      <option value="C"{!__GENDER_C!}>{--GENDER_C--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -111,7 +111,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_ENTER_CONTACT_DATA--}</STRONG>
+    <strong>{--SPONSOR_ENTER_CONTACT_DATA--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -216,7 +216,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_ENTER_PASSWORDS--}</STRONG>
+    <strong>{--SPONSOR_ENTER_PASSWORDS--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -237,7 +237,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_REFERRAL--}</STRONG>
+    <strong>{--SPONSOR_REFERRAL--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -249,7 +249,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <STRONG>{!__SPONSOR_REFID!}</STRONG>
+    <strong>{!__SPONSOR_REFID!}</strong>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -257,7 +257,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_WARNINGS--}</STRONG>
+    <strong>{--SPONSOR_WARNINGS--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -269,10 +269,10 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="receive_warnings" class="guest_select" size="1">
-      <OPTION value="Y"{!__REC_Y!} />{--YES--}</OPTION>
-      <OPTION value="N"{!__REC_N!} />{--NO--}</OPTION>
-    </SELECT>
+    <select name="receive_warnings" class="guest_select" size="1">
+      <option value="Y"{!__REC_Y!} />{--YES--}</option>
+      <option value="N"{!__REC_N!} />{--NO--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -284,15 +284,15 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="warning_interval" class="guest_select" size="1">
-      <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
-    </SELECT>
+    <select name="warning_interval" class="guest_select" size="1">
+      <option value="0">{--SELECT_NONE--}</option>
+      <option value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</option>
+    </select>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -300,7 +300,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_PAYMENTS--}</STRONG>
+    <strong>{--SPONSOR_PAYMENTS--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -320,7 +320,7 @@
 <TR>
   <TD class="guest_title2 bottom2" width="10" height="30">&nbsp;</TD>
   <TD class="guest_title2 bottom2" colspan="3" align="center">
-    <STRONG>{--SPONSOR_TERMS_HEADER--}</STRONG>
+    <strong>{--SPONSOR_TERMS_HEADER--}</strong>
   </TD>
   <TD class="guest_title2 bottom2" width="10">&nbsp;</TD>
 </TR>
@@ -347,4 +347,4 @@
   <TD class="guest_footer seperator" width="10">&nbsp;</TD>
 </TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/guest/guest_stats_member.tpl b/templates/de/html/guest/guest_stats_member.tpl
index 93d8c4990e..3a043db006 100644
--- a/templates/de/html/guest/guest_stats_member.tpl
+++ b/templates/de/html/guest/guest_stats_member.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="guest_stats dashed">
 	<TR>
-		<TD align="center" class="guest_stats_title bottom2" colspan="6"><STRONG>{--GUEST_STATS--}</STRONG></TD>
+		<TD align="center" class="guest_stats_title bottom2" colspan="6"><strong>{--GUEST_STATS--}</strong></TD>
 	</TR>
 	<TR>
 		<TD class="guest_stats_l bottom2">{--USERS_TOTAL--}:</TD>
@@ -36,16 +36,16 @@
 		<TD class="guest_stats_r bottom2">{!__YREG_COUNT!}</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="guest_stats_title bottom2" colspan="6"><STRONG>{--GUEST_STATS_MONTHLY--}</STRONG></TD>
+		<TD align="center" class="guest_stats_title bottom2" colspan="6"><strong>{--GUEST_STATS_MONTHLY--}</strong></TD>
 	</TR>
 	{!__MONTH_STATS_ROWS!}
 	<TR>
-		<TD align="center" class="guest_stats_title bottom2" colspan="6"><STRONG>{--GUEST_STATS_CATS--}</STRONG></TD>
+		<TD align="center" class="guest_stats_title bottom2" colspan="6"><strong>{--GUEST_STATS_CATS--}</strong></TD>
 	</TR>
 	{!__CATS_STATS_ROWS!}
 	<TR>
-		<TD align="center" class="guest_stats_footer" colspan="6"><A
-			href="{!URL!}/modules.php?module=index&amp;what=stats&amp;mode={!__LMODE_VALUE!}">{!__LINK_TITLE!}</A>
+		<TD align="center" class="guest_stats_footer" colspan="6"><a
+			href="{!URL!}/modules.php?module=index&amp;what=stats&amp;mode={!__LMODE_VALUE!}">{!__LINK_TITLE!}</a>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl
index 4d1b67c120..0a14cd229e 100644
--- a/templates/de/html/guest/guest_top10.tpl
+++ b/templates/de/html/guest/guest_top10.tpl
@@ -1,83 +1,83 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%"
 	class="guest_table dashed">
 	<TR>
-		<TD colspan="5" class="guest_title2 bottom2" height="30"><STRONG>{--GUEST_TOP10_LOGIN_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_LOGIN_HEADER_2--}</STRONG>
+		<TD colspan="5" class="guest_title2 bottom2" height="30"><strong>{--GUEST_TOP10_LOGIN_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_LOGIN_HEADER_2--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOP10_RANKING--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOP10_RANKING--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--_UID--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--_UID--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_LOGINS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_LOGINS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_POINTS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_POINTS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="guest_title2 bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__TOP_LOGINS_ROWS!}
 	<TR>
 		<TD colspan="5" align="center" class="guest_footer" height="30">
-		<FONT class="member_note tiny">{--GUEST_TOP10_LOGIN_FOOTER--}</FONT></TD>
+		<div class="member_note tiny">{--GUEST_TOP10_LOGIN_FOOTER--}</div></TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
 
 <br />
 
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%"
 	class="guest_table dashed">
 	<TR>
-		<TD colspan="4" class="guest_title2 bottom2" height="30"><STRONG>{--GUEST_TOP10_POINTS_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_POINTS_HEADER_2--}</STRONG>
+		<TD colspan="4" class="guest_title2 bottom2" height="30"><strong>{--GUEST_TOP10_POINTS_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_POINTS_HEADER_2--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOP10_RANKING--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOP10_RANKING--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--_UID--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--_UID--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_POINTS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_POINTS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="guest_title2 bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__TOP_POINTS_ROWS!}
 	<TR>
 		<TD colspan="5" align="center" class="guest_footer" height="30">
-		<FONT class="member_note tiny">{--GUEST_TOP10_POINTS_FOOTER--}</FONT>
+		<div class="member_note tiny">{--GUEST_TOP10_POINTS_FOOTER--}</div>
 		</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
 
 <br />
 
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="90%"
 	class="guest_table dashed">
 	<TR>
-		<TD colspan="5" class="guest_title2 bottom2" height="30"><STRONG>{--GUEST_TOP10_REFS_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_REFS_HEADER_2--}</STRONG>
+		<TD colspan="5" class="guest_title2 bottom2" height="30"><strong>{--GUEST_TOP10_REFS_HEADER_1--}{!__TOP10_MAX!}&nbsp;-&nbsp;{--GUEST_TOP10_REFS_HEADER_2--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOP10_RANKING--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOP10_RANKING--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--_UID--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--_UID--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_REFERRALS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_REFERRALS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2 right2"><STRONG>{--TOTAL_POINTS--}:</STRONG>
+		<TD class="guest_title2 bottom2 right2"><strong>{--TOTAL_POINTS--}:</strong>
 		</TD>
-		<TD class="guest_title2 bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG>
+		<TD class="guest_title2 bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong>
 		</TD>
 	</TR>
 	{!__TOP_REFERRAL_ROWS!}
 	<TR>
 		<TD colspan="5" align="center" class="guest_footer" height="30">
-		<FONT class="member_note tiny">{--GUEST_TOP10_REFS_FOOTER--}</FONT></TD>
+		<div class="member_note tiny">{--GUEST_TOP10_REFS_FOOTER--}</div></TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/impressum.tpl b/templates/de/html/impressum.tpl
index 6da43b1993..a29df45f77 100644
--- a/templates/de/html/impressum.tpl
+++ b/templates/de/html/impressum.tpl
@@ -1,7 +1,7 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0">
 	<TR>
-		<TD colspan="3" class="impressum_header"><STRONG><U>Impressum</U></STRONG></TD>
+		<TD colspan="3" class="impressum_header"><strong><u>Impressum</u></strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="impressum_body">&nbsp;</TD>
@@ -14,7 +14,7 @@
 		<br />
 		Tel.: +49(0)-123-456789<br />
 		<br />
-		Email: <A href="mailto:{!WEBMASTER!}">{!WEBMASTER!}</A><br />
+		Email: <a href="mailto:{!WEBMASTER!}">{!WEBMASTER!}</a><br />
 		<br />
 		</TD>
 		<TD class="impressum_body" width="5">&nbsp;</TD>
@@ -23,4 +23,4 @@
 		<TD colspan="3" class="impressum_body">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/index.tpl b/templates/de/html/index.tpl
index 3409b35e2b..f95cc33178 100644
--- a/templates/de/html/index.tpl
+++ b/templates/de/html/index.tpl
@@ -1,41 +1,41 @@
-<A name="TOP"></A>
+<a name="TOP"></a>
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
 	class="guest_table" height="100%">
 	<TR>
 		<TD align="center" height="65%">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
-				<TD align="center"><A target="_parent"
+				<TD align="center"><a target="_parent"
 					href="{!URL!}/modules.php?module=index&amp;what=welcome$content">
 				<!-- <IMG src="{!THEME_URL!}/images/index_logo.jpg" alt="{!MAIN_TITLE!}" title="{!MAIN_TITLE!}" border="0"> //-->
-				<FONT class="big">{!MAIN_TITLE!}</FONT> </A></TD>
+				<div class="big">{!MAIN_TITLE!}</div> </a></TD>
 			</TR>
 			<TR>
 				<TD align="center" height="30" class="seperator">&nbsp;</TD>
 			</TR>
 			<TR>
-				<TD align="center"><FONT class="medium">{!SLOGAN!}</FONT></TD>
+				<TD align="center"><div class="medium">{!SLOGAN!}</div></TD>
 			</TR>
 		</TABLE>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" height="26%"><FONT class="big">[&nbsp;<A
+		<TD align="center" height="26%"><div class="big">[&nbsp;<a
 			target="_parent"
-			href="{!URL!}/modules.php?module=index&amp;what=welcome$content">Weiter...</A>&nbsp;]</FONT>
+			href="{!URL!}/modules.php?module=index&amp;what=welcome$content">Weiter...</a>&nbsp;]</div>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" valign="bottom" height="9%"><FONT class="tiny">
-		<STRONG><U>Impressum:</U></STRONG><br />
+		<TD align="center" valign="bottom" height="9%"><div class="tiny">
+		<strong><u>Impressum:</u></strong><br />
 		<P>Ihr Name hier, Ihre Stra&szlig;e, X-12345 Demo-Stadt<br />
-		Tel.: 01234-56789-0, Email: <A
-			href="mailto:mail_NO_SPAM_@_NO_SPAM_provider.de">Webmaster</A></P>
+		Tel.: 01234-56789-0, Email: <a
+			href="mailto:mail_NO_SPAM_@_NO_SPAM_provider.de">Webmaster</a></P>
 		<P>Weitere Angaben? ...</P>
 		<P>Gelinkte Seiten, die sich ausserhalb von {!URL!} befinden,
 		mache ich mich nicht mit verantwortlich und distanziere mich hiermit
-		ausdr&uuml;cklich von diesen und deren Inhalten! Bitte beachte den <A
-			href="" target="_blank">Disclaimer</A>!<br />
-		</FONT></TD>
+		ausdr&uuml;cklich von diesen und deren Inhalten! Bitte beachte den <a
+			href="" target="_blank">Disclaimer</a>!<br />
+		</div></TD>
 	</TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/install/install_fatal_row.tpl b/templates/de/html/install/install_fatal_row.tpl
index 1a176abb29..a3d9313121 100644
--- a/templates/de/html/install/install_fatal_row.tpl
+++ b/templates/de/html/install/install_fatal_row.tpl
@@ -1,2 +1,2 @@
-<DIV class="install_fatalcontent"><STRONG>{--FATAL_NO--}$content[key]:</STRONG><br />
-&nbsp;&nbsp;&nbsp;<STRONG>&middot;</STRONG>&nbsp;$content[value]</DIV>
+<div class="install_fatalcontent"><strong>{--FATAL_NO--}$content[key]:</strong><br />
+&nbsp;&nbsp;&nbsp;<strong>&middot;</strong>&nbsp;$content[value]</div>
diff --git a/templates/de/html/install/install_fatal_table.tpl b/templates/de/html/install/install_fatal_table.tpl
index 016f69726e..a46c8e81f6 100644
--- a/templates/de/html/install/install_fatal_table.tpl
+++ b/templates/de/html/install/install_fatal_table.tpl
@@ -1,5 +1,5 @@
-<DIV align="center">
-<DIV class="install_fatal">
-<DIV class="fatal_title">{--INSTALL_PROBLEMS_DETECTED--}</DIV>
-$content</DIV>
-</DIV>
+<div align="center">
+<div class="install_fatal">
+<div class="fatal_title">{--INSTALL_PROBLEMS_DETECTED--}</div>
+$content</div>
+</div>
diff --git a/templates/de/html/install/install_finished.tpl b/templates/de/html/install/install_finished.tpl
index 8b2f148de2..ec1e936b2c 100644
--- a/templates/de/html/install/install_finished.tpl
+++ b/templates/de/html/install/install_finished.tpl
@@ -1,8 +1,8 @@
-<SPAN class="install_finished">{--INSTALL_FINISHED--}</SPAN><br />
+<span class="install_finished">{--INSTALL_FINISHED--}</span><br />
 <br />
-<SPAN class="install_security">{--INSTALL_FIN_SECU--}</SPAN><br />
+<span class="install_security">{--INSTALL_FIN_SECU--}</span><br />
 <br />
-<FORM action="modules.php" method="GET">
+<form action="modules.php" method="GET">
   <INPUT type="hidden" name="module" value="admin" />
   <INPUT type="submit" class="admin_submit submit" value="{--CONTINUE_ADMIN--}" class="install_submit" />
-</FORM>
+</form>
diff --git a/templates/de/html/install/install_footer.tpl b/templates/de/html/install/install_footer.tpl
index 84f3b49158..27c0002c86 100644
--- a/templates/de/html/install/install_footer.tpl
+++ b/templates/de/html/install/install_footer.tpl
@@ -1,5 +1,4 @@
-
-</DIV>
+</div>
 </TD>
 </TR>
 </TABLE>
\ No newline at end of file
diff --git a/templates/de/html/install/install_header.tpl b/templates/de/html/install/install_header.tpl
index 561fe1a0b8..d2ed7ac1b8 100644
--- a/templates/de/html/install/install_header.tpl
+++ b/templates/de/html/install/install_header.tpl
@@ -1,12 +1,12 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="install_main"
 	width="100%">
 	<TR>
-		<TD align="center" class="install_header"><STRONG>: : :
-		{--INSTALLATION--} : : :</STRONG></TD>
+		<TD align="center" class="install_header"><strong>: : :
+		{--INSTALLATION--} : : :</strong></TD>
 	</TR>
 	<TR>
 		<TD height="14" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD align="center">
-		<DIV align="center">
\ No newline at end of file
+		<div align="center">
\ No newline at end of file
diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl
index cd9e94a23a..c358dfbc19 100644
--- a/templates/de/html/install/install_page1.tpl
+++ b/templates/de/html/install/install_page1.tpl
@@ -1,9 +1,9 @@
-<FORM action="{!__BURL_ACTION!}/install.php?page=2" method="POST"
+<form action="{!__BURL_ACTION!}/install.php?page=2" method="POST"
 	target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="install_content">
 	<TR>
-		<TD colspan="3" align="center"><STRONG class="install">{--HEADER_TEXT_PAGE1--}</STRONG>
+		<TD colspan="3" align="center"><div class="install">{--HEADER_TEXT_PAGE1--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
@@ -11,8 +11,8 @@
 	</TR>
 	<TR>
 		<TD width="10" rowspan="12"></TD>
-		<TD colspan="2"><SPAN class="install_intro">
-		{--TEXT_PAGE_1--} </SPAN></TD>
+		<TD colspan="2"><span class="install_intro">
+		{--TEXT_PAGE_1--} </span></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
@@ -67,4 +67,4 @@
 		<TD colspan="3" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl
index b6f5972998..a03c8a312b 100644
--- a/templates/de/html/install/install_page2.tpl
+++ b/templates/de/html/install/install_page2.tpl
@@ -1,16 +1,16 @@
-<FORM action="{!__BURL_ACTION--}/install.php?page=3" method="POST"
+<form action="{!__BURL_ACTION--}/install.php?page=3" method="POST"
 	target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="install_table">
 	<TR>
-		<TD colspan="2" align="center"><STRONG class="install">{--HEADER_TEXT_PAGE2--}</STRONG>
+		<TD colspan="2" align="center"><div class="install">{--HEADER_TEXT_PAGE2--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD colspan="2"><SPAN class="install_intro">
-		{--TEXT_PAGE_2--} </SPAN></TD>
+		<TD colspan="2"><span class="install_intro">
+		{--TEXT_PAGE_2--} </span></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
@@ -77,4 +77,4 @@
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl
index e7db28b4c4..4927c289a7 100644
--- a/templates/de/html/install/install_page3.tpl
+++ b/templates/de/html/install/install_page3.tpl
@@ -1,15 +1,15 @@
-<FORM action="{!__BURL_ACTION--}/install.php?page=5" method="POST" target="_self">
+<form action="{!__BURL_ACTION--}/install.php?page=5" method="POST" target="_self">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="install_table">
 	<TR>
-		<TD colspan="2" align="center"><STRONG class="install">{--HEADER_TEXT_PAGE3--}</STRONG>
+		<TD colspan="2" align="center"><div class="install">{--HEADER_TEXT_PAGE3--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD colspan="2"><SPAN class="install_intro">
-		{--TEXT_PAGE_3--} </SPAN></TD>
+		<TD colspan="2"><span class="install_intro">
+		{--TEXT_PAGE_3--} </span></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
@@ -70,4 +70,4 @@
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/install/install_welcome.tpl b/templates/de/html/install/install_welcome.tpl
index 593c69f498..90c27d3365 100644
--- a/templates/de/html/install/install_welcome.tpl
+++ b/templates/de/html/install/install_welcome.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="install_content">
 	<TR>
-		<TD colspan="2" align="center"><STRONG class="install_welcome">{--WELCOME_TEXT--}</STRONG>
+		<TD colspan="2" align="center"><div class="install_welcome">{--WELCOME_TEXT--}</STRONG>
 		</TD>
 	</TR>
 	<TR>
@@ -9,17 +9,17 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SPAN class="install_intro"> {--INTRO_TEXT--} </SPAN></TD>
+		<TD><span class="install_intro"> {--INTRO_TEXT--} </span></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" height="21" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
 		<TD colspan="2" align="center">
-		<FORM action="install.php" method="GET" target="_self"><INPUT
+		<form action="install.php" method="GET" target="_self"><INPUT
 			type="hidden" name="page" value="1"> <INPUT type="submit"
 			class="admin_submit submit" value="{--NEXT_PAGE--}"
-			class="install_submit"></FORM>
+			class="install_submit"></form>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/lead_code.tpl b/templates/de/html/lead_code.tpl
index b6a4a0292a..16141e8b85 100644
--- a/templates/de/html/lead_code.tpl
+++ b/templates/de/html/lead_code.tpl
@@ -8,7 +8,7 @@ k&ouml;nnen jetzt unten fortfahren.</P>
 <!-- LEAD CODE AB HIER! //-->
 <!-- LEAD CODE BIS HIER! //-->
 
-<P align="center">[<A href="{!URL!}/modules.php?module=index">Weiter
-zur Eingangsseite</A>]&nbsp;|&nbsp;[<A
-	href="{!URL!}/modules.php?module=login">Weiter zum Loginbereich</A>]
+<P align="center">[<a href="{!URL!}/modules.php?module=index">Weiter
+zur Eingangsseite</a>]&nbsp;|&nbsp;[<a
+	href="{!URL!}/modules.php?module=login">Weiter zum Loginbereich</a>]
 </P>
diff --git a/templates/de/html/loader.tpl b/templates/de/html/loader.tpl
index ba74432b30..545250c735 100644
--- a/templates/de/html/loader.tpl
+++ b/templates/de/html/loader.tpl
@@ -1,11 +1,11 @@
-<BIG><STRONG>D&nbsp;E&nbsp;R&nbsp;E&nbsp;F&nbsp;E&nbsp;R&nbsp;R&nbsp;E&nbsp;R&nbsp;&nbsp;-&nbsp;&nbsp;{!MAIN_TITLE!}</STRONG></BIG>
+<BIG><strong>D&nbsp;E&nbsp;R&nbsp;E&nbsp;F&nbsp;E&nbsp;R&nbsp;R&nbsp;E&nbsp;R&nbsp;&nbsp;-&nbsp;&nbsp;{!MAIN_TITLE!}</strong></BIG>
 <br />
 <br />
 <br />
 <br />
 <br />
 {--LOADER_NOT_WORKING--} [
-<A href="{!__URL!}">{--LOADER_CLICK_HERE--}</A>
+<a href="{!__URL!}">{--LOADER_CLICK_HERE--}</a>
 ]
 <SCRIPT language="JavaScript" type="text/javascript">
 <!--
diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl
index dcd8fe0042..078ca2b911 100644
--- a/templates/de/html/mailid/mailid_confirm_buttom.tpl
+++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl
@@ -3,13 +3,13 @@
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="220" align="center">
-		<FORM
+		<form
 			action="{!URL!}/mailid_top.php?uid={!_UID_VALUE!}&amp;{!_TYPE_VALUE!}={!_DATA_VALUE!}&amp;mode=add&amp;code={!_CODE_VALUE!}"
 			method="POST" style="margin-bottom: 0px">
 		{--MAILID_CLICK_BUTTON--}:<br />
 		<INPUT type="hidden" name="gfx_check" value="{!__GFX_CODE!}">
 		<INPUT type="submit" class="member_submit" name="ok"
-			value="{--SUBMIT_CODE--}"></FORM>
+			value="{--SUBMIT_CODE--}"></form>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl
index f90ecdef64..2e830c67cd 100644
--- a/templates/de/html/mailid/mailid_enter_code.tpl
+++ b/templates/de/html/mailid/mailid_enter_code.tpl
@@ -3,13 +3,13 @@
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD width="220" align="center">
-		<FORM
+		<form
 			action="{!URL!}/mailid_top.php?uid={!_UID_VALUE!}&amp;{!_TYPE_VALUE!}={!_DATA_VALUE!}&amp;mode=add&amp;code={--_CODE_VALUE!}"
 			method="POST" style="margin-bottom: 0px">{--ENTER_CODE--}:
 		{--_IMAGE_CODE--}<br />
 		<INPUT type="text" name="gfx_check" class="member_normal" size="5"
 			maxlength="45"> <INPUT type="submit" class="member_submit"
-			name="ok" value="{--SUBMIT_CODE--}"></FORM>
+			name="ok" value="{--SUBMIT_CODE--}"></form>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index e9355adee5..2bd8fb6682 100644
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -2,10 +2,10 @@
 	class="member_mailidtop">
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="220" align="center">{--THANX_POINTS_ADDED_1--}<STRONG
-			class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_ADDED_2--}<br />
-		{--MAILID_TOTAL_POINTS1--} <STRONG class="member_done">{!__TOTAL_POINTS!}
-		{!POINTS!}</STRONG> {--MAILID_TOTAL_POINTS2--}</TD>
+		<TD width="220" align="center">{--THANX_POINTS_ADDED_1--}<strong
+			class="member_done">{--_POINTS_VALUE!}</strong>&nbsp;{--THANX_POINTS_ADDED_2--}<br />
+		{--MAILID_TOTAL_POINTS1--} <div class="member_done">{!__TOTAL_POINTS!}
+		{!POINTS!}</strong> {--MAILID_TOTAL_POINTS2--}</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
 		<TABLE border="0" cellspacing="0" cellpadding="0"
diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index 7002970ed7..cce8b57c75 100644
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -3,14 +3,14 @@
 	class="member_mailidtop">
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="220" align="center"><FONT class="tiny">
-		{--THANX_POINTS_ADDED_1--}<STRONG class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_ADDED_2--}<br />
-		{--MAILID_TOTAL_POINTS1--} <STRONG class="member_done">{!__TOTAL_POINTS!}
+		<TD width="220" align="center"><div class="tiny">
+		{--THANX_POINTS_ADDED_1--}<div class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_ADDED_2--}<br />
+		{--MAILID_TOTAL_POINTS1--} <div class="member_done">{!__TOTAL_POINTS!}
 		{!POINTS!}</STRONG> {--MAILID_TOTAL_POINTS2--}<br />
 		<br />
-		<A
+		<a
 			href="{!URL!}/show_bonus.php?uid={!_UID_VALUE!}&amp;t={!_TYPE_VALUE!}&amp;d={!_DATA_VALUE!}"
-			target="_blank">{--BONUS_SHOW_TURBO_BONUS--} </FONT></TD>
+			target="_blank">{--BONUS_SHOW_TURBO_BONUS--} </div></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
 		<TABLE border="0" cellspacing="0" cellpadding="0"
diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl
index 6e3afe552a..2dc0ad5fe0 100644
--- a/templates/de/html/mailid/mailid_points_failed.tpl
+++ b/templates/de/html/mailid/mailid_points_failed.tpl
@@ -2,8 +2,8 @@
 	class="member_mailidtop">
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="220" align="center">{--POINTS_NOT_ADDED_1--}<STRONG
-			class="member_failed">{--_POINTS_VALUE!}</STRONG>&nbsp;{--POINTS_NOT_ADDED_2--}
+		<TD width="220" align="center">{--POINTS_NOT_ADDED_1--}<strong
+			class="member_failed">{--_POINTS_VALUE!}</strong>&nbsp;{--POINTS_NOT_ADDED_2--}
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index ef57215b0f..2c55fe2169 100644
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -2,8 +2,8 @@
 	class="member_mailidtop">
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="220" align="center">{--THANX_POINTS_LOCKED_1--}<STRONG
-			class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_LOCKED_2--}<br />
+		<TD width="220" align="center">{--THANX_POINTS_LOCKED_1--}<strong
+			class="member_done">{--_POINTS_VALUE!}</strong>&nbsp;{--THANX_POINTS_LOCKED_2--}<br />
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index e018021d4e..2400cadd83 100644
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -3,12 +3,12 @@
 	class="member_mailidtop">
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="220" align="center"><FONT class="tiny">
-		{--THANX_POINTS_LOCKED_1--}<STRONG class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_LOCKED_2--}<br />
+		<TD width="220" align="center"><div class="tiny">
+		{--THANX_POINTS_LOCKED_1--}<div class="member_done">{--_POINTS_VALUE!}</STRONG>&nbsp;{--THANX_POINTS_LOCKED_2--}<br />
 		<br />
-		<A
+		<a
 			href="{!URL!}/show_bonus.php?uid={!_UID_VALUE!}&amp;t={!_TYPE_VALUE!}&amp;d={!_DATA_VALUE!}"
-			target="_blank">{--BONUS_SHOW_TURBO_BONUS--} </FONT></TD>
+			target="_blank">{--BONUS_SHOW_TURBO_BONUS--} </div></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="center">
 		<TABLE border="0" cellspacing="0" cellpadding="0"
diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 9a5c5bc4c3..521777a9c1 100644
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -32,11 +32,11 @@ function StartCounter() {
 			</TR>
 			<TR>
 				<TD align="center">
-				<FORM name="confirm" style="margin-top: 0px; margin-bottom: 0px">
+				<form name="confirm" style="margin-top: 0px; margin-bottom: 0px">
 				{--MEMBER_TIME_COUNTER_1--} <INPUT type="text" name="counter"
 					size="{--_TIM2_VALUE!}" readonly class="member_normal"
 					value="{--_TIME_VALUE!}">&nbsp;{--_SECONDS--}
-				{--MEMBER_TIME_COUNTER_2--}</FORM>
+				{--MEMBER_TIME_COUNTER_2--}</form>
 				</TD>
 			</TR>
 			<TR>
diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl
index 92cd32dafa..edaa1a3cd3 100644
--- a/templates/de/html/mediadata.tpl
+++ b/templates/de/html/mediadata.tpl
@@ -159,7 +159,7 @@
 		<TD class="bottom seperator" width="10" rowspan="4">&nbsp;</TD>
 		<TD class="bottom medium" align="center" colspan="3">
 		{--ENGINE_SOFTWARE--}:<br />
-		<STRONG>{!TITLE!}</STRONG></TD>
+		<strong>{!TITLE!}</strong></TD>
 		<TD class="bottom seperator" width="10" rowspan="4z">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -178,8 +178,8 @@
 		<TD class="bottom media_right">{!__PATCH_CTIME!}</TD>
 	</TR>
 	<TR>
-		<TD class="media_header" colspan="5"><FONT class="tiny">[&nbsp;<STRONG><A
-			href="{!URL!}/modules.php?module=index&amp;what=stats">{--CONTINUE_MEMBER_STATS--}</A></STRONG>&nbsp;]</FONT>
+		<TD class="media_header" colspan="5"><div class="tiny">[&nbsp;<strong><a
+			href="{!URL!}/modules.php?module=index&amp;what=stats">{--CONTINUE_MEMBER_STATS--}</a></strong>&nbsp;]</div>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl
index d337544daa..4e182f4409 100644
--- a/templates/de/html/member/member_beg.tpl
+++ b/templates/de/html/member/member_beg.tpl
@@ -8,7 +8,7 @@
 	<TR>
 		<TD align="center" class="beg_msg" height="60">
 		{--BEG_MEMBER_YOUR_LINK--}:<br />
-		<STRONG><A href="{!URL!}/beg.php?uid={!__BEG_UID!}">{!URL!}/beg.php?uid={!__BEG_UID!}</A></STRONG>
+		<strong><a href="{!URL!}/beg.php?uid={!__BEG_UID!}">{!URL!}/beg.php?uid={!__BEG_UID!}</a></strong>
 		</TD>
 	</TR>
 	<TR>
@@ -17,7 +17,7 @@
 	<TR>
 		<TD align="center" class="beg_msg" height="60">
 		{--BEG_MEMBER_CLICKS_TOTAL--}:<br />
-		<STRONG>{!__BEG_CLICKS!}</STRONG></TD>
+		<strong>{!__BEG_CLICKS!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="5" class="seperator">&nbsp;</TD>
@@ -27,10 +27,10 @@
 	</TR>
 	<TR>
 		<TD align="left" class="beg_msg">
-		<P>{--BEG_MEMBER_EARN_1--} <STRONG>{!__BEG_POINTS!}
-		{!POINTS!}</STRONG> {--BEG_MEMBER_EARN_2--} <STRONG>{!__BEG_POINTS_MAX!}
-		{!POINTS!}</STRONG> {--BEG_MEMBER_EARN_3--}</P>
-		<P>{--BEG_MEMBER_TIMEOUT_1--} <STRONG>{!__BEG_TIMEOUT!}</STRONG>
+		<P>{--BEG_MEMBER_EARN_1--} <strong>{!__BEG_POINTS!}
+		{!POINTS!}</strong> {--BEG_MEMBER_EARN_2--} <strong>{!__BEG_POINTS_MAX!}
+		{!POINTS!}</strong> {--BEG_MEMBER_EARN_3--}</P>
+		<P>{--BEG_MEMBER_TIMEOUT_1--} <strong>{!__BEG_TIMEOUT!}</strong>
 		{--BEG_MEMBER_TIMEOUT_2--}</P>
 		<P align="right">{--BEG_MEMBER_HAVE_FUN--}</P>
 		</TD>
diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl
index b105e03f6e..f5356e42a6 100644
--- a/templates/de/html/member/member_bonus.tpl
+++ b/templates/de/html/member/member_bonus.tpl
@@ -1,19 +1,19 @@
-<P align="center"><STRONG>{--BONUS_MEMBER_HERE_IS_THE_LIST--}</STRONG><br />
+<P align="center"><strong>{--BONUS_MEMBER_HERE_IS_THE_LIST--}</strong><br />
 <br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	class="member_table dashed">
 	<TR>
-		<TD width="80" align="center" class="member_header bottom2"><STRONG>{--BONUS_RANK--}:</STRONG></TD>
-		<TD width="120" align="center" class="member_header bottom2"><STRONG>{--_UID--}:</STRONG></TD>
+		<TD width="80" align="center" class="member_header bottom2"><strong>{--BONUS_RANK--}:</strong></TD>
+		<TD width="120" align="center" class="member_header bottom2"><strong>{--_UID--}:</strong></TD>
 
-		<TD width="100" align="center" class="member_header bottom2"><STRONG>{!POINTS!}:</STRONG></TD>
-		<TD width="220" align="center" class="member_header bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG></TD>
+		<TD width="100" align="center" class="member_header bottom2"><strong>{!POINTS!}:</strong></TD>
+		<TD width="220" align="center" class="member_header bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong></TD>
 	</TR>
 	{!__BONUS_ROWS!}
 	<TR>
 		<TD colspan="4" class="member_footer" align="center"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<FONT class="tiny member_note">{--BONUS_RALLYE_NOTE--}</FONT></TD>
+		<div class="tiny member_note">{--BONUS_RALLYE_NOTE--}</div></TD>
 	</TR>
 </TABLE>
 <br />
@@ -23,24 +23,24 @@
 	<TR>
 		<TD class="member_header bottom2"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px"
-			align="center"><STRONG>{--BONUS_RALLYE_CONDITIONS--}:</STRONG></TD>
+			align="center"><strong>{--BONUS_RALLYE_CONDITIONS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="member_note bottom2"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<OL align="left">
-			<LI class="tiny">{--BONUS_RALLYE_CONDITION_1--}</LI>
-			<LI class="tiny">{--BONUS_RALLYE_CONDITION_2--}</LI>
-			<LI class="tiny">{--BONUS_RALLYE_CONDITION_3--}</LI>
-			<LI class="tiny">{--BONUS_RALLYE_CONDITION_4--}</LI>
-			<LI class="tiny">{--BONUS_RALLYE_CONDITION_5--}</LI>
-		</OL>
+		<ol align="left">
+			<li class="tiny">{--BONUS_RALLYE_CONDITION_1--}</li>
+			<li class="tiny">{--BONUS_RALLYE_CONDITION_2--}</li>
+			<li class="tiny">{--BONUS_RALLYE_CONDITION_3--}</li>
+			<li class="tiny">{--BONUS_RALLYE_CONDITION_4--}</li>
+			<li class="tiny">{--BONUS_RALLYE_CONDITION_5--}</li>
+		</ol>
 		</TD>
 	</TR>
 	<TR>
 		<TD colspan="4" class="member_footer" align="center"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<A href="{!URL!}/modules.php?module=login&amp;what=unconfirmed">{--BONUS_START_CONFIRMING_MAILS--}</A>
+		<a href="{!URL!}/modules.php?module=login&amp;what=unconfirmed">{--BONUS_START_CONFIRMING_MAILS--}</a>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/member/member_cats_footer.tpl b/templates/de/html/member/member_cats_footer.tpl
index a70262913a..77647d56fd 100644
--- a/templates/de/html/member/member_cats_footer.tpl
+++ b/templates/de/html/member/member_cats_footer.tpl
@@ -5,4 +5,4 @@
 		value="{--SUBMIT_CHANGES--}" /></TD>
 </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/templates/de/html/member/member_cats_header.tpl b/templates/de/html/member/member_cats_header.tpl
index 0f7ed33647..ce3b5e453b 100644
--- a/templates/de/html/member/member_cats_header.tpl
+++ b/templates/de/html/member/member_cats_header.tpl
@@ -1,13 +1,13 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=categories" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=categories" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_main dashed">
 <TR>
 	<TD colspan="5" height="5" class="seperator"></TD>
 </TR>
 <TR>
 	<TD width="5" class="seperator" rowspan="{!__ROWS!}">&nbsp;</TD>
-	<TD align="center" class="member_header" width="408"><STRONG>{--CATNAME--}</STRONG></TD>
+	<TD align="center" class="member_header" width="408"><strong>{--CATNAME--}</strong></TD>
 	<TD width="2" class="seperator">&nbsp;</TD>
-	<TD align="center" class="member_header" width="180"><STRONG>{--SELECT_CAT--}</STRONG></TD>
+	<TD align="center" class="member_header" width="180"><strong>{--SELECT_CAT--}</strong></TD>
 	<TD width="5" class="seperator" rowspan="{!__ROWS!}">&nbsp;</TD>
 </TR>
 <TR>
diff --git a/templates/de/html/member/member_content_right.tpl b/templates/de/html/member/member_content_right.tpl
index ebee9e2397..cc13834300 100644
--- a/templates/de/html/member/member_content_right.tpl
+++ b/templates/de/html/member/member_content_right.tpl
@@ -1,7 +1,7 @@
   </TD>
-  <TD valign="top"><DIV class="member_skyscraper">
+  <TD valign="top"><div class="member_skyscraper">
     <!-- 120x600-Skyscraper passt hier... //-->
-  </DIV></TD>
+  </div></TD>
 </TR>
 <TR>
   <TD align="center" valign="top" class="member_advert">
diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index 15b88a4a10..aad91e67b3 100644
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -1,71 +1,71 @@
-<DIV align="center">{--DOUBLER_MEMBER_YOUR_LINK--}:<br />
-<STRONG><A href="{!URL!}/doubler.php?refid={!__USERID!}">{!URL!}/doubler.php?refid={!__USERID!}</A></STRONG><br />
+<div align="center">{--DOUBLER_MEMBER_YOUR_LINK--}:<br />
+<strong><a href="{!URL!}/doubler.php?refid={!__USERID!}">{!URL!}/doubler.php?refid={!__USERID!}</a></strong><br />
 <br />
-{--DOUBLER_MEMBER_LINK_NOTE--}</DIV>
+{--DOUBLER_MEMBER_LINK_NOTE--}</div>
 
-<div align="center"><STRONG class="big">{--DOUBLER_MEMBER_ALREADY_PAYOUT--}:</STRONG><br />
+<div align="center"><div class="big">{--DOUBLER_MEMBER_ALREADY_PAYOUT--}:</strong><br />
 <br />
 {!__DOUBLER_PAYOUT_HISTORY!}</div>
 
-<div align="center"><STRONG class="big">{--DOUBLER_MEMBER_NEXT_PAYOUT--}:</STRONG><br />
+<div align="center"><div class="big">{--DOUBLER_MEMBER_NEXT_PAYOUT--}:</strong><br />
 <br />
 {!__DOUBLER_PAYOUT_NEXT!}</div>
 
-<div align="center"><STRONG class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</STRONG><br />
+<div align="center"><div class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</strong><br />
 <br />
 {!__DOUBLER_PAYOUT_REF!}</div>
 
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 	class="doubler_table dashed" width="520">
 	<TR>
-		<TD align="center" class="doubler_header bottom2"><STRONG
-			class="big">{--DOUBLER_GENERAL_INFOS--}:</STRONG></TD>
+		<TD align="center" class="doubler_header bottom2"><strong
+			class="big">{--DOUBLER_GENERAL_INFOS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="doubler_main bottom2"
 			style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
-		<UL>
+		<ul>
 
-			<LI>{--DOUBLER_MINIMUM_IS--} <STRONG>{!__MIN_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_MAXIMUM_IS--} <STRONG>{!__MAX_VALUE!}
-			{!POINTS!}</STRONG></LI>
-			<LI>{--DOUBLER_ALREADY_PAYED_1--} <STRONG>{!__TOTAL_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_ALREADY_PAYED_2--}</LI>
-			<LI>{--DOUBLER_POINTS_LEFT_1--} <STRONG>{!__LEFT_VALUE!}
-			{!POINTS!}</STRONG> {--DOUBLER_POINTS_LEFT_2--}</LI>
-			<LI>{--DOUBLER_USAGE_COUNTER_1--} <STRONG>{!__DOUBLER_COUNTER!}</STRONG>
-			{--DOUBLER_USAGE_COUNTER_2--}</LI>
-			<LI>{!DOUBLER_PAYOUT_TIME!}</LI>
-			<LI><STRONG>{--DOUBLER_FULL_PAYOUT--}</STRONG></LI>
-			<LI>{--DOUBLER_POINTS_1--} <STRONG>{!__CHARGE_VALUE!}%</STRONG>
-			{--DOUBLER_POINTS_2--}</LI>
-			<LI>{--DOUBLER_EXAMPLE_1--} <STRONG>500 {!POINTS!}</STRONG>
-			&raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <STRONG>1000 {!POINTS!}</STRONG>{--DOUBLER_EXAMPLE_3--}</LI>
-			<LI>{--DOUBLER_REFERRAL_1--} <STRONG>{!__REF_VALUE!}%</STRONG>
+			<li>{--DOUBLER_MINIMUM_IS--} <strong>{!__MIN_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{!__MAX_VALUE!}
+			{!POINTS!}</strong></li>
+			<li>{--DOUBLER_ALREADY_PAYED_1--} <strong>{!__TOTAL_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
+			<li>{--DOUBLER_POINTS_LEFT_1--} <strong>{!__LEFT_VALUE!}
+			{!POINTS!}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
+			<li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{!__DOUBLER_COUNTER!}</strong>
+			{--DOUBLER_USAGE_COUNTER_2--}</li>
+			<li>{!DOUBLER_PAYOUT_TIME!}</li>
+			<li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
+			<li>{--DOUBLER_POINTS_1--} <strong>{!__CHARGE_VALUE!}%</strong>
+			{--DOUBLER_POINTS_2--}</li>
+			<li>{--DOUBLER_EXAMPLE_1--} <strong>500 {!POINTS!}</strong>
+			&raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {!POINTS!}</strong>{--DOUBLER_EXAMPLE_3--}</li>
+			<li>{--DOUBLER_REFERRAL_1--} <strong>{!__REF_VALUE!}%</strong>
 			{--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--}
 			{--DOUBLER_REFERRAL_4--}
-			<LI>{--DOUBLER_REFERRAL_5--} <STRONG>100 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_6--} <STRONG>100 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_8--} <STRONG>300 {!POINTS!}</STRONG>
-			{--DOUBLER_REFERRAL_8--}</LI>
-			<LI>{--DOUBLER_REFERRAL_LINK--}</LI>
-			<LI>{--DOUBLER_TIMEOUT_1--} <STRONG>{!__TIMEOUT_MARK!}</STRONG>
-			{--DOUBLER_TIMEOUT_2--}</LI>
-			<LI>{--DOUBLER_HAVE_FUN--}</LI>
-			</UL>
+			<li>{--DOUBLER_REFERRAL_5--} <strong>100 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_6--} <strong>100 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_8--} <strong>300 {!POINTS!}</strong>
+			{--DOUBLER_REFERRAL_8--}</li>
+			<li>{--DOUBLER_REFERRAL_LINK--}</li>
+			<li>{--DOUBLER_TIMEOUT_1--} <strong>{!__TIMEOUT_MARK!}</strong>
+			{--DOUBLER_TIMEOUT_2--}</li>
+			<li>{--DOUBLER_HAVE_FUN--}</li>
+			</ul>
 		</TD>
 	</TR>
 	<TR>
-		<TD align="center" class="doubler_header bottom2"><STRONG
-			class="big">{--DOUBLER_REGISTER_ADVERT--}:</STRONG></TD>
+		<TD align="center" class="doubler_header bottom2"><strong
+			class="big">{--DOUBLER_REGISTER_ADVERT--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="doubler_main"
 			style="padding-left: 10px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
-		{--DOUBLER_YOUR_ADVERTISING_HERE--} <STRONG><A
+		{--DOUBLER_YOUR_ADVERTISING_HERE--} <strong><a
 			href="{!URL!}/modules.php?module=index&amp;what=impressum"
-			target="_blank">{--DOUBLER_CONTACT_US--}</A></STRONG></TD>
+			target="_blank">{--DOUBLER_CONTACT_US--}</a></strong></TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl
index 2bab633646..e665ee6c0f 100644
--- a/templates/de/html/member/member_doubler_list.tpl
+++ b/templates/de/html/member/member_doubler_list.tpl
@@ -2,12 +2,12 @@
 	class="doubler_list dashed">
 	<TR>
 		<TD class="doubler_header bottom2 right2" align="center" width="100">
-		<STRONG>{--_UID--}</STRONG></TD>
+		<strong>{--_UID--}</strong></TD>
 		<TD class="doubler_header bottom2 right2" align="center" width="100">
-		<STRONG>{--REF_UID--}</STRONG></TD>
+		<strong>{--REF_UID--}</strong></TD>
 		<TD class="doubler_header bottom2 right2" align="center" width="160">
-		<STRONG>{!POINTS!}</STRONG></TD>
-		<TD class="doubler_header bottom2" align="center" width="160"><STRONG>{--DOUBLER_TIMEMARK--}</STRONG>
+		<strong>{!POINTS!}</strong></TD>
+		<TD class="doubler_header bottom2" align="center" width="160"><strong>{--DOUBLER_TIMEMARK--}</strong>
 		</TD>
 	</TR>
 	$content
diff --git a/templates/de/html/member/member_goto_top.tpl b/templates/de/html/member/member_goto_top.tpl
index 6ea6a047f1..1100224f1a 100644
--- a/templates/de/html/member/member_goto_top.tpl
+++ b/templates/de/html/member/member_goto_top.tpl
@@ -1,4 +1,4 @@
 <TR>
-	<TD height="1%" align="center" class="guest_advert"><SMALL><A
-		href="#TOP">{--TOP--}</A></SMALL></TD>
+	<TD height="1%" align="center" class="guest_advert"><SMALL><a
+		href="#TOP">{--TOP--}</a></SMALL></TD>
 </TR>
diff --git a/templates/de/html/member/member_header.tpl b/templates/de/html/member/member_header.tpl
index 9c84153e1e..2a4a2c7ce4 100644
--- a/templates/de/html/member/member_header.tpl
+++ b/templates/de/html/member/member_header.tpl
@@ -1,21 +1,21 @@
-<A name="TOP"></A>
+<a name="TOP"></a>
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%" class="member_main">
 <TR>
 	<TD colspan="3" align="center" valign="top" class="member_title">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%" class="guest">
 		<TR>
 			<TD colspan="3" align="center">
-				<STRONG><BIG>-&nbsp;-&nbsp;- <A title="{!MAIN_TITLE!}"
+				<strong><BIG>-&nbsp;-&nbsp;- <a title="{!MAIN_TITLE!}"
 					style="cursor: default; background: none; text-decoration: none"
-					class="member_header">{!MAIN_TITLE!}</A>&nbsp;-&nbsp;-&nbsp;-</BIG></STRONG>
+					class="member_header">{!MAIN_TITLE!}</a>&nbsp;-&nbsp;-&nbsp;-</BIG></strong>
 				<br />
 			</TD>
 		</TR>
 		<TR>
-			<TD width="200"><FONT class="guest_header">&nbsp;&nbsp;Hallo
-			$username!</FONT></TD>
-			<TD align="center"><FONT class="guest_header">{!SLOGAN!}</FONT></TD>
-			<TD width="200" align="right"><FONT class="guest_header">$date_time&nbsp;&nbsp;</FONT></TD>
+			<TD width="200"><div class="guest_header">&nbsp;&nbsp;Hallo
+			$username!</div></TD>
+			<TD align="center"><div class="guest_header">{!SLOGAN!}</div></TD>
+			<TD width="200" align="right"><div class="guest_header">$date_time&nbsp;&nbsp;</div></TD>
 		</TR>
 		</TABLE>
 	</TD>
diff --git a/templates/de/html/member/member_holiday_deactivate.tpl b/templates/de/html/member/member_holiday_deactivate.tpl
index e06d1207d6..eba4a650e6 100644
--- a/templates/de/html/member/member_holiday_deactivate.tpl
+++ b/templates/de/html/member/member_holiday_deactivate.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=holiday" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=holiday" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="bottom member_title2"
-			height="30"><STRONG>{--HOLIDAY_MEMBER_DEACTIVATE_TITLE--}</STRONG>
+			height="30"><strong>{--HOLIDAY_MEMBER_DEACTIVATE_TITLE--}</strong>
 		</TD>
 	</TR>
 	<TR>
@@ -37,7 +37,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center">
-			<FONT class="member_note">{--HOLIDAY_DEACTIVATE_NOTES--}</FONT>
+			<div class="member_note">{--HOLIDAY_DEACTIVATE_NOTES--}</div>
 		</TD>
 	</TR>
 	<TR>
@@ -50,4 +50,4 @@
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_holiday_form.tpl b/templates/de/html/member/member_holiday_form.tpl
index 0dbf828292..f3f4f34b34 100644
--- a/templates/de/html/member/member_holiday_form.tpl
+++ b/templates/de/html/member/member_holiday_form.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=holiday" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=holiday" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="bottom member_title2"
-			height="30"><STRONG>{--HOLIDAY_MEMBER_TITLE--}</STRONG></TD>
+			height="30"><strong>{--HOLIDAY_MEMBER_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -30,7 +30,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center">
-			<SPAN class="member_note">{--HOLIDAY_MAX_DAYS_1--}<STRONG>{!__HOLIDAY_MAX!}</STRONG>{--HOLIDAY_MAX_DAYS_2--}</SPAN>
+			<span class="member_note">{--HOLIDAY_MAX_DAYS_1--}<strong>{!__HOLIDAY_MAX!}</strong>{--HOLIDAY_MAX_DAYS_2--}</span>
 		</TD>
 	</TR>
 	<TR>
@@ -41,7 +41,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center">{--HOLIDAY_COMMENTS--}:<br />
-			<TEXTAREA name="comments" class="member_normal" cols="50" rows="6"></TEXTAREA>
+			<textarea name="comments" class="member_normal" cols="50" rows="6"></textarea>
 		</TD>
 	</TR>
 	<TR>
@@ -52,7 +52,7 @@
 	</TR>
 	<TR>
 		<TD colspan="3" align="center">
-			<SPAN class="member_note">{--HOLIDAY_NOTES--}</SPAN>
+			<span class="member_note">{--HOLIDAY_NOTES--}</span>
 		</TD>
 	</TR>
 	<TR>
@@ -65,4 +65,4 @@
 			value="{--HOLIDAY_ADD--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl
index 4c8dc6f684..af19c03f0a 100644
--- a/templates/de/html/member/member_html_mail_settings.tpl
+++ b/templates/de/html/member/member_html_mail_settings.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=html_mail"
+<form action="{!URL!}/modules.php?module=login&amp;what=html_mail"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
 	class="member_table dashed">
 	<TR>
 		<TD align="center" colspan="2" class="member_title2 bottom2"
-			height="30"><STRONG>{--MEMBER_HTML_INTRO--}</STRONG></TD>
+			height="30"><strong>{--MEMBER_HTML_INTRO--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="2" class="seperator" height="5">&nbsp;</TD>
@@ -31,4 +31,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl
index 72d51cf772..d9efba3386 100644
--- a/templates/de/html/member/member_list_beg.tpl
+++ b/templates/de/html/member/member_list_beg.tpl
@@ -1,18 +1,18 @@
-<P align="center"><STRONG>{--BEG_MEMBER_HERE_IS_THE_LIST--}</STRONG><br />
+<P align="center"><strong>{--BEG_MEMBER_HERE_IS_THE_LIST--}</strong><br />
 <br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	class="member_table dashed">
 	<TR>
-		<TD width="80" align="center" class="member_header bottom2"><STRONG>{--BEG_RANK--}:</STRONG></TD>
-		<TD width="120" align="center" class="member_header bottom2"><STRONG>{--_UID--}:</STRONG></TD>
-		<TD width="100" align="center" class="member_header bottom2"><STRONG>{--BEG_POINTS--}:</STRONG></TD>
-		<TD width="220" align="center" class="member_header bottom2"><STRONG>{--ADMIN_LAST_ONLINE--}:</STRONG></TD>
+		<TD width="80" align="center" class="member_header bottom2"><strong>{--BEG_RANK--}:</strong></TD>
+		<TD width="120" align="center" class="member_header bottom2"><strong>{--_UID--}:</strong></TD>
+		<TD width="100" align="center" class="member_header bottom2"><strong>{--BEG_POINTS--}:</strong></TD>
+		<TD width="220" align="center" class="member_header bottom2"><strong>{--ADMIN_LAST_ONLINE--}:</strong></TD>
 	</TR>
 	{!__BEG_ROWS!}
 	<TR>
 		<TD colspan="4" class="member_footer" align="center"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<FONT class="tiny member_note">{--BEG_RALLYE_NOTE--}</FONT></TD>
+		<div class="tiny member_note">{--BEG_RALLYE_NOTE--}</div></TD>
 	</TR>
 </TABLE>
 <br />
@@ -22,23 +22,23 @@
 	<TR>
 		<TD class="member_header bottom2"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px"
-			align="center"><STRONG>{--BEG_RALLYE_CONDITIONS--}:</STRONG></TD>
+			align="center"><strong>{--BEG_RALLYE_CONDITIONS--}:</strong></TD>
 	</TR>
 	<TR>
 		<TD class="member_note bottom2"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<OL align="left">
-			<LI class="tiny">{--BEG_RALLYE_CONDITION_1--}</LI>
-			<LI class="tiny">{--BEG_RALLYE_CONDITION_2--}</LI>
-			<LI class="tiny">{--BEG_RALLYE_CONDITION_3--}</LI>
-			<LI class="tiny">{--BEG_RALLYE_CONDITION_4--}</LI>
-		</OL>
+		<ol align="left">
+			<li class="tiny">{--BEG_RALLYE_CONDITION_1--}</li>
+			<li class="tiny">{--BEG_RALLYE_CONDITION_2--}</li>
+			<li class="tiny">{--BEG_RALLYE_CONDITION_3--}</li>
+			<li class="tiny">{--BEG_RALLYE_CONDITION_4--}</li>
+		</ol>
 		</TD>
 	</TR>
 	<TR>
 		<TD colspan="4" class="member_footer" align="center"
 			style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-		<A href="{!URL!}/modules.php?module=login&amp;what=beg">{--BEG_LINK_HERE--}</A>
+		<a href="{!URL!}/modules.php?module=login&amp;what=beg">{--BEG_LINK_HERE--}</a>
 		</TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/member/member_menu_whats.tpl b/templates/de/html/member/member_menu_whats.tpl
index 3c90564d44..cf5c9c5707 100644
--- a/templates/de/html/member/member_menu_whats.tpl
+++ b/templates/de/html/member/member_menu_whats.tpl
@@ -1,3 +1,3 @@
 <TR>
-	<TD class="member_menu_whats">&nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;&nbsp;$content</TD>
+	<TD class="member_menu_whats">&nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;&nbsp;$content</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/member/member_mydata_button.tpl b/templates/de/html/member/member_mydata_button.tpl
index d4d11ab8c0..9321d33c78 100644
--- a/templates/de/html/member/member_mydata_button.tpl
+++ b/templates/de/html/member/member_mydata_button.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=mydata"
+<form action="{!URL!}/modules.php?module=login&amp;what=mydata"
 	method="POST" style="margin-bottom: 0px"><INPUT type="submit"
 	name="edit" class="member_reset" value="{--MEMBER_EDIT_PROFILE--}">
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl
index 3604cda3d1..4afbe13d27 100644
--- a/templates/de/html/member/member_mydata_edit.tpl
+++ b/templates/de/html/member/member_mydata_edit.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=mydata"
+<form action="{!URL!}/modules.php?module=login&amp;what=mydata"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="530"
 	class="member_main dashed" align="center">
@@ -9,7 +9,7 @@
 		<TD width="10" rowspan="25">&nbsp;</TD>
 		<TD width="225" align="right">{--YOUR_LOGIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="225"><STRONG>{!UID_VALUE!}</STRONG></TD>
+		<TD width="225"><strong>{!UID_VALUE!}</strong></TD>
 		<TD width="10" rowspan="25">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -18,11 +18,11 @@
 	<TR>
 		<TD align="right">{--GENDER--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="gender" size="1" class="member_select">
-			<OPTION value="M"{--M_DEFAULT--}>{--GENDER_M--}</OPTION>
-			<OPTION value="F"{--F_DEFAULT--}>{--GENDER_F--}</OPTION>
-			<OPTION value="C"{--C_DEFAULT--}>{--GENDER_C--}</OPTION>
-		</SELECT></TD>
+		<TD><select name="gender" size="1" class="member_select">
+			<option value="M"{--M_DEFAULT--}>{--GENDER_M--}</option>
+			<option value="F"{--F_DEFAULT--}>{--GENDER_F--}</option>
+			<option value="C"{--C_DEFAULT--}>{--GENDER_C--}</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -85,8 +85,8 @@
 		<TD colspan="3" height="3" class="seperator member_note_bg">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD colspan="3" align="center" class="member_note_bg"><SPAN
-			class="member_note">{--MYDATA_NOTE--}</SPAN></TD>
+		<TD colspan="3" align="center" class="member_note_bg"><span
+			class="member_note">{--MYDATA_NOTE--}</span></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator member_note_bg">&nbsp;</TD>
@@ -122,4 +122,4 @@
 		<TD colspan="5" height="7" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl
index 75d6d46131..c466e6c5fe 100644
--- a/templates/de/html/member/member_mydata_overview.tpl
+++ b/templates/de/html/member/member_mydata_overview.tpl
@@ -14,7 +14,7 @@
 	<TR>
 		<TD width="225" align="right">{--YOUR_LOGIN--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="225"><STRONG>{!UID_VALUE!}</STRONG></TD>
+		<TD width="225"><strong>{!UID_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="7" class="seperator">&nbsp;</TD>
@@ -22,7 +22,7 @@
 	<TR>
 		<TD width="225" align="right">{--GENDER--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="225"><STRONG>$DATA[10]</STRONG></TD>
+		<TD width="225"><strong>$DATA[10]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -30,7 +30,7 @@
 	<TR>
 		<TD width="225" align="right">{--SURNAME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="225"><STRONG>$DATA[0]</STRONG></TD>
+		<TD width="225"><strong>$DATA[0]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -38,7 +38,7 @@
 	<TR>
 		<TD align="right">{--FAMILY_NAME--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[1]</STRONG></TD>
+		<TD><strong>$DATA[1]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -46,7 +46,7 @@
 	<TR>
 		<TD align="right">{--STREET_NR--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[2]</STRONG></TD>
+		<TD><strong>$DATA[2]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -54,7 +54,7 @@
 	<TR>
 		<TD align="right">{--COUNTRY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[3]</STRONG></TD>
+		<TD><strong>$DATA[3]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -62,7 +62,7 @@
 	<TR>
 		<TD align="right">{--ZIP--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[4]</STRONG></TD>
+		<TD><strong>$DATA[4]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -70,7 +70,7 @@
 	<TR>
 		<TD align="right">{--CITY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[5]</STRONG></TD>
+		<TD><strong>$DATA[5]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -78,7 +78,7 @@
 	<TR>
 		<TD align="right">{--ADDY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[6]</STRONG></TD>
+		<TD><strong>$DATA[6]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -86,7 +86,7 @@
 	<TR>
 		<TD align="right">{--BIRTHDAY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>{!DOB!}</STRONG></TD>
+		<TD><strong>{!DOB!}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -94,7 +94,7 @@
 	<TR>
 		<TD align="right">{--MAILS_PER_DAY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[11]</STRONG>&nbsp;({--TODAY--}: <STRONG>$DATA[12]</STRONG>)
+		<TD><strong>$DATA[11]</strong>&nbsp;({--TODAY--}: <strong>$DATA[12]</strong>)
 		</TD>
 	</TR>
 	<TR>
@@ -103,7 +103,7 @@
 	<TR>
 		<TD align="right">{--PROFILE_LAST_CHANGE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><STRONG>$DATA[13]</STRONG></TD>
+		<TD><strong>$DATA[13]</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="7" class="seperator">&nbsp;</TD>
diff --git a/templates/de/html/member/member_newsletter.tpl b/templates/de/html/member/member_newsletter.tpl
index bf66d62ec9..e8e4773425 100644
--- a/templates/de/html/member/member_newsletter.tpl
+++ b/templates/de/html/member/member_newsletter.tpl
@@ -1,22 +1,21 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=login&amp;what=newsletter"
+<div align="center">
+<form action="{!URL!}/modules.php?module=login&amp;what=newsletter"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	class="member_table dashed">
 	<TR>
-		<TD class="member_header bottom2" colspan="2"><STRONG>{--NL_MEMBER_TITLE--}:</STRONG>
+		<TD class="member_header bottom2" colspan="2"><strong>{--NL_MEMBER_TITLE--}:</strong>
 		</TD>
 	</TR>
 	<TR>
 		<TD align="right" height="30" width="320">
 		{--NL_MEMBER_RECEIVE_STATUS--}:</TD>
-		<TD width="200">&nbsp;<STRONG>{!__STATUS_VALUE!}</STRONG><br />
-		<FONT class="tiny">{!__UNTIL_VALUE!}</FONT></TD>
+		<TD width="200">&nbsp;<strong>{!__STATUS_VALUE!}</strong><br />
+		<div class="tiny">{!__UNTIL_VALUE!}</div></TD>
 	</TR>
 	<TR>
 		<TD class="bottom2" colspan="2" align="center"
-			style="padding-top: 10px; padding-bottom: 10px"><FONT
-			class="member_note">{--NL_MEMBER_NOTE--}</FONT></TD>
+			style="padding-top: 10px; padding-bottom: 10px"><div class="member_note">{--NL_MEMBER_NOTE--}</div></TD>
 	</TR>
 	<TR>
 		<TD class="member_footer" colspan="2" align="center"><INPUT
@@ -25,5 +24,5 @@
 			value="{--NL_SUBMIT--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/member/member_newsletter_note.tpl b/templates/de/html/member/member_newsletter_note.tpl
index 1a55feedf2..5b00851725 100644
--- a/templates/de/html/member/member_newsletter_note.tpl
+++ b/templates/de/html/member/member_newsletter_note.tpl
@@ -1,10 +1,10 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="480">
 	<TR>
-		<TD>Unseren {!MT_WORD!} <STRONG>{!MAIN_TITLE!}</STRONG>
+		<TD>Unseren {!MT_WORD!} <strong>{!MAIN_TITLE!}</strong>
 		finanzieren wir zum Teil durch Werbung, die Sie ohne Verg&uuml;tung
 		von uns ab und an in Form von Newslettern bekommen.<br />
 		<br />
-		Damit wir unseren Service weiterhin <STRONG>kostenlos</STRONG> Ihnen
+		Damit wir unseren Service weiterhin <strong>kostenlos</strong> Ihnen
 		anbieten k&ouml;nnen, aber gleichzeitig auch die Kosten des durch Sie
 		verursachten Transfervolumens wieder reinbekommen, m&ouml;chten wir
 		Sie um eine kleine Spende bitten, die wir
diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl
index 5b662e8c88..186325112e 100644
--- a/templates/de/html/member/member_nickname_form.tpl
+++ b/templates/de/html/member/member_nickname_form.tpl
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=nickname"
+<form action="{!URL!}/modules.php?module=login&amp;what=nickname"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="member_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{--NICKNAME_CHANGE_NICKNAME_TITLE--}</STRONG></TD>
+			height="30"><strong>{--NICKNAME_CHANGE_NICKNAME_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="5" class="seperator" height="5">&nbsp;</TD>
@@ -46,4 +46,4 @@
 		<TD width="5" class="member_footer seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_order-back.tpl b/templates/de/html/member/member_order-back.tpl
index b08fb57395..0325a07dd4 100644
--- a/templates/de/html/member/member_order-back.tpl
+++ b/templates/de/html/member/member_order-back.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php" method="GET"><INPUT
+<form action="{!URL!}/modules.php" method="GET"><INPUT
 	type="hidden" name="module" value="login"> <INPUT type="hidden"
-	name="what" value="order"> <STRONG><SPAN
-	class="member_done">{--MEMBER_THANX_ORDER--}</SPAN></STRONG><br />
+	name="what" value="order"> <strong><span
+	class="member_done">{--MEMBER_THANX_ORDER--}</span></strong><br />
 <br />
 <br />
 <INPUT type="submit" class="member_reset"
-	value="{--MEMBER_CONTINUE_AREA--}"></FORM>
\ No newline at end of file
+	value="{--MEMBER_CONTINUE_AREA--}"></form>
\ No newline at end of file
diff --git a/templates/de/html/member/member_order-html_ext.tpl b/templates/de/html/member/member_order-html_ext.tpl
index 72196bfd3e..dffa7586f3 100644
--- a/templates/de/html/member/member_order-html_ext.tpl
+++ b/templates/de/html/member/member_order-html_ext.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD width="10" class="top2 bottom2 seperator">&nbsp;</TD>
-	<TD class="top2 bottom2" colspan="3" align="center"><STRONG>{--MEMBER_HTML_VALID_TAGS--}:</STRONG><br />
+	<TD class="top2 bottom2" colspan="3" align="center"><strong>{--MEMBER_HTML_VALID_TAGS--}:</strong><br />
 	$content <INPUT type="hidden" name="html" value="Y"></TD>
 	<TD width="10" class="top2 bottom2 seperator">&nbsp;</TD>
 </TR>
diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl
index 639087a92c..f148eb09cb 100644
--- a/templates/de/html/member/member_order-html_intro.tpl
+++ b/templates/de/html/member/member_order-html_intro.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD colspan="2" class="member_title2 bottom2" height="30"
-		align="center"><STRONG>{--MEMBER_HTML_ORDER_INTRO--}</STRONG></TD>
+		align="center"><strong>{--MEMBER_HTML_ORDER_INTRO--}</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" class="seperator" height="5">&nbsp;</TD>
diff --git a/templates/de/html/member/member_order-zip1.tpl b/templates/de/html/member/member_order-zip1.tpl
index 6ac88d6896..37103a936a 100644
--- a/templates/de/html/member/member_order-zip1.tpl
+++ b/templates/de/html/member/member_order-zip1.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD colspan="2" align="center" class="member_title2 bottom2"
-		height="30"><STRONG>{--MEMBER_ORDER_PAGE1_INTRO--}</STRONG></TD>
+		height="30"><strong>{--MEMBER_ORDER_PAGE1_INTRO--}</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" class="seperator" height="5">&nbsp;</TD>
@@ -10,14 +10,14 @@
 	drei Stellen der Postleitzahl ein, in der gesendet werden soll.<br />
 	<br />
 	Beispiele:
-	<UL>
-		<LI><STRONG>1</STRONG> : Sendet nur an Mitglieder, deren
-		Postleitzahl mit 1 anf&auml;ngt.</LI>
-		<LI><STRONG>12</STRONG> : Sendet nur an Mitglieder, deren
-		Postleitzahl mit 12 anf&auml;ngt.</LI>
-		<LI><STRONG>123</STRONG> : Sendet nur an Mitglieder, deren
-		Postleitzahl mit 123 anf&auml;ngt.</LI>
-	</UL>
+	<ul>
+		<li><strong>1</strong> : Sendet nur an Mitglieder, deren
+		Postleitzahl mit 1 anf&auml;ngt.</li>
+		<li><strong>12</strong> : Sendet nur an Mitglieder, deren
+		Postleitzahl mit 12 anf&auml;ngt.</li>
+		<li><strong>123</strong> : Sendet nur an Mitglieder, deren
+		Postleitzahl mit 123 anf&auml;ngt.</li>
+	</ul>
 	<br />
 	Oder geben Sie nichts ein, wenn Sie diese Option nicht w&uuml;nschen.</TD>
 </TR>
diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl
index 5a502823c1..7d9e9f1e07 100644
--- a/templates/de/html/member/member_order-zip2.tpl
+++ b/templates/de/html/member/member_order-zip2.tpl
@@ -1,6 +1,6 @@
 <TR>
 	<TD colspan="5" align="center" class="member_title2 bottom2"
-		height="30"><STRONG>{--MEMBER_ORDER_PAGE2_INTRO--}</STRONG></TD>
+		height="30"><strong>{--MEMBER_ORDER_PAGE2_INTRO--}</strong></TD>
 </TR>
 <TR>
 	<TD colspan="5" height="5" class="seperator">&nbsp;</TD>
diff --git a/templates/de/html/member/member_order_back.tpl b/templates/de/html/member/member_order_back.tpl
index 4b825ed3d1..c1775ffa34 100644
--- a/templates/de/html/member/member_order_back.tpl
+++ b/templates/de/html/member/member_order_back.tpl
@@ -1,5 +1,5 @@
-<FORM action="{!URL!}/modules.php" method="GET" target="_parent">
+<form action="{!URL!}/modules.php" method="GET" target="_parent">
 <INPUT type="hidden" name="module" value="login"> <INPUT
 	type="hidden" name="what" value="order"> <INPUT type="hidden"
 	name="order" value="$content"> <INPUT type="submit"
-	class="member_reset" value="{--MEMBER_GO_BACK--}"></FORM>
\ No newline at end of file
+	class="member_reset" value="{--MEMBER_GO_BACK--}"></form>
\ No newline at end of file
diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl
index 753dfdd5d7..025bca8630 100644
--- a/templates/de/html/member/member_order_page1.tpl
+++ b/templates/de/html/member/member_order_page1.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=order"
+<form action="{!URL!}/modules.php?module=login&amp;what=order"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="member_table dashed" align="center">
@@ -13,4 +13,4 @@
 			value="{--ORDER_PAGE_2--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl
index d8256f2e4c..dc407922f8 100644
--- a/templates/de/html/member/member_order_page2.tpl
+++ b/templates/de/html/member/member_order_page2.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=order"
+<form action="{!URL!}/modules.php?module=login&amp;what=order"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="660"
 	class="member_table dashed" align="center">
@@ -10,10 +10,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--SELECT_MAIL_TYPE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="type" size="1" class="member_select">
-			<OPTION value="" disabled>{--PLEASE_SELECT--}</OPTION>
+		<TD><select name="type" size="1" class="member_select">
+			<option value="" disabled>{--PLEASE_SELECT--}</option>
 			{--TYPE_SELECTION--}
-		</SELECT></TD>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -23,10 +23,10 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--SELECT_CATEGORY--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><SELECT name="cat" size="1" class="member_select">
-			<OPTION value="" disabled>{--PLEASE_SELECT--}</OPTION>
+		<TD><select name="cat" size="1" class="member_select">
+			<option value="" disabled>{--PLEASE_SELECT--}</option>
 			{!CATEGORY_SELECTION!}
-		</SELECT></TD>
+		</select></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -34,7 +34,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD align="right">{--ENTER_RECEIVER--}: {--MEMBER_MIN_RECS_1--} <STRONG>{!__MIN_VALUE!}</STRONG>{--MEMBER_MIN_RECS_2--}
+		<TD align="right">{--ENTER_RECEIVER--}: {--MEMBER_MIN_RECS_1--} <strong>{!__MIN_VALUE!}</strong>{--MEMBER_MIN_RECS_2--}
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD><INPUT type="text" name="receiver" class="member_normal"
@@ -60,8 +60,8 @@
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD align="right">{--ENTER_TEXT--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD><TEXTAREA name="text" class="member_normal" rows="10"
-			cols="50">{--TEXT--}</TEXTAREA></TD>
+		<TD><textarea name="text" class="member_normal" rows="10"
+			cols="50">{--TEXT--}</textarea></TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
@@ -69,7 +69,7 @@
 	</TR>
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD colspan="3" align="center" class="member_note"><STRONG>{--MEMBER_PLEASE_NOTE--}</STRONG><br />
+		<TD colspan="3" align="center" class="member_note"><strong>{--MEMBER_PLEASE_NOTE--}</strong><br />
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -79,27 +79,27 @@
 	<TR>
 		<TD width="10" class="seperator">&nbsp;</TD>
 		<TD colspan="3" align="center" class="member_note">
-		<DIV align="left">
-		<OL>
-			<LI>Bitte pr&uuml;fen Sie <STRONG>unbedingt vor</STRONG> dem
-			Absenden die Verf&uuml;gbarkeit und <STRONG><U>Framekiller-Freiheit</U></STRONG>
-			ihrer beworbenen Adresse!</LI>
-			<LI>Unsere AGBs vergessen? <STRONG>[<A
-				href="{!URL!}/agb.php" target="_blank">Hier sind sie nochmal</A>]</STRONG>.</LI>
-			<LI>Gesperrte URLs k&ouml;nnen nicht ein zweites Mal beworben
-			werden.</LI>
-			<LI>Ihre Seite wird vor dem entg&uuml;ltigem Absenden auf
-			Framekiller hin automatisch <U>doppelt</U> gepr&uuml;ft. Sollten Sie
+		<div align="left">
+		<ol>
+			<li>Bitte pr&uuml;fen Sie <strong>unbedingt vor</strong> dem
+			Absenden die Verf&uuml;gbarkeit und <strong><u>Framekiller-Freiheit</u></strong>
+			ihrer beworbenen Adresse!</li>
+			<li>Unsere AGBs vergessen? <strong>[<a
+				href="{!URL!}/agb.php" target="_blank">Hier sind sie nochmal</a>]</strong>.</li>
+			<li>Gesperrte URLs k&ouml;nnen nicht ein zweites Mal beworben
+			werden.</li>
+			<li>Ihre Seite wird vor dem entg&uuml;ltigem Absenden auf
+			Framekiller hin automatisch <u>doppelt</u> gepr&uuml;ft. Sollten Sie
 			also nur Ihre beworbene Seite sehen, enth&auml;lt diese einen
-			Frame-Killer.</LI>
-			<LI>Ist Sponsor-Mail ausgew&auml;hlt, wird die beworbene Seite
+			Frame-Killer.</li>
+			<li>Ist Sponsor-Mail ausgew&auml;hlt, wird die beworbene Seite
 			nicht geladen, sondern eine neutrale Seite mit unseren
-			Sponsor-Bannern!</LI>
-			<LI>Fremde {!MT_WORD2!} d&uuml;rfen w&auml;hrend der gesamten
+			Sponsor-Bannern!</li>
+			<li>Fremde {!MT_WORD2!} d&uuml;rfen w&auml;hrend der gesamten
 			Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und
-			werden von uns abgelehnt!</LI>
-		</OL>
-		</DIV>
+			werden von uns abgelehnt!</li>
+		</ol>
+		</div>
 		</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
 	</TR>
@@ -124,4 +124,4 @@
 		<TD width="10" class="seperator member_footer">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_order_points.tpl b/templates/de/html/member/member_order_points.tpl
index c2ae4fdb01..f3b1f03d96 100644
--- a/templates/de/html/member/member_order_points.tpl
+++ b/templates/de/html/member/member_order_points.tpl
@@ -1,19 +1,19 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	class="member_main dashed" align="center">
 	<TR>
 		<TD align="center" height="50" class="member_main"
 			style="padding-left: 5px; padding-right: 5px">
 		{--MEMBER_POINTS_LEFT--}:<br />
-		<SPAN class="member_done"><STRONG>$content</STRONG> {!POINTS!}</SPAN>
+		<span class="member_done"><strong>$content</strong> {!POINTS!}</span>
 		</TD>
 	</TR>
 	<TR>
 		<TD align="center" height="50" class="member_main"
 			style="padding-left: 5px; padding-right: 5px">
 		{--MEMBER_ORDER_MAX_ALLOWED--}:<br />
-		<SPAN class="member_done">{!ORDER_MAX_VALUE!}</SPAN></TD>
+		<span class="member_done">{!ORDER_MAX_VALUE!}</span></TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
 <br />
diff --git a/templates/de/html/member/member_payout.tpl b/templates/de/html/member/member_payout.tpl
index 422b2e6270..8f1aa03263 100644
--- a/templates/de/html/member/member_payout.tpl
+++ b/templates/de/html/member/member_payout.tpl
@@ -2,14 +2,14 @@
 	class="member_table dashed" align="center">
 	<TR>
 		<TD colspan="5" align="center" class="member_title2" height="30">
-		<STRONG>{--PAYOUT_MEMBER_LIST_PAYOUTS--}:</STRONG></TD>
+		<strong>{--PAYOUT_MEMBER_LIST_PAYOUTS--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD width="180" align="center" class="member_title2 bottom2 right2"><STRONG>{--PAYOUT_TOTAL_PAYOUT--}</STRONG></TD>
-		<TD width="130" align="center" class="member_title2 bottom2 right2"><STRONG>{--PAYOUT_TARGET_ACCOUNT2--}</STRONG></TD>
-		<TD width="100" align="center" class="member_title2 bottom2 right2"><STRONG>{--PAYOUT_TARGET_BANK2--}</STRONG></TD>
-		<TD width="150" align="center" class="member_title2 bottom2 right2"><STRONG>{--PAYOUT_TIMESTAMP--}</STRONG></TD>
-		<TD width="120" align="center" class="member_title2 bottom2"><STRONG>{--PAYOUT_MEMBER_STATUS--}</STRONG></TD>
+		<TD width="180" align="center" class="member_title2 bottom2 right2"><strong>{--PAYOUT_TOTAL_PAYOUT--}</strong></TD>
+		<TD width="130" align="center" class="member_title2 bottom2 right2"><strong>{--PAYOUT_TARGET_ACCOUNT2--}</strong></TD>
+		<TD width="100" align="center" class="member_title2 bottom2 right2"><strong>{--PAYOUT_TARGET_BANK2--}</strong></TD>
+		<TD width="150" align="center" class="member_title2 bottom2 right2"><strong>{--PAYOUT_TIMESTAMP--}</strong></TD>
+		<TD width="120" align="center" class="member_title2 bottom2"><strong>{--PAYOUT_MEMBER_STATUS--}</strong></TD>
 	</TR>
 	{!__PAYOUT_ROWS!}
 	<TR>
diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl
index ce7f9ff370..495c027ea5 100644
--- a/templates/de/html/member/member_payout_form.tpl
+++ b/templates/de/html/member/member_payout_form.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=payout&amp;payout=$_GET[payout]" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=payout&amp;payout=$_GET[payout]" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="440" class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{--PAYOUT_NOW_TITLE--}</STRONG></TD>
+			height="30"><strong>{--PAYOUT_NOW_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -10,36 +10,36 @@
 	<TR>
 		<TD width="215" height="20" align="right">{--PAYOUT_SELECTED_TYPE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="215"><STRONG>{--PAYOUT_TYPE_VALUE--}</STRONG></TD>
+		<TD width="215"><strong>{--PAYOUT_TYPE_VALUE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_MAX_PAYOUT--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD><STRONG>{--PAYOUT_MAX_VALUE--}</STRONG></TD>
+		<TD><strong>{--PAYOUT_MAX_VALUE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_WANT_PAYOUT--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="payout" class="member_normal"
-			size="10" maxlength="255" value="{--PAYOUT_MAX_VALUE!}"></STRONG></TD>
+			size="10" maxlength="255" value="{--PAYOUT_MAX_VALUE!}"></strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_TARGET_ACCOUNT--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="account" class="member_normal"
-			size="20" maxlength="255"></STRONG></TD>
+			size="20" maxlength="255"></strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_TARGET_BANK--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="bank" class="member_normal"
-			size="20" maxlength="255"></STRONG></TD>
+			size="20" maxlength="255"></strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_OPTIONAL_PASSWORD--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="password" name="pass" class="member_normal"
-			size="10" maxlength="255"></STRONG></TD>
+			size="10" maxlength="255"></strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator bottom2">&nbsp;</TD>
@@ -52,7 +52,7 @@
 	</TR>
 </TABLE>
 <br />
-<STRONG class="member_note"> {--PAYOUT_MEMBER_NOTE--}<br />
+<div class="member_note"> {--PAYOUT_MEMBER_NOTE--}<br />
 <br />
-<A href="{!URL!}/agb.php" target="_blank">{--PAYOUT_REMEMBER_TERMS--}</A>
-</STRONG></FORM>
+<a href="{!URL!}/agb.php" target="_blank">{--PAYOUT_REMEMBER_TERMS--}</a>
+</strong></form>
diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl
index 3884322c24..4e5725003d 100644
--- a/templates/de/html/member/member_payout_form_banner.tpl
+++ b/templates/de/html/member/member_payout_form_banner.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=login&amp;what=payout&amp;payout=$_GET[payout]"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="440"
 	class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{--PAYOUT_NOW_TITLE--}</STRONG></TD>
+			height="30"><strong>{--PAYOUT_NOW_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -13,12 +13,12 @@
 	<TR>
 		<TD width="215" height="20" align="right">{--PAYOUT_SELECTED_TYPE--}:</TD>
 		<TD width="10" class="seperator">&nbsp;</TD>
-		<TD width="215"><STRONG>{!PAYOUT_TYPE_VALUE!}</STRONG></TD>
+		<TD width="215"><strong>{!PAYOUT_TYPE_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_MAX_PAYOUT--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD><STRONG>{!PAYOUT_MAX_VALUE!}</STRONG></TD>
+		<TD><strong>{!PAYOUT_MAX_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PAYOUT_WANT_PAYOUT--}:</TD>
@@ -57,6 +57,6 @@
 <br />
 
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->
-<STRONG class="member_note">(*):&nbsp;{--PAYOUT_BANNER_NOTE--}</STRONG>
+<div class="member_note">(*):&nbsp;{--PAYOUT_BANNER_NOTE--}</strong>
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. -->
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index f8112ba944..fb38f5378f 100644
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -5,11 +5,11 @@
 	</TR>
 	<TR>
 		<TD width="10" rowspan="{!__ROWS_VALUE!}"></TD>
-		<TD align="center" width="228" class="member_header"><STRONG>{--REF_LEVEL--}</STRONG></TD>
+		<TD align="center" width="228" class="member_header"><strong>{--REF_LEVEL--}</strong></TD>
 		<TD width="2" class="member_header"></TD>
-		<TD align="center" width="228" class="member_header"><STRONG>{!POINTS!}</STRONG></TD>
+		<TD align="center" width="228" class="member_header"><strong>{!POINTS!}</strong></TD>
 		<TD width="2" class="member_header"></TD>
-		<TD align="center" width="120" class="member_header"><STRONG>{--REFERRALS--}</STRONG></TD>
+		<TD align="center" width="120" class="member_header"><strong>{--REFERRALS--}</strong></TD>
 		<TD width="10" rowspan="{!__ROWS_VALUE!}"></TD>
 	</TR>
 	{!__REF_LEVEL_ROWS!}
@@ -27,12 +27,12 @@
 		<TD colspan="3" height="1" class="seperator"></TD>
 	</TR>
 	<TR>
-		<TD class="member_data">&nbsp;&nbsp;<STRONG>{--POINTS_SUM--}</STRONG></TD>
+		<TD class="member_data">&nbsp;&nbsp;<strong>{--POINTS_SUM--}</strong></TD>
 		<TD width="2" class="seperator">&nbsp;</TD>
-		<TD class="member_data">&nbsp;&nbsp;<STRONG>{!__TPTS_VALUE!}
-		{!POINTS!}</STRONG></TD>
+		<TD class="member_data">&nbsp;&nbsp;<strong>{!__TPTS_VALUE!}
+		{!POINTS!}</strong></TD>
 		<TD width="2" class="seperator">&nbsp;</TD>
-		<TD class="member_data">&nbsp;&nbsp;<STRONG>{!__TREF_VALUE!}</STRONG></TD>
+		<TD class="member_data">&nbsp;&nbsp;<strong>{!__TREF_VALUE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="5" class="seperator"></TD>
@@ -50,7 +50,7 @@
 	</TR>
 	<TR>
 		<TD colspan="5" class="member_header">
-		<DIV align="center"><STRONG>{--CLICK_STATISTICS--}</STRONG></DIV>
+		<div align="center"><strong>{--CLICK_STATISTICS--}</strong></div>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/member/member_points_bonus_disabled.tpl b/templates/de/html/member/member_points_bonus_disabled.tpl
index 42d083d583..49bd192590 100644
--- a/templates/de/html/member/member_points_bonus_disabled.tpl
+++ b/templates/de/html/member/member_points_bonus_disabled.tpl
@@ -2,6 +2,6 @@
 	<TD colspan="3" height="2" class="seperator"></TD>
 </TR>
 <TR>
-	<TD colspan="5" align="center" class="member_header"><STRONG>{--BONUS_POINTS_DISABLED--}</STRONG>
+	<TD colspan="5" align="center" class="member_header"><strong>{--BONUS_POINTS_DISABLED--}</strong>
 	</TD>
 </TR>
diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl
index ab3cc1079e..ae53489fe3 100644
--- a/templates/de/html/member/member_points_bonus_rows.tpl
+++ b/templates/de/html/member/member_points_bonus_rows.tpl
@@ -2,7 +2,7 @@
 	<TD colspan="3" height="2" class="seperator"></TD>
 </TR>
 <TR>
-	<TD colspan="5" align="center" class="member_header"><STRONG>{--BONUS_POINTS_TITLE--}</STRONG>
+	<TD colspan="5" align="center" class="member_header"><strong>{--BONUS_POINTS_TITLE--}</strong>
 	</TD>
 </TR>
 <TR>
@@ -10,7 +10,7 @@
 </TR>
 <TR>
 	<TD colspan="5" class="member_data">
-	<DIV align="center" class="member_note">{--BONUS_LOGIN_TURBO_NOTE--}</DIV>
+	<div align="center" class="member_note">{--BONUS_LOGIN_TURBO_NOTE--}</div>
 	</TD>
 </TR>
 <TR>
@@ -67,10 +67,10 @@
 	<TD colspan="3" height="5" class="seperator"></TD>
 </TR>
 <TR>
-	<TD class="member_data">&nbsp;&nbsp;<STRONG>{--BONUS_TOTAL--}</STRONG></TD>
+	<TD class="member_data">&nbsp;&nbsp;<strong>{--BONUS_TOTAL--}</strong></TD>
 	<TD width="2" class="seperator">&nbsp;</TD>
-	<TD class="member_data">&nbsp;&nbsp;<STRONG>{!__TTOTAL_VALUE!}
-	{!POINTS!}</STRONG></TD>
+	<TD class="member_data">&nbsp;&nbsp;<strong>{!__TTOTAL_VALUE!}
+	{!POINTS!}</strong></TD>
 	<TD width="2" class="seperator">&nbsp;</TD>
 	<TD class="member_data">&nbsp;</TD>
 </TR>
diff --git a/templates/de/html/member/member_points_upgrade.tpl b/templates/de/html/member/member_points_upgrade.tpl
index ddc36d1588..fffe0e321b 100644
--- a/templates/de/html/member/member_points_upgrade.tpl
+++ b/templates/de/html/member/member_points_upgrade.tpl
@@ -2,7 +2,7 @@
 	<TD colspan="3" height="5" class="seperator"></TD>
 </TR>
 <TR>
-	<TD colspan="5" align="center" class="member_data"><STRONG
-		class="admin_note">{--BONUS_EXTENSION_UPGRADE_1--} <STRONG>v0.2.2</STRONG>
-	{--BONUS_EXTENSION_UPGRADE_2--}</STRONG></TD>
+	<TD colspan="5" align="center" class="member_data"><strong
+		class="admin_note">{--BONUS_EXTENSION_UPGRADE_1--} <strong>v0.2.2</strong>
+	{--BONUS_EXTENSION_UPGRADE_2--}</strong></TD>
 </TR>
diff --git a/templates/de/html/member/member_pool_row.tpl b/templates/de/html/member/member_pool_row.tpl
index 4c90d5243c..1702b07457 100644
--- a/templates/de/html/member/member_pool_row.tpl
+++ b/templates/de/html/member/member_pool_row.tpl
@@ -1,42 +1,42 @@
 <TR>
 	<TD class="switch_mem$content[sw] top2 right" width="30%" align="center">
 		{--EMAIL_ID--}:<br />
-		<STRONG>$content[id]</STRONG>
+		<strong>$content[id]</strong>
 	</TD>
 	<TD class="switch_mem$content[sw] top2 right2" width="40%" align="center">
 		{--EMAIL_SUBJECT--}:<br />
-		<STRONG>$content[subj]</STRONG>
+		<strong>$content[subj]</strong>
 	</TD>
 	<TD class="switch_mem$content[sw] top2" width="30%" align="center">
 		{--EMAIL_TIMESTAMP--}:<br />
-		<STRONG>$content[stamp]</STRONG>
+		<strong>$content[stamp]</strong>
 	</TD>
 </TR>
 <TR>
 	<TD align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_PAYMENT--}:<br />
-		<STRONG>$content[pay]</STRONG>
+		<strong>$content[pay]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_CATEGORY--}:<br />
-		<STRONG>$content[cat]</STRONG>
+		<strong>$content[cat]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top">
 		{--EMAIL_URL--}:<br />
-		<STRONG><A href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</A></STRONG>
+		<strong><a href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
 	</TD>
 </TR>
 <TR>
 	<TD align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_RECEIVERS--}:<br />
-		<STRONG>$content[recs]</STRONG>
+		<strong>$content[recs]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_TYPE--}:<br />
-		<STRONG>$content[type]</STRONG>
+		<strong>$content[type]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top">
 		{--EMAIL_ZIP--}:<br />
-		<STRONG>$content[zip]</STRONG>
+		<strong>$content[zip]</strong>
 	</TD>
 </TR>
diff --git a/templates/de/html/member/member_pool_table.tpl b/templates/de/html/member/member_pool_table.tpl
index e0c2777e8c..4206803b95 100644
--- a/templates/de/html/member/member_pool_table.tpl
+++ b/templates/de/html/member/member_pool_table.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_table dashed">
 <TR>
 	<TD colspan="3" align="center" height="25" class="member_header">
-		<STRONG class="member_done">{--MEMBER_POOL_CONTENT--}</STRONG>
+		<div class="member_done">{--MEMBER_POOL_CONTENT--}</STRONG>
 	</TD>
 </TR>
 $content
diff --git a/templates/de/html/member/member_primera.tpl b/templates/de/html/member/member_primera.tpl
index bf1a598562..4751f4ca63 100644
--- a/templates/de/html/member/member_primera.tpl
+++ b/templates/de/html/member/member_primera.tpl
@@ -2,13 +2,13 @@
 	class="member_table dashed" align="center">
 	<TR>
 		<TD colspan="4" align="center" class="member_title2" height="30">
-		<STRONG>{--PRIMERA_MEMBER_LIST_PRIMERA--}:</STRONG></TD>
+		<strong>{--PRIMERA_MEMBER_LIST_PRIMERA--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD width="180" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_TOTAL_PRIMERA--}</STRONG></TD>
-		<TD width="130" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_TARGET_ACCOUNT2--}</STRONG></TD>
-		<TD width="150" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_TIMESTAMP--}</STRONG></TD>
-		<TD width="120" align="center" class="member_title2 bottom2"><STRONG>{--PRIMERA_MEMBER_STATUS--}</STRONG></TD>
+		<TD width="180" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_TOTAL_PRIMERA--}</strong></TD>
+		<TD width="130" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_TARGET_ACCOUNT2--}</strong></TD>
+		<TD width="150" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_TIMESTAMP--}</strong></TD>
+		<TD width="120" align="center" class="member_title2 bottom2"><strong>{--PRIMERA_MEMBER_STATUS--}</strong></TD>
 	</TR>
 	{!__PRIMERA_ROWS!}
 	<TR>
diff --git a/templates/de/html/member/member_primera_form.tpl b/templates/de/html/member/member_primera_form.tpl
index 63f89b4868..262190069a 100644
--- a/templates/de/html/member/member_primera_form.tpl
+++ b/templates/de/html/member/member_primera_form.tpl
@@ -1,11 +1,11 @@
-<FORM
+<form
 	action="{!URL!}/modules.php?module=login&amp;what=primera&amp;primera=$_GET[primera]"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="440"
 	class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{--PRIMERA_NOW_TITLE--}</STRONG></TD>
+			height="30"><strong>{--PRIMERA_NOW_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator">&nbsp;</TD>
@@ -13,25 +13,25 @@
 	<TR>
 		<TD height="25" align="right">{--PRIMERA_MAX_PRIMERA--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
-		<TD><STRONG>{--PRIMERA_MAX_VALUE--}</STRONG></TD>
+		<TD><strong>{--PRIMERA_MAX_VALUE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PRIMERA_WANT_PRIMERA--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="primera" class="member_normal"
-			size="10" maxlength="255" value="{--PRIMERA_MAX_VALUE!}"></STRONG></TD>
+			size="10" maxlength="255" value="{--PRIMERA_MAX_VALUE!}"></strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PRIMERA_TARGET_ACCOUNT--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="text" name="account" class="member_normal"
-			size="20" maxlength="255"></STRONG></TD>
+			size="20" maxlength="255"></strong></TD>
 	</TR>
 	<TR>
 		<TD height="25" align="right">{--PRIMERA_OPTIONAL_PASSWORD--}:</TD>
 		<TD class="seperator" width="10">&nbsp;</TD>
 		<TD><INPUT type="password" name="pass" class="member_normal"
-			size="10" maxlength="255"></STRONG></TD>
+			size="10" maxlength="255"></strong></TD>
 	</TR>
 	<TR>
 		<TD colspan="3" height="3" class="seperator bottom2">&nbsp;</TD>
@@ -43,9 +43,9 @@
 			value="{--PRIMERA_SEND_NOW--}"></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<DIV class="member_note">{--PRIMERA_MEMBER_NOTE--}<br />
+<div class="member_note">{--PRIMERA_MEMBER_NOTE--}<br />
 <br />
-<A href="{!URL!}/agb.php" target="_blank">{--PRIMERA_REMEMBER_TERMS--}</A>
-</DIV>
+<a href="{!URL!}/agb.php" target="_blank">{--PRIMERA_REMEMBER_TERMS--}</a>
+</div>
diff --git a/templates/de/html/member/member_primera_mode_list.tpl b/templates/de/html/member/member_primera_mode_list.tpl
index fb2d39b290..5a24ef1d94 100644
--- a/templates/de/html/member/member_primera_mode_list.tpl
+++ b/templates/de/html/member/member_primera_mode_list.tpl
@@ -2,14 +2,14 @@
 	class="member_table dashed" align="center">
 	<TR>
 		<TD colspan="4" align="center" class="member_title2" height="30">
-			<STRONG>{--PRIMERA_MEMBER_LIST_PRIMERA--}</STRONG>
+			<strong>{--PRIMERA_MEMBER_LIST_PRIMERA--}</strong>
 		</TD>
 	</TR>
 	<TR>
-		<TD width="180" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_TOTAL_PRIMERA--}</STRONG></TD>
-		<TD width="130" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_ACCOUNT--}</STRONG></TD>
-		<TD width="150" align="center" class="member_title2 bottom2 right2"><STRONG>{--PRIMERA_TIMESTAMP--}</STRONG></TD>
-		<TD width="120" align="center" class="member_title2 bottom2"><STRONG>{--PRIMERA_MEMBER_STATUS--}</STRONG></TD>
+		<TD width="180" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_TOTAL_PRIMERA--}</strong></TD>
+		<TD width="130" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_ACCOUNT--}</strong></TD>
+		<TD width="150" align="center" class="member_title2 bottom2 right2"><strong>{--PRIMERA_TIMESTAMP--}</strong></TD>
+		<TD width="120" align="center" class="member_title2 bottom2"><strong>{--PRIMERA_MEMBER_STATUS--}</strong></TD>
 	</TR>
 	$content[rows]
 	<TR>
diff --git a/templates/de/html/member/member_primera_mode_pay.tpl b/templates/de/html/member/member_primera_mode_pay.tpl
index 816d978807..96fff4a364 100644
--- a/templates/de/html/member/member_primera_mode_pay.tpl
+++ b/templates/de/html/member/member_primera_mode_pay.tpl
@@ -1,8 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=primera&amp;mode=pay" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=primera&amp;mode=pay" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="440" class="member_table dashed">
 	<TR>
 		<TD colspan="3" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{--PRIMERA_MEMBER_PAYOUT_TITLE--}</STRONG></TD>
+			height="30"><strong>{--PRIMERA_MEMBER_PAYOUT_TITLE--}</strong></TD>
 	</TR>
 	<TR>
 		<TD width="315" class="bottom2" height="25" align="right">{--PRIMERA_MEMBER_PAYOUT_POINTS--}</TD>
@@ -43,5 +43,5 @@
 	</TR>
 </TABLE>
 <br />
-<STRONG class="member_note"> {--PRIMERA_MEMBER_PAYOUT_NOTE--}</STRONG>
-</FORM>
+<div class="member_note"> {--PRIMERA_MEMBER_PAYOUT_NOTE--}</strong>
+</form>
diff --git a/templates/de/html/member/member_receive_table.tpl b/templates/de/html/member/member_receive_table.tpl
index 064b7a7e2d..b53769f5ca 100644
--- a/templates/de/html/member/member_receive_table.tpl
+++ b/templates/de/html/member/member_receive_table.tpl
@@ -1,11 +1,11 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400"
 	class="register_header dashed">
 	<TR>
-		<TD align="right" height="40" class="register_left"><STRONG>{--MAX_PER_DAY--}:</STRONG>&nbsp;&nbsp;
+		<TD align="right" height="40" class="register_left"><strong>{--MAX_PER_DAY--}:</strong>&nbsp;&nbsp;
 		</TD>
-		<TD class="register_right"><SELECT name="max_mails" size="1"
+		<TD class="register_right"><select name="max_mails" size="1"
 			class="register_select">
 			{!__MAX_RECEIVE_OPTIONS!}
-		</SELECT></TD>
+		</select></TD>
 	</TR>
 </TABLE>
diff --git a/templates/de/html/member/member_reflinks_row.tpl b/templates/de/html/member/member_reflinks_row.tpl
index fa20f5433f..cf9b292587 100644
--- a/templates/de/html/member/member_reflinks_row.tpl
+++ b/templates/de/html/member/member_reflinks_row.tpl
@@ -2,10 +2,10 @@
 	<TD width="10" class="member_refbanner switch_sw$content[sw]">&nbsp;</TD>
 	<TD align="center" class="member_refbanner switch_sw$content[sw]">
 		<IMG src="$content[url]" alt="$content[alt]" title="$content[alt]" border="0"><br />
-		<FONT class="tiny">{--REFBANNER_TOTALS--}:
-			<STRONG>$content[cnt]</STRONG>&nbsp;{--REF_VIEWS--} /
-			<STRONG>$content[cks]</STRONG>&nbsp;{--REF_CLIX--}
-		</FONT>
+		<div class="tiny">{--REFBANNER_TOTALS--}:
+			<strong>$content[cnt]</strong>&nbsp;{--REF_VIEWS--} /
+			<strong>$content[cks]</strong>&nbsp;{--REF_CLIX--}
+		</div>
 	</TD>
 	<TD width="10" class="member_refbanner switch_sw$content[sw]">&nbsp;</TD>
 </TR>
@@ -16,9 +16,9 @@
 <TR>
 	<TD width="10" class="member_refbanner switch_sw$content[sw]">&nbsp;</TD>
 	<TD align="center" class="member_refbanner switch_sw$content[sw]">
-	<PRE>&lt;A href=&quot;{!URL!}/click.php?user=$content[uid]&amp;banner=$content[id]&quot;
+	<pre>&lt;A href=&quot;{!URL!}/click.php?user=$content[uid]&amp;banner=$content[id]&quot;
  target=&quot;_blank&quot;&gt;&lt;IMG src=&quot;{!URL!}/view.php?user=$content[uid]&amp;banner=$content[id]&quot;
- alt=&quot;$content[alt]&quot; title=&quot;$content[alt]&quot; border=&quot;0&quot;&gt;&lt;/A&gt;</PRE>
+ alt=&quot;$content[alt]&quot; title=&quot;$content[alt]&quot; border=&quot;0&quot;&gt;&lt;/A&gt;</pre>
 	</TD>
 	<TD width="10" class="member_refbanner switch_sw$content[sw]">&nbsp;</TD>
 </TR>
diff --git a/templates/de/html/member/member_reflinks_table.tpl b/templates/de/html/member/member_reflinks_table.tpl
index 0c29888863..67fdd9fdef 100644
--- a/templates/de/html/member/member_reflinks_table.tpl
+++ b/templates/de/html/member/member_reflinks_table.tpl
@@ -1,4 +1,4 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center">
 	<TR>
@@ -6,4 +6,4 @@
 	</TR>
 	{!__REFLINKS_ROWS!}
 </TABLE>
-</DIV>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl
index adb81f0fb7..529d00ffb0 100644
--- a/templates/de/html/member/member_stats_row.tpl
+++ b/templates/de/html/member/member_stats_row.tpl
@@ -1,44 +1,44 @@
 <TR>
 	<TD class="switch_mem$content[sw] top2 right" width="46%" colspan="2" align="center">
 		{--EMAIL_SUBJECT--}:<br />
-		<STRONG>$content[subj]</STRONG>
+		<strong>$content[subj]</strong>
 	</TD>
 	<TD class="switch_mem$content[sw] top2" width="54%" align="center">
 		{--EMAIL_TIMESTAMP--}:<br />
-		<STRONG>$content[stamp]</STRONG>
+		<strong>$content[stamp]</strong>
 	</TD>
 </TR>
 <TR>
 	<TD colspan="2" align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_PAYMENT--}:<br />
-		<STRONG>$content[pay]</STRONG>
+		<strong>$content[pay]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top">
 		{--EMAIL_CATEGORY--}:<br />
-		<STRONG>$content[cat]</STRONG>
+		<strong>$content[cat]</strong>
 	</TD>
 </TR>
 <TR>
 	<TD colspan="2" align="center" class="switch_mem$content[sw] top right">
 		{--EMAIL_URL--}:<br />
-		<STRONG><A href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</A></STRONG>
+		<strong><a href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top">
 		{--EMAIL_END_SEND--}:<br />
-		<STRONG>$content[sent]</STRONG>
+		<strong>$content[sent]</strong>
 	</TD>
 </TR>
 <TR>
 	<TD align="center" class="switch_mem$content[sw] top right" width="30%">
 		{--EMAIL_RECEIVERS--}:<br />
-		<STRONG>$content[recs]</STRONG>
+		<strong>$content[recs]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top right" width="16%">
 		{--EMAIL_CONFIRMED--}:<br />
-		<STRONG>$content[clix]</STRONG>
+		<strong>$content[clix]</strong>
 	</TD>
 	<TD align="center" class="switch_mem$content[sw] top">
 		{--EMAIL_PERCENT--}:<br />
-		<STRONG>$content[perc]</STRONG>
+		<strong>$content[perc]</strong>
 	</TD>
 </TR>
diff --git a/templates/de/html/member/member_stats_table.tpl b/templates/de/html/member/member_stats_table.tpl
index 029b355132..dd41f99ca3 100644
--- a/templates/de/html/member/member_stats_table.tpl
+++ b/templates/de/html/member/member_stats_table.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="member_table dashed">
 <TR>
 	<TD colspan="3" align="center" height="25" class="member_header">
-		<STRONG class="member_done">{--MEMBER_STATS_CONTENT--}</STRONG>
+		<div class="member_done">{--MEMBER_STATS_CONTENT--}</STRONG>
 	</TD>
 </TR>
 $content
diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl
index 52a0387c98..24cb60b504 100644
--- a/templates/de/html/member/member_support_form.tpl
+++ b/templates/de/html/member/member_support_form.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=support"
+<form action="{!URL!}/modules.php?module=login&amp;what=support"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
 	align="center" class="member_header">
@@ -6,37 +6,37 @@
 		<TD height="5" colspan="2" class="seperator top2 left2 right2">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD align="center" colspan="2" class="left2 right2"><STRONG>Sie
-		haben eine Frage an unseren Support?</STRONG><br />
+		<TD align="center" colspan="2" class="left2 right2"><strong>Sie
+		haben eine Frage an unseren Support?</strong><br />
 		<HR noshade width="400">
-		<DIV align="left"><PRE style="margin-bottom: 0px">Hallo Support-Team,<br />
+		<div align="left"><pre style="margin-bottom: 0px">Hallo Support-Team,<br />
   Meine ID bei Ihrem {!MT_WORD!} lautet: $content[userid]
-</PRE></DIV>
+</pre></div>
 		</TD>
 	</TR>
 	<TR>
 		<TD align="center" class="left2 right2">
-		<DIV align="left"><PRE style="margin-bottom: 5px">Ich habe eine Frage zu folgendem:</PRE></DIV>
-		<SELECT name="qsummary" size="1" class="member_select">
-			<OPTION value="" disabled>- - - Bitte ausw&auml;hlen! - - -</OPTION>
-			<OPTION value="ordr">Alles rund um die Mailbuchung</OPTION>
-			<OPTION value="unconfirmed">Nicht best&auml;tigte Mails</OPTION>
-			<OPTION value="reflink">Referal-Link (und Werbebanner)</OPTION>
-		</SELECT></TD>
+		<div align="left"><pre style="margin-bottom: 5px">Ich habe eine Frage zu folgendem:</pre></div>
+		<select name="qsummary" size="1" class="member_select">
+			<option value="" disabled>- - - Bitte ausw&auml;hlen! - - -</option>
+			<option value="ordr">Alles rund um die Mailbuchung</option>
+			<option value="unconfirmed">Nicht best&auml;tigte Mails</option>
+			<option value="reflink">Referal-Link (und Werbebanner)</option>
+		</select></TD>
 	</TR>
 	<TR>
 		<TD align="center" class="left2 right2">
-		<DIV align="left"><PRE style="margin-bottom: 5px">Ich m&ouml;chte es genauer beschreiben:</PRE></DIV>
-		<TEXTAREA name="qdetails" rows="5" cols="35" class="member_normal"></TEXTAREA><br />
-		<FONT class="tiny member_note"> (Bitte halten Sie den Text kurz
+		<div align="left"><pre style="margin-bottom: 5px">Ich m&ouml;chte es genauer beschreiben:</pre></div>
+		<textarea name="qdetails" rows="5" cols="35" class="member_normal"></textarea><br />
+		<div class="tiny member_note"> (Bitte halten Sie den Text kurz
 		und knapp, damit Ihre<br />
-		Support-Anfrage schnell beantwortet werden kann!) </FONT></TD>
+		Support-Anfrage schnell beantwortet werden kann!) </div></TD>
 	</TR>
 	<TR>
 		<TD align="center" class="left2 right2">
-		<DIV align="left"><PRE style="margin-bottom: 5px">Mit freundlichem Gruss,
+		<div align="left"><pre style="margin-bottom: 5px">Mit freundlichem Gruss,
     Ihr $username
-</PRE></DIV>
+</pre></div>
 		<HR noshade width="400">
 		<INPUT type="reset" class="member_reset" value="Nochmal eingeben"><BIG></BIG>
 		<INPUT type="submit" class="member_submit" name="ok"
@@ -46,4 +46,4 @@
 		<TD height="5" colspan="2" class="seperator bottom2 left2 right2">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl
index 684da34689..bb756bb22e 100644
--- a/templates/de/html/member/member_surfbar_delete_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl
@@ -30,7 +30,7 @@
 </div>
 </form>
 
-<div class="note">
+<div class="member_note">
 	<strong>Hinweis:</strong> Irt&uuml;mlich gel&ouml;schte URLs k&ouml;nnen nur
 	durch unsere Administratoren wiederhergestellt werden.
 </div>
diff --git a/templates/de/html/member/member_themes.tpl b/templates/de/html/member/member_themes.tpl
index d6839c0dcd..375b1eec6f 100644
--- a/templates/de/html/member/member_themes.tpl
+++ b/templates/de/html/member/member_themes.tpl
@@ -1,8 +1,8 @@
-<DIV align="center">
+<div align="center">
 
 <P>{--MEMBER_THEME_LIST_USAGE--}</P>
 
-<FORM action="{!URL!}/modules.php?module=login&amp;what=themes"
+<form action="{!URL!}/modules.php?module=login&amp;what=themes"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
 	class="admin_table dashed">
@@ -21,8 +21,8 @@
 			value="{--MEMBER_SAVE_THEME--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
 
-<P><FONT class="admin_note">{--MEMBER_THEME_LIST_NOTE--}</FONT></P>
+<P><div class="admin_note">{--MEMBER_THEME_LIST_NOTE--}</div></P>
 
-</DIV>
+</div>
diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl
index 00c0b8b40c..10bf65862d 100644
--- a/templates/de/html/member/member_transfer_list.tpl
+++ b/templates/de/html/member/member_transfer_list.tpl
@@ -1,27 +1,27 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="member_table dashed">
 	<TR>
 		<TD colspan="5" align="center" class="member_title2 bottom2"
-			height="30"><STRONG>{!__TRANSFER_TITLE!}</STRONG></TD>
+			height="30"><strong>{!__TRANSFER_TITLE!}</strong></TD>
 	</TR>
 	<TR>
 		<TD width="80" align="center" class="member_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_ID--}</STRONG></TD>
+		<strong>{--TRANSFER_ID--}</strong></TD>
 		<TD width="120" align="center" class="member_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_STAMP--}</STRONG></TD>
+		<strong>{--TRANSFER_STAMP--}</strong></TD>
 		<TD width="120" align="center" class="member_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_PARTY--}</STRONG></TD>
+		<strong>{--TRANSFER_PARTY--}</strong></TD>
 		<TD width="230" align="center" class="member_title2 bottom2 right2">
-		<STRONG>{--TRANSFER_POINTS_REASON--}</STRONG></TD>
-		<TD width="80" align="center" class="member_title2 bottom2"><STRONG>{!POINTS!}</STRONG>
+		<strong>{--TRANSFER_POINTS_REASON--}</strong></TD>
+		<TD width="80" align="center" class="member_title2 bottom2"><strong>{!POINTS!}</strong>
 		</TD>
 	</TR>
 	{!__TRANSFER_ROWS!}
 	<TR>
 		<TD colspan="4" align="right" class="member_footer right2">
 		{!__TRANSFER_SUM!} ({!POINTS!}):&nbsp;</TD>
-		<TD width="80" align="center" class="member_footer"><STRONG>{!__TRANSFER_TOTAL_VALUE!}</STRONG>
+		<TD width="80" align="center" class="member_footer"><strong>{!__TRANSFER_TOTAL_VALUE!}</strong>
 		</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl
index 7d09bfd320..3bd456a6a0 100644
--- a/templates/de/html/member/member_transfer_new.tpl
+++ b/templates/de/html/member/member_transfer_new.tpl
@@ -1,7 +1,7 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=new" method="POST" style="margin-bottom: 0px">
+<form action="{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=new" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="guest_table dashed">
 	<TR>
-		<TD align="right" width="220" class="bottom2" height="40"><STRONG>{--TRANSFER_SELECT_TARGET_UID--}:</STRONG>
+		<TD align="right" width="220" class="bottom2" height="40"><strong>{--TRANSFER_SELECT_TARGET_UID--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
@@ -9,14 +9,14 @@
 		{!__TRANSFER_USERID_SELECTION!}</TD>
 	</TR>
 	<TR>
-		<TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_MAXIMUM--}:</STRONG>
+		<TD align="right" class="bottom2" height="40"><strong>{--TRANSFER_POINTS_MAXIMUM--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
 		<TD class="bottom2">{!__TRANSFER_MAX_VALUE!} {!POINTS!}</TD>
 	</TR>
 	<TR>
-		<TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_AMOUNT--}:</STRONG>
+		<TD align="right" class="bottom2" height="40"><strong>{--TRANSFER_POINTS_AMOUNT--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
@@ -26,7 +26,7 @@
 		{!POINTS!}</TD>
 	</TR>
 	<TR>
-		<TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_REASON--}:</STRONG>
+		<TD align="right" class="bottom2" height="40"><strong>{--TRANSFER_POINTS_REASON--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
@@ -36,14 +36,14 @@
 		</TD>
 	</TR>
 	<TR>
-		<TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_SECURITY_CODE--}:</STRONG>
+		<TD align="right" class="bottom2" height="40"><strong>{--TRANSFER_POINTS_SECURITY_CODE--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
 		<TD class="bottom2">{!__TRANSFER_IMAGE_INPUT!}</TD>
 	</TR>
 	<TR>
-		<TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_ENTER_PASSWORD--}:</STRONG>
+		<TD align="right" class="bottom2" height="40"><strong>{--TRANSFER_ENTER_PASSWORD--}:</strong>
 		</TD>
 		<TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
 		<TD width="10" class="bottom2 seperator">&nbsp;</TD>
@@ -58,4 +58,4 @@
 			value="{--TRANSFER_ADD_NEW--}"{!__TRANSFER_TO_DISABLED!}></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_transfer_overview.tpl b/templates/de/html/member/member_transfer_overview.tpl
index 191941ae62..575e8ef31f 100644
--- a/templates/de/html/member/member_transfer_overview.tpl
+++ b/templates/de/html/member/member_transfer_overview.tpl
@@ -1,22 +1,22 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="520"
 	class="member_table dashed">
 	<TR>
 		<TD align="center" width="260" class="bottom2 right2" height="40">
 		{--TRANSFER_LIST_INCOMING--}:<br />
-		<STRONG>{!-__TRANSFER_IN_LINK!}</STRONG></TD>
+		<strong>{!-__TRANSFER_IN_LINK!}</strong></TD>
 		<TD align="center" width="260" class="bottom2">
 		{--TRANSFER_LIST_OUTGOING--}:<br />
-		<STRONG>{!__TRANSFER_OUT_LINK!}</STRONG></TD>
+		<strong>{!__TRANSFER_OUT_LINK!}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" height="40" class="bottom2">
 		{--TRANSFER_LIST_ALL--}:<br />
-		<STRONG>{!__TRANSFER_ALL_LINK!}</STRONG></TD>
+		<strong>{!__TRANSFER_ALL_LINK!}</strong></TD>
 	</TR>
 	<TR>
 		<TD align="center" colspan="2" height="40" class="bottom2">
-			<STRONG>{--TRANSFER_TO_MEMBER_NOW--}:</STRONG><br />
+			<strong>{--TRANSFER_TO_MEMBER_NOW--}:</strong><br />
 			{!__TRANSFER_NEW_LINK!}
 		</TD>
 	</TR>
@@ -31,4 +31,4 @@
 		<TD colspan="2" class="member_main seperator" height="10">&nbsp;</TD>
 	</TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl
index c00f226253..88abefc73f 100644
--- a/templates/de/html/member/member_transfer_settings.tpl
+++ b/templates/de/html/member/member_transfer_settings.tpl
@@ -1,4 +1,4 @@
-<FORM action="{!URL!}/modules.php?module=login&amp;what=transfer"
+<form action="{!URL!}/modules.php?module=login&amp;what=transfer"
 	method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="420"
 	class="member_table dashed">
@@ -18,4 +18,4 @@
 			value="{--SAVE_SETTINGS--}" /></TD>
 	</TR>
 </TABLE>
-</FORM>
+</form>
diff --git a/templates/de/html/member/member_unconfirmed_404.tpl b/templates/de/html/member/member_unconfirmed_404.tpl
index f08e6fffd0..4df44080a0 100644
--- a/templates/de/html/member/member_unconfirmed_404.tpl
+++ b/templates/de/html/member/member_unconfirmed_404.tpl
@@ -1,5 +1,5 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] top" colspan="5">
-		<STRONG class="member_failed large">$content[probl]:</STRONG> $content[data]
+		<div class="member_failed large">$content[probl]:</STRONG> $content[data]
 	</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl
index ac30959489..ed0459211d 100644
--- a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl
+++ b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl
@@ -1,5 +1,5 @@
 <TR>
 	<TD align="center" class="switch_sw$content[sw] top" colspan="4">
-		<STRONG class="member_failed large">$content[probl]:</STRONG> $content[data]
+		<div class="member_failed large">$content[probl]:</STRONG> $content[data]
 	</TD>
 </TR>
\ No newline at end of file
diff --git a/templates/de/html/member/member_welcome_header.tpl b/templates/de/html/member/member_welcome_header.tpl
index fb63aeaa73..b6c5029c26 100644
--- a/templates/de/html/member/member_welcome_header.tpl
+++ b/templates/de/html/member/member_welcome_header.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 <TR>
 	<TD width="10" class="seperator">&nbsp;</TD>
-	<TD class="member_content">{--LAST_ONLINE--}: <STRONG>{!_LAST_ONLINE_VALUE!}</STRONG><br />
-	{--LAST_MODULE--}: <STRONG>{!_LAST_MODULE_VALUE!}</STRONG></TD>
+	<TD class="member_content">{--LAST_ONLINE--}: <strong>{!_LAST_ONLINE_VALUE!}</strong><br />
+	{--LAST_MODULE--}: <strong>{!_LAST_MODULE_VALUE!}</strong></TD>
 </TR>
 <TR>
 	<TD colspan="2" height="7" class="seperator">&nbsp;</TD>
diff --git a/templates/de/html/member/member_wernis.tpl b/templates/de/html/member/member_wernis.tpl
index 5677bc0252..79fc1097ae 100644
--- a/templates/de/html/member/member_wernis.tpl
+++ b/templates/de/html/member/member_wernis.tpl
@@ -2,13 +2,13 @@
 	class="member_table dashed" align="center">
 	<TR>
 		<TD colspan="4" align="center" class="member_title2" height="30">
-		<STRONG>{--WERNIS_MEMBER_LIST_WERNIS--}:</STRONG></TD>
+		<strong>{--WERNIS_MEMBER_LIST_WERNIS--}:</strong></TD>
 	</TR>
 	<TR>
-		<TD width="180" align="center" class="member_title2 bottom2 right2"><STRONG>{--WERNIS_TOTAL_WERNIS--}</STRONG></TD>
-		<TD width="130" align="center" class="member_title2 bottom2 right2"><STRONG>{--WERNIS_TARGET_ACCOUNT2--}</STRONG></TD>
-		<TD width="150" align="center" class="member_title2 bottom2 right2"><STRONG>{--WERNIS_TIMESTAMP--}</STRONG></TD>
-		<TD width="120" align="center" class="member_title2 bottom2"><STRONG>{--WERNIS_MEMBER_STATUS--}</STRONG></TD>
+		<TD width="180" align="center" class="member_title2 bottom2 right2"><strong>{--WERNIS_TOTAL_WERNIS--}</strong></TD>
+		<TD width="130" align="center" class="member_title2 bottom2 right2"><strong>{--WERNIS_TARGET_ACCOUNT2--}</strong></TD>
+		<TD width="150" align="center" class="member_title2 bottom2 right2"><strong>{--WERNIS_TIMESTAMP--}</strong></TD>
+		<TD width="120" align="center" class="member_title2 bottom2"><strong>{--WERNIS_MEMBER_STATUS--}</strong></TD>
 	</TR>
 	{!__WERNIS_ROWS!}
 	<TR>
diff --git a/templates/de/html/online_now.tpl b/templates/de/html/online_now.tpl
index 6cb6b7b019..3efb3b88b1 100644
--- a/templates/de/html/online_now.tpl
+++ b/templates/de/html/online_now.tpl
@@ -3,8 +3,7 @@
 		<TD class="guest_menu_row">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
-				<TD width="10%" align="center" valign="top"><STRONG><FONT
-					class="medium">{!GUESTS_ONLINE_CNT!}</FONT></STRONG></TD>
+				<TD width="10%" align="center" valign="top"><strong><div class="medium">{!GUESTS_ONLINE_CNT!}</div></strong></TD>
 				<TD width="90%">{--GUESTS_ONLINE--}</TD>
 			</TR>
 		</TABLE>
@@ -14,8 +13,7 @@
 		<TD class="guest_menu_row">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
-				<TD width="10%" align="center" valign="top"><STRONG><FONT
-					class="medium">{!MEMBERS_ONLINE_CNT!}</FONT></STRONG></TD>
+				<TD width="10%" align="center" valign="top"><strong><div class="medium">{!MEMBERS_ONLINE_CNT!}</div></strong></TD>
 				<TD width="90%">{--MEMBERS_ONLINE--}</TD>
 			</TR>
 		</TABLE>
@@ -25,8 +23,7 @@
 		<TD class="guest_menu_bottom">
 		<TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 			<TR>
-				<TD width="10%" align="center" valign="top"><STRONG><FONT
-					class="medium">{!ADMINS_ONLINE_CNT!}</FONT></STRONG></TD>
+				<TD width="10%" align="center" valign="top"><strong><div class="medium">{!ADMINS_ONLINE_CNT!}</div></strong></TD>
 				<TD width="90%">{--ADMINS_ONLINE--}</TD>
 			</TR>
 		</TABLE>
diff --git a/templates/de/html/page_footer.tpl b/templates/de/html/page_footer.tpl
index f546bf033c..282ab18884 100644
--- a/templates/de/html/page_footer.tpl
+++ b/templates/de/html/page_footer.tpl
@@ -1,5 +1,4 @@
-
-</DIV>
+</div>
 </TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/profile-update.tpl b/templates/de/html/profile-update.tpl
index 29129c3351..6c3f08c5a8 100644
--- a/templates/de/html/profile-update.tpl
+++ b/templates/de/html/profile-update.tpl
@@ -10,8 +10,8 @@
 			<TR>
 				<TD width="10" class="seperator">&nbsp;</TD>
 				<TD align="left">
-				<DIV align="center"><STRONG>Vielen Dank, dass Sie uns
-				auf dem Laufenden halten wollen!</STRONG></DIV>
+				<div align="center"><strong>Vielen Dank, dass Sie uns
+				auf dem Laufenden halten wollen!</strong></div>
 				<br />
 				Wenn Sie jetzt Ihr Profil aktualisieren wollen, klicken Sie einfach
 				unten auf den Button. War unsere Benachrichtigung ein Irrtum, so
@@ -33,16 +33,16 @@
 	</TR>
 	<TR>
 		<TD align="center" class="left2" width="50%">
-		<FORM action="{!URL!}/modules.php?module=login&amp;what=mydata"
+		<form action="{!URL!}/modules.php?module=login&amp;what=mydata"
 			method="POST" style="margin-top: 0px"><INPUT type="submit"
 			name="notify" class="member_reset"
-			value="Benachrichtigung abschalten"></FORM>
+			value="Benachrichtigung abschalten"></form>
 		</TD>
 		<TD align="center" class="right2" width="50%">
-		<FORM action="{!URL!}/modules.php?module=login&amp;what=mydata"
+		<form action="{!URL!}/modules.php?module=login&amp;what=mydata"
 			method="POST" style="margin-top: 0px"><INPUT type="submit"
 			name="edit" class="member_reset" value="Profildaten &auml;ndern">
-		</FORM>
+		</form>
 		</TD>
 	</TR>
 	<TR>
diff --git a/templates/de/html/redirect_url.tpl b/templates/de/html/redirect_url.tpl
index e52df9a25c..c45b4c5cf5 100644
--- a/templates/de/html/redirect_url.tpl
+++ b/templates/de/html/redirect_url.tpl
@@ -1,4 +1,4 @@
-<NOSCRIPT>{--LOAD_URL_ERROR_1--}<A href="$content" rel="external" title="$content">$content</A>{--LOAD_URL_ERROR_2--}</NOSCRIPT>
+<NOSCRIPT>{--LOAD_URL_ERROR_1--}<a href="$content" rel="external" title="$content">$content</a>{--LOAD_URL_ERROR_2--}</NOSCRIPT>
 <SCRIPT language="JavaScript" type="text/javascript">
 <!--
 document.location.href='$content';
diff --git a/templates/de/html/register_header.tpl b/templates/de/html/register_header.tpl
index b92c7e75b7..f1751c1b9b 100644
--- a/templates/de/html/register_header.tpl
+++ b/templates/de/html/register_header.tpl
@@ -1,3 +1,3 @@
 Anmeldeformular zum {!MT_WORD!}
-<STRONG>{!MAIN_TITLE!}</STRONG>
+<strong>{!MAIN_TITLE!}</strong>
 :
diff --git a/templates/de/html/runtime_fatal_row.tpl b/templates/de/html/runtime_fatal_row.tpl
index 3421983132..204f5881c1 100644
--- a/templates/de/html/runtime_fatal_row.tpl
+++ b/templates/de/html/runtime_fatal_row.tpl
@@ -1,2 +1,2 @@
-<DIV class="runtime_fatalcontent"><STRONG>{--FATAL_NO--}$content[key]:</STRONG><br />
-&nbsp;&nbsp;&nbsp;<STRONG>&middot;</STRONG>&nbsp;$content[value]</DIV>
+<div class="runtime_fatalcontent"><strong>{--FATAL_NO--}$content[key]:</strong><br />
+&nbsp;&nbsp;&nbsp;<strong>&middot;</strong>&nbsp;$content[value]</div>
diff --git a/templates/de/html/runtime_fatal_table.tpl b/templates/de/html/runtime_fatal_table.tpl
index 973e2ca0a8..8962f796c2 100644
--- a/templates/de/html/runtime_fatal_table.tpl
+++ b/templates/de/html/runtime_fatal_table.tpl
@@ -1,5 +1,5 @@
-<DIV align="center">
-<DIV class="runtime_fatal">
-<DIV class="fatal_title">{--RUNTIME_PROBLEMS_DETECTED--}</DIV>
-$content</DIV>
-</DIV>
+<div align="center">
+<div class="runtime_fatal">
+<div class="fatal_title">{--RUNTIME_PROBLEMS_DETECTED--}</div>
+$content</div>
+</div>
diff --git a/templates/de/html/show_bonus_footer.tpl b/templates/de/html/show_bonus_footer.tpl
index ac34f32967..1bde9de98b 100644
--- a/templates/de/html/show_bonus_footer.tpl
+++ b/templates/de/html/show_bonus_footer.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>show_bonus_footer.tpl</STRONG>
+<strong>show_bonus_footer.tpl</strong>
 !
diff --git a/templates/de/html/show_bonus_header.tpl b/templates/de/html/show_bonus_header.tpl
index 42d4c1185f..5fff10f15d 100644
--- a/templates/de/html/show_bonus_header.tpl
+++ b/templates/de/html/show_bonus_header.tpl
@@ -1,3 +1,3 @@
 Dieser Text steht im Template
-<STRONG>show_bonus_header.tpl</STRONG>
+<strong>show_bonus_header.tpl</strong>
 !
diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl
index 933ce8fde1..46bae06297 100644
--- a/templates/de/html/show_bonus_msg.tpl
+++ b/templates/de/html/show_bonus_msg.tpl
@@ -2,26 +2,25 @@
 <br />
 <br />
 {--BONUS_SHOW_HEADER_LINE_1--}
-<STRONG>{!POINTS!}</STRONG>
+<strong>{!POINTS!}</strong>
 {--BONUS_SHOW_HEADER_LINE_2--}
-<STRONG>{!__MAILID!}</STRONG>
+<strong>{!__MAILID!}</strong>
 {--BONUS_SHOW_HEADER_LINE_3--}:
 <br />
 <br />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="300" class="member_table dashed">
 	<TR>
-		<TD width="80" align="center" class="member_header bottom2"><STRONG>{!BONUS_RANK!}:</STRONG></TD>
-		<TD width="120" align="center" class="member_header bottom2"><STRONG>{!_UID!}:</STRONG></TD>
-		<TD width="100" align="center" class="member_header bottom2"><STRONG>{!POINTS!}:</STRONG></TD>
+		<TD width="80" align="center" class="member_header bottom2"><strong>{!BONUS_RANK!}:</strong></TD>
+		<TD width="120" align="center" class="member_header bottom2"><strong>{!_UID!}:</strong></TD>
+		<TD width="100" align="center" class="member_header bottom2"><strong>{!POINTS!}:</strong></TD>
 	</TR>
 	{!__RANK_ROWS!}
 	<TR>
-		<TD colspan="3" class="member_footer" align="center"><FONT
-			class="tiny member_note">&nbsp;</FONT></TD>
+		<TD colspan="3" class="member_footer" align="center"><div class="tiny member_note">&nbsp;</div></TD>
 	</TR>
 </TABLE>
 
 <P>{!__YOUR_RANKING_LINE!}</P>
 
-<P><FONT class="member_note"> {--BONUS_SHOW_FOOTER_NOTE_1--}<br />
-{--BONUS_SHOW_FOOTER_NOTE_2--} </FONT></P>
+<P><div class="member_note"> {--BONUS_SHOW_FOOTER_NOTE_1--}<br />
+{--BONUS_SHOW_FOOTER_NOTE_2--} </div></P>
diff --git a/templates/de/html/show_bonus_yr.tpl b/templates/de/html/show_bonus_yr.tpl
index 8245f64809..3f20427efc 100644
--- a/templates/de/html/show_bonus_yr.tpl
+++ b/templates/de/html/show_bonus_yr.tpl
@@ -1,8 +1,8 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="300" class="member_table">
 <TR>
-	<TD align="center">{--BONUS_SHOW_YOU_HAVE_CONFIRMED--} <STRONG
-		class="nobr">{!__YR_TMARK!}</STRONG> {--_ON--} <STRONG>{!__YR_LEVEL!}.</STRONG>
-	{--BONUS_SHOW_CONFIRMED_BONUS_IS--}:&nbsp;<STRONG class="nobr">{!__YR_POINTS!}
-	{!POINTS!}</STRONG></TD>
+	<TD align="center">{--BONUS_SHOW_YOU_HAVE_CONFIRMED--} <strong
+		class="nobr">{!__YR_TMARK!}</strong> {--_ON--} <strong>{!__YR_LEVEL!}.</strong>
+	{--BONUS_SHOW_CONFIRMED_BONUS_IS--}:&nbsp;<div class="nobr">{!__YR_POINTS!}
+	{!POINTS!}</strong></TD>
 </TR>
 </TABLE>
diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index 979e5d9bd8..8b8d182c4b 100644
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=sponsor&amp;what=account" method="POST" style="padding-bottom: 0px">
+<div align="center">
+<form action="{!URL!}/modules.php?module=sponsor&amp;what=account" method="POST" style="padding-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="550" class="sponsor_table dashed">
 <TR>
   <TD colspan="2" align="center" class="sponsor_header bottom2" height="32">
-    <STRONG>{--SPONSOR_ENTER_COMPANY_DATA--}:</STRONG>
+    <strong>{--SPONSOR_ENTER_COMPANY_DATA--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -32,7 +32,7 @@
 </TR>
 <TR>
   <TD colspan="2" align="center" class="sponsor_header bottom2" height="32">
-    <STRONG>{--SPONSOR_ENTER_PERSONA_DATA--}:</STRONG>
+    <strong>{--SPONSOR_ENTER_PERSONA_DATA--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -40,11 +40,11 @@
     {--GUEST_GENDER--}:&nbsp;
   </TD>
   <TD class="bottom2" width="275">
-    &nbsp;<SELECT name="gender" class="guest_select" size="1">
-      <OPTION value="M"{!__GENDER_M!}>{--GENDER_M--}</OPTION>
-      <OPTION value="F"{!__GENDER_F!}>{--GENDER_F--}</OPTION>
-      <OPTION value="C"{!__GENDER_C!}>{--GENDER_C--}</OPTION>
-    </SELECT>                                                                                                     
+    &nbsp;<select name="gender" class="guest_select" size="1">
+      <option value="M"{!__GENDER_M!}>{--GENDER_M--}</option>
+      <option value="F"{!__GENDER_F!}>{--GENDER_F--}</option>
+      <option value="C"{!__GENDER_C!}>{--GENDER_C--}</option>
+    </select>
   </TD>
 </TR>
 <TR>
@@ -65,7 +65,7 @@
 </TR>
 <TR>
   <TD colspan="2" align="center" class="sponsor_header bottom2" height="32">
-    <STRONG>{--SPONSOR_ENTER_CONTACT_DATA--}</STRONG>
+    <strong>{--SPONSOR_ENTER_CONTACT_DATA--}</strong>
   </TD>
 </TR>
 <TR>
@@ -135,7 +135,7 @@
 </TR>
 <TR>
   <TD class="sponsor_header bottom2" colspan="2" align="center" height="37">
-    <STRONG>{--SPONSOR_ENTER_OLD_PASSWORD--}:</STRONG>
+    <strong>{--SPONSOR_ENTER_OLD_PASSWORD--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -148,7 +148,7 @@
 </TR>
 <TR>
   <TD class="sponsor_header bottom2" colspan="2" align="center" height="37">
-    <STRONG>{--SPONSOR_CHANGE_PASSWORD--}:</STRONG>
+    <strong>{--SPONSOR_CHANGE_PASSWORD--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -162,7 +162,7 @@
 </TR>
 <TR>
   <TD class="bottom2" colspan="2" align="center">
-    <FONT class="tiny guest_note">{--SPONSOR_PASSWORD_NOTE--}</FONT>
+    <div class="tiny guest_note">{--SPONSOR_PASSWORD_NOTE--}</div>
   </TD>
 </TR>
 <TR>
@@ -172,5 +172,5 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/sponsor/sponsor_action.tpl b/templates/de/html/sponsor/sponsor_action.tpl
index 28ba54e152..e1da0a589e 100644
--- a/templates/de/html/sponsor/sponsor_action.tpl
+++ b/templates/de/html/sponsor/sponsor_action.tpl
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
 <TR>
   <TD class="sponsor_action bottom2 left2 right2" align="center">
-    <STRONG>$content[title]</STRONG>
+    <strong>$content[title]</strong>
   </TD>
 </TR>
 $content[menu]
diff --git a/templates/de/html/sponsor/sponsor_fillup_form.tpl b/templates/de/html/sponsor/sponsor_fillup_form.tpl
index e12d1e9dac..d85cd091c8 100644
--- a/templates/de/html/sponsor/sponsor_fillup_form.tpl
+++ b/templates/de/html/sponsor/sponsor_fillup_form.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=sponsor&amp;what=fillup" method="POST" style="padding-bottom: 0px">
+<div align="center">
+<form action="{!URL!}/modules.php?module=sponsor&amp;what=fillup" method="POST" style="padding-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="450" class="sponsor_table dashed">
 <TR>
   <TD class="sponsor_header bottom2" colspan="2" align="center" height="37">
-    <STRONG>{--SPONSOR_POINTS_OVERVIEW--}:</STRONG>
+    <strong>{--SPONSOR_POINTS_OVERVIEW--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -37,5 +37,5 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/sponsor/sponsor_header.tpl b/templates/de/html/sponsor/sponsor_header.tpl
index 603b5ccb92..644670b1ac 100644
--- a/templates/de/html/sponsor/sponsor_header.tpl
+++ b/templates/de/html/sponsor/sponsor_header.tpl
@@ -1,2 +1,2 @@
-<STRONG class="big">{--SPONSOR_WELCOME_TO--}</STRONG><br />
+<div class="big">{--SPONSOR_WELCOME_TO--}</STRONG><br />
 {!MAIN_TITLE!}
diff --git a/templates/de/html/sponsor/sponsor_main.tpl b/templates/de/html/sponsor/sponsor_main.tpl
index 597ab6b717..ca1d31dc4f 100644
--- a/templates/de/html/sponsor/sponsor_main.tpl
+++ b/templates/de/html/sponsor/sponsor_main.tpl
@@ -1,4 +1,4 @@
-<DIV align="center">
+<div align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="sponsor_table" width="100%" height="100%">
 <TR>
   <TD colspan="2" class="sponsor_header" align="center" height="75">
@@ -20,4 +20,4 @@
   </TD>
 </TR>
 </TABLE>
-</DIV>
+</div>
diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl
index 3a886167ba..1b3ab4979a 100644
--- a/templates/de/html/sponsor/sponsor_settings_form.tpl
+++ b/templates/de/html/sponsor/sponsor_settings_form.tpl
@@ -1,9 +1,9 @@
-<DIV align="center">
-<FORM action="{!URL!}/modules.php?module=sponsor&amp;what=settings" method="POST" style="padding-bottom: 0px">
+<div align="center">
+<form action="{!URL!}/modules.php?module=sponsor&amp;what=settings" method="POST" style="padding-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="550" class="sponsor_table dashed">
 <TR>
   <TD colspan="2" align="center" class="sponsor_header bottom2" height="32">
-    <STRONG>{--SPONSOR_SETTINGS_HEADER--}:</STRONG>
+    <strong>{--SPONSOR_SETTINGS_HEADER--}:</strong>
   </TD>
 </TR>
 <TR>
@@ -20,15 +20,15 @@
     {--SPONSOR_WARNING_INTERVAL--}
   </TD>
   <TD class="bottom2" width="275" align="center">
-    <SELECT name="warning_interval" class="guest_select" size="1">
-      <OPTION value="$content[warning_interval]">{!__CURRENT!}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*7)--}">1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
-    </SELECT>
+    <select name="warning_interval" class="guest_select" size="1">
+      <option value="$content[warning_interval]">{!__CURRENT!}</option>
+      <option value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</option>
+      <option value="{--($_CONFIG['one_day']*7)--}">1 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</option>
+      <option value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</option>
+    </select>
   </TD>
 </TR>
 <TR>
@@ -46,5 +46,5 @@
   </TD>
 </TR>
 </TABLE>
-</FORM>
-</DIV>
+</form>
+</div>
diff --git a/templates/de/html/sponsor/sponsor_what.tpl b/templates/de/html/sponsor/sponsor_what.tpl
index 45263d4e92..8b151d6509 100644
--- a/templates/de/html/sponsor/sponsor_what.tpl
+++ b/templates/de/html/sponsor/sponsor_what.tpl
@@ -1,8 +1,8 @@
 <!-- VORSICHT! Nur eine Tabellenzeile! Also ohne <TABLE> und </TABLE>! -->
 <TR>
   <TD class="sponsor_what bottom2 left2 right2">
-    <A class="menu_blur" href="{!URL!}/modules.php?module=sponsor&amp;what=$content[what]">
-      &nbsp;<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;$content[title]
-    </A>
+    <a class="menu_blur" href="{!URL!}/modules.php?module=sponsor&amp;what=$content[what]">
+      &nbsp;<strong><BIG>&middot;</BIG></strong>&nbsp;$content[title]
+    </a>
   </TD>
 </TR>
diff --git a/templates/de/html/surfbar/surfbar_frame_start.tpl b/templates/de/html/surfbar/surfbar_frame_start.tpl
index b89381826f..0604c012e4 100644
--- a/templates/de/html/surfbar/surfbar_frame_start.tpl
+++ b/templates/de/html/surfbar/surfbar_frame_start.tpl
@@ -24,7 +24,7 @@
 			 target="_blank">NoScript!</a>] Dort k&ouml;nnen Sie JavaScript z.B.
 			generell verbieten und nur f&uuml;r geziehlte Seiten - z.b. diese -
 			freigeben! Zudem haben Sie besseren Schutz gegen XSS-Attacken
-			[<A href="http://de.wikipedia.org/wiki/Cross-Site_Scripting"
+			[<a href="http://de.wikipedia.org/wiki/Cross-Site_Scripting"
 			 target="_blank">Cross-Site-Scripting</a>] und vieles mehr.
 		</div>
 	</div>
diff --git a/templates/de/html/theme_one.tpl b/templates/de/html/theme_one.tpl
index e579cf8b2c..ecccf0a9ad 100644
--- a/templates/de/html/theme_one.tpl
+++ b/templates/de/html/theme_one.tpl
@@ -1,5 +1,5 @@
 {--CURR_THEME_IS_1--}
 <br />
-<FONT class="theme_note">{!__THEME_NAME!}</FONT>
+<div class="theme_note">{!__THEME_NAME!}</div>
 <br />
 {--CURR_THEME_IS_2--}
diff --git a/templates/de/html/theme_select_form.tpl b/templates/de/html/theme_select_form.tpl
index 51d2d1fcb5..a26b3d1c19 100644
--- a/templates/de/html/theme_select_form.tpl
+++ b/templates/de/html/theme_select_form.tpl
@@ -1,6 +1,6 @@
-<FORM action="{!__FORM_VALUE!}" method="POST" style="margin-bottom: 0px">
-<SELECT name="new_theme" class="guest_select">
+<form action="{!__FORM_VALUE!}" method="POST" style="margin-bottom: 0px">
+<select name="new_theme" class="guest_select">
 	{!__THEME_SELECTION_OPTIONS!}
-</SELECT> <BR />
+</select> <br />
 <INPUT type="submit" name="ok" class="guest_submit"
-	value="{--CHANGE_THEME--}" /></FORM>
+	value="{--CHANGE_THEME--}" /></form>
diff --git a/templates/en/html/admin/admin_welcome.tpl b/templates/en/html/admin/admin_welcome.tpl
index 1b8af306af..ff5a0dc8c4 100644
--- a/templates/en/html/admin/admin_welcome.tpl
+++ b/templates/en/html/admin/admin_welcome.tpl
@@ -1,3 +1,3 @@
-<STRONG>: : : Welcome to the administration&#39;s area : : :</STRONG>
+<strong>: : : Welcome to the administration&#39;s area : : :</strong>
 <br />
-<DIV align="left" class="tiny">Hello $username !</DIV>
\ No newline at end of file
+<div align="left" class="tiny">Hello $username !</div>
\ No newline at end of file
diff --git a/templates/en/html/impressum.tpl b/templates/en/html/impressum.tpl
index 22ef495eb2..8b7b389c71 100644
--- a/templates/en/html/impressum.tpl
+++ b/templates/en/html/impressum.tpl
@@ -1,4 +1,4 @@
-<STRONG><U>Impressum</U></STRONG>
+<strong><u>Impressum</u></strong>
 <br />
 <br />
 Your name here!
diff --git a/templates/en/html/register_header.tpl b/templates/en/html/register_header.tpl
index d052a72929..d0983ce63b 100644
--- a/templates/en/html/register_header.tpl
+++ b/templates/en/html/register_header.tpl
@@ -1,3 +1,3 @@
 Registration form to our mail-exchange
-<STRONG>{!MAIN_TITLE!}</STRONG>
+<strong>{!MAIN_TITLE!}</strong>
 :
diff --git a/templates/en/html/welcome.tpl b/templates/en/html/welcome.tpl
index 69315c2652..eb0c1808ec 100644
--- a/templates/en/html/welcome.tpl
+++ b/templates/en/html/welcome.tpl
@@ -1 +1 @@
-<STRONG>Welcome to our mail exchange!</STRONG>
\ No newline at end of file
+<strong>Welcome to our mail exchange!</strong>
\ No newline at end of file
-- 
2.39.5