From 7c042c4c4537b13199515ec8a23b6fe3fd355eed Mon Sep 17 00:00:00 2001
From: eggy <eggy@localhost>
Date: Sun, 2 Jul 2017 23:55:22 +0200
Subject: [PATCH] eggys proof-of-concept

Alles Wissenswerte steht in der dfdeREADME.txt bzw in den dort
erwaehnten Forenlinks.
---
 dfdeREADME.txt                                |   47 +
 imageset/announce_read.gif                    |  Bin 754 -> 0 bytes
 imageset/announce_read_mine.gif               |  Bin 750 -> 0 bytes
 imageset/announce_unread.gif                  |  Bin 756 -> 0 bytes
 imageset/announce_unread_mine.gif             |  Bin 791 -> 0 bytes
 imageset/de/button_pm_forward.gif             |  Bin 15345 -> 0 bytes
 imageset/de/button_pm_new.gif                 |  Bin 15465 -> 0 bytes
 imageset/de/button_upload_image.gif           |  Bin 2682 -> 0 bytes
 imageset/de/icon_contact_pm.gif               |  Bin 1473 -> 0 bytes
 imageset/de/icon_post_edit.gif                |  Bin 14886 -> 0 bytes
 imageset/de/icon_user_online.gif              |  Bin 423 -> 0 bytes
 imageset/de/imageset.cfg                      |   37 -
 imageset/de/imageset.cfg~                     |   35 -
 imageset/de/index.htm                         |    0
 imageset/en/button_pm_forward.gif             |  Bin 2168 -> 0 bytes
 imageset/en/button_pm_new.gif                 |  Bin 2005 -> 0 bytes
 imageset/en/button_pm_reply.gif               |  Bin 2126 -> 0 bytes
 imageset/en/button_topic_locked.gif           |  Bin 1923 -> 0 bytes
 imageset/en/button_topic_new.gif              |  Bin 2737 -> 0 bytes
 imageset/en/button_topic_reply.gif            |  Bin 2135 -> 0 bytes
 imageset/en/button_upload_image.gif           |  Bin 2808 -> 0 bytes
 imageset/en/icon_contact_pm.gif               |  Bin 677 -> 0 bytes
 imageset/en/icon_post_edit.gif                |  Bin 853 -> 0 bytes
 imageset/en/icon_post_quote.gif               |  Bin 1109 -> 0 bytes
 imageset/en/icon_user_online.gif              |  Bin 423 -> 0 bytes
 imageset/en/imageset.cfg                      |   37 -
 imageset/en/index.htm                         |    0
 imageset/icon_back_top.gif                    |  Bin 204 -> 0 bytes
 imageset/icon_offline.gif                     |  Bin 384 -> 0 bytes
 imageset/icon_online.gif                      |  Bin 393 -> 0 bytes
 imageset/icon_post_target.gif                 |  Bin 186 -> 0 bytes
 imageset/icon_post_target_unread.gif          |  Bin 151 -> 0 bytes
 imageset/icon_rate_bad.gif                    |  Bin 465 -> 0 bytes
 imageset/icon_rate_good.gif                   |  Bin 462 -> 0 bytes
 imageset/icon_topic_attach.gif                |  Bin 144 -> 0 bytes
 imageset/icon_topic_latest.gif                |  Bin 186 -> 0 bytes
 imageset/icon_topic_newest.gif                |  Bin 155 -> 0 bytes
 imageset/icon_topic_reported.gif              |  Bin 246 -> 0 bytes
 imageset/icon_topic_unapproved.gif            |  Bin 253 -> 0 bytes
 imageset/imageset.cfg                         |  116 -
 imageset/index.htm                            |    0
 imageset/sticky_read.gif                      |  Bin 651 -> 0 bytes
 imageset/sticky_read_locked.gif               |  Bin 646 -> 0 bytes
 imageset/sticky_read_locked_mine.gif          |  Bin 662 -> 0 bytes
 imageset/sticky_read_mine.gif                 |  Bin 659 -> 0 bytes
 imageset/sticky_unread_mine.gif               |  Bin 669 -> 0 bytes
 imageset/subforum_read.gif                    |  Bin 124 -> 0 bytes
 imageset/subforum_unread.gif                  |  Bin 124 -> 0 bytes
 imageset/topic_moved.gif                      |  Bin 693 -> 0 bytes
 imageset/topic_read.gif                       |  Bin 679 -> 0 bytes
 imageset/topic_read_locked_mine.gif           |  Bin 749 -> 0 bytes
 imageset/topic_read_mine.gif                  |  Bin 695 -> 0 bytes
 imageset/topic_unread.gif                     |  Bin 678 -> 0 bytes
 imageset/topic_unread_mine.gif                |  Bin 704 -> 0 bytes
 style.cfg                                     |   28 +-
 template/ajax.js                              |  394 ++
 template/attachment.html                      |   94 +-
 template/bbcode.html                          |   47 +-
 template/breadcrumbs.html                     |    8 -
 template/captcha_default.html                 |   12 +-
 template/captcha_qa.html                      |   12 +-
 template/captcha_recaptcha.html               |   37 +-
 template/captcha_simplemath.html              |   23 -
 template/confirm_body.html                    |   21 +-
 template/confirm_delete_body.html             |   70 +
 template/custom_profile_fields.html           |   31 -
 template/display_options.html                 |   27 +
 template/drafts.html                          |   31 +-
 template/editor.js                            |  450 --
 template/faq_body.html                        |   16 +-
 template/forum_fn.js                          | 1104 +++--
 template/forumlist_body.html                  |   69 +-
 template/gallery/album_body.html              |  126 -
 template/gallery/albumlist_body.html          |   59 -
 template/gallery/comment_body.html            |  104 -
 template/gallery/gallery_footer.html          |   23 -
 template/gallery/gallery_header.html          |   38 -
 template/gallery/imageblock_body.html         |   68 -
 template/gallery/imageblock_popup.html        |   55 -
 template/gallery/index.htm                    |    0
 template/gallery/index_body.html              |  100 -
 template/gallery/mcp_body.html                |  331 --
 template/gallery/plugins_header.html          |   56 -
 template/gallery/posting_body.html            |  228 -
 template/gallery/posting_javascript.html      |  142 -
 template/gallery/recent_body.html             |   55 -
 template/gallery/search_body.html             |   83 -
 template/gallery/search_results.html          |  121 -
 template/gallery/ucp_gallery.html             |  295 --
 template/gallery/viewimage_body.html          |  343 --
 template/index.htm                            |   10 -
 template/index_body.html                      |   77 +-
 template/jumpbox.html                         |   45 +-
 template/login_body.html                      |   34 +-
 template/login_body.html.original             |   67 -
 template/login_body_oauth.html                |    8 +
 template/login_forum.html                     |   53 +-
 template/mcp_approve.html                     |   44 +-
 template/mcp_ban.html                         |   65 +-
 template/mcp_footer.html                      |    3 +-
 template/mcp_forum.html                       |  131 +-
 template/mcp_front.html                       |  100 +-
 template/mcp_header.html                      |   38 +-
 template/mcp_logs.html                        |   61 +-
 template/mcp_message.html                     |    4 +-
 template/mcp_move.html                        |   45 +-
 template/mcp_notes_front.html                 |    6 +-
 template/mcp_notes_user.html                  |   83 +-
 template/mcp_post.html                        |  112 +-
 template/mcp_queue.html                       |   95 +-
 template/mcp_reports.html                     |   85 +-
 template/mcp_topic.html                       |  124 +-
 template/mcp_viewlogs.html                    |   53 -
 template/mcp_warn_front.html                  |   16 +-
 template/mcp_warn_list.html                   |   48 +-
 template/mcp_warn_post.html                   |   20 +-
 template/mcp_warn_user.html                   |   22 +-
 template/mcp_whois.html                       |   16 +-
 template/memberlist_body.html                 |  146 +-
 template/memberlist_email.html                |   68 +-
 template/memberlist_im.html                   |  135 +-
 template/memberlist_leaders.html              |   76 -
 template/memberlist_search.html               |  103 +-
 template/memberlist_team.html                 |   47 +
 template/memberlist_view.html                 |  131 +-
 template/message_body.html                    |   22 +-
 template/navbar_footer.html                   |   26 +
 template/navbar_header.html                   |   70 +
 template/notification_dropdown.html           |   45 +
 template/overall_footer.html                  |   74 +-
 template/overall_header.html                  |  247 +-
 template/overall_sidebar_menu.html            |   73 +-
 template/pagination.html                      |   31 +-
 template/plupload.html                        |   69 +
 template/posting_advice.html                  |   14 -
 template/posting_attach_body.html             |   76 +-
 template/posting_buttons.html                 |   83 +-
 template/posting_editor.html                  |  218 +-
 template/posting_layout.html                  |   33 +-
 template/posting_pm_header.html               |   83 +
 template/posting_pm_layout.html               |   16 +-
 template/posting_poll_body.html               |   37 +-
 template/posting_preview.html                 |   16 +-
 template/posting_review.html                  |   18 +-
 template/posting_smilies.html                 |   19 +-
 template/posting_topic_review.html            |   44 +-
 template/profilefields/bool.html              |    7 +
 template/profilefields/date.html              |    5 +
 template/profilefields/dropdown.html          |    5 +
 template/profilefields/int.html               |    3 +
 template/profilefields/string.html            |    3 +
 template/profilefields/text.html              |    3 +
 template/profilefields/url.html               |    3 +
 template/quickreply_editor.html               |   83 +-
 template/report_body.html                     |   16 +-
 template/search_body.html                     |   72 +-
 template/search_body_google.html              |   34 -
 template/search_body_wiki.html                |   33 -
 template/search_results.html                  |  164 +-
 template/simple_footer.html                   |   44 +-
 template/simple_header.html                   |   88 +-
 template/styleswitcher.js                     |  193 -
 template/syndication_atom.xml                 |   24 -
 template/syndication_rss2.xml                 |   19 -
 template/template.cfg                         |   25 -
 template/timezone.js                          |   20 +
 template/timezone_option.html                 |   28 +
 template/ucp_agreement.html                   |   34 +-
 template/ucp_attachments.html                 |   53 +-
 template/ucp_auth_link.html                   |   15 +
 template/ucp_auth_link_oauth.html             |   29 +
 template/ucp_avatar_options.html              |   83 +-
 template/ucp_avatar_options_gravatar.html     |   11 +
 template/ucp_avatar_options_local.html        |   19 +
 template/ucp_avatar_options_remote.html       |   11 +
 template/ucp_avatar_options_upload.html       |   11 +
 template/ucp_footer.html                      |    5 +-
 template/ucp_groups_manage.html               |  121 +-
 template/ucp_groups_membership.html           |   68 +-
 template/ucp_header.html                      |    8 +-
 template/ucp_header.html~                     |  102 -
 template/ucp_login_link.html                  |   58 +
 template/ucp_main_bookmarks.html              |   79 +-
 template/ucp_main_drafts.html                 |   24 +-
 template/ucp_main_front.html                  |   51 +-
 template/ucp_main_subscribed.html             |  117 +-
 template/ucp_notifications.html               |  122 +
 template/ucp_pm_history.html                  |   37 +-
 template/ucp_pm_message_header.html           |   72 +-
 template/ucp_pm_options.html                  |   30 +-
 template/ucp_pm_popup.html                    |   25 -
 template/ucp_pm_viewfolder.html               |   72 +-
 template/ucp_pm_viewmessage.html              |  167 +-
 template/ucp_pm_viewmessage_print.html        |  168 +-
 template/ucp_prefs_personal.html              |   90 +-
 template/ucp_prefs_post.html                  |   12 +-
 template/ucp_prefs_view.html                  |   38 +-
 template/ucp_profile_autologin_keys.html      |   45 +
 template/ucp_profile_avatar.html              |   12 +-
 template/ucp_profile_profile_info.html        |   60 +-
 template/ucp_profile_reg_details.html         |   32 +-
 template/ucp_profile_signature.html           |   14 +-
 template/ucp_register.html                    |   61 +-
 template/ucp_remind.html                      |    8 +-
 template/ucp_resend.html                      |    8 +-
 template/ucp_zebra_foes.html                  |    8 +-
 template/ucp_zebra_friends.html               |   10 +-
 template/viewforum_body.html                  |  212 +-
 template/viewonline_body.html                 |   44 +-
 template/viewonline_whois.html                |    8 +-
 template/viewtopic_body.html                  |  426 +-
 template/viewtopic_print.html                 |   50 +-
 template/viewtopic_topic_tools.html           |   25 +
 theme/buttons.css                             |  255 ++
 theme/colours.css                             | 1163 +++++
 theme/common.css                              | 1297 ++++++
 theme/content.css                             |  831 ++++
 theme/cp.css                                  |  376 ++
 theme/df_images.css                           |   43 +
 theme/forms.css                               |  431 ++
 theme/gallery.css                             |  106 -
 theme/images/alert_close.png                  |  Bin 0 -> 2097 bytes
 theme/images/announce_read.gif                |  Bin 0 -> 728 bytes
 .../images}/announce_read_locked.gif          |  Bin 738 -> 739 bytes
 .../images}/announce_read_locked_mine.gif     |  Bin 753 -> 753 bytes
 theme/images/announce_read_mine.gif           |  Bin 0 -> 724 bytes
 theme/images/announce_unread.gif              |  Bin 0 -> 730 bytes
 .../images}/announce_unread_locked.gif        |  Bin 745 -> 745 bytes
 .../images}/announce_unread_locked_mine.gif   |  Bin 755 -> 755 bytes
 theme/images/announce_unread_mine.gif         |  Bin 0 -> 765 bytes
 theme/images/arrow_down.gif                   |  Bin 113 -> 51 bytes
 theme/images/arrow_left.gif                   |  Bin 111 -> 49 bytes
 theme/images/arrow_right.gif                  |  Bin 111 -> 49 bytes
 theme/images/arrow_up.gif                     |  Bin 113 -> 51 bytes
 theme/images/bg_button.gif                    |  Bin 182 -> 182 bytes
 theme/images/bg_button.gif.1.gif              |  Bin 0 -> 182 bytes
 theme/images/bg_header.gif                    |  Bin 0 -> 226 bytes
 theme/images/bg_list.gif                      |  Bin 0 -> 374 bytes
 theme/images/bg_menu.gif                      |  Bin 354 -> 0 bytes
 theme/images/bg_tabs1.gif                     |  Bin 1520 -> 0 bytes
 theme/images/bg_tabs2.gif                     |  Bin 420 -> 0 bytes
 .../de => theme/images}/button_topic_new.gif  |  Bin
 theme/images/button_topic_new_r.gif           |  Bin 0 -> 1921 bytes
 theme/images/button_topic_new_w.gif           |  Bin 0 -> 1869 bytes
 .../images}/button_topic_reply.gif            |  Bin
 .../images/button_topic_reply.gif.1.gif       |  Bin 15760 -> 15760 bytes
 .../images/button_topic_reply.gif.2.gif       |  Bin 15528 -> 15760 bytes
 {imageset => theme/images}/debian.png         |  Bin
 {imageset => theme/images}/debian_hell.png    |  Bin
 theme/images/feed.gif                         |  Bin 0 -> 1089 bytes
 theme/images/forum_link.gif                   |  Bin 0 -> 708 bytes
 {imageset => theme/images}/forum_link.png     |  Bin
 theme/images/forum_read.gif                   |  Bin 0 -> 662 bytes
 {imageset => theme/images}/forum_read.png     |  Bin
 theme/images/forum_read_locked.gif            |  Bin 0 -> 681 bytes
 .../images}/forum_read_locked.png             |  Bin
 theme/images/forum_read_subforum.gif          |  Bin 0 -> 725 bytes
 .../images}/forum_read_subforum.png           |  Bin
 theme/images/forum_unread.gif                 |  Bin 0 -> 667 bytes
 {imageset => theme/images}/forum_unread.png   |  Bin
 theme/images/forum_unread_locked.gif          |  Bin 0 -> 677 bytes
 .../images}/forum_unread_locked.png           |  Bin
 theme/images/forum_unread_subforum.gif        |  Bin 0 -> 725 bytes
 .../images}/forum_unread_subforum.png         |  Bin
 theme/images/gradient.gif                     |  Bin 0 -> 549 bytes
 theme/images/icon_acp.gif                     |  Bin 0 -> 389 bytes
 theme/images/icon_back_top.gif                |  Bin 0 -> 204 bytes
 theme/images/icon_bookmark.gif                |  Bin 218 -> 218 bytes
 theme/images/icon_bump.gif                    |  Bin 148 -> 148 bytes
 theme/images/icon_contact.png                 |  Bin 0 -> 340 bytes
 .../images}/icon_contact_aim.gif              |  Bin
 .../images}/icon_contact_email.gif            |  Bin
 .../images}/icon_contact_gallery.gif          |  Bin
 .../images}/icon_contact_icq.gif              |  Bin
 .../images}/icon_contact_jabber.gif           |  Bin
 .../images}/icon_contact_msnm.gif             |  Bin
 .../images}/icon_contact_www.gif              |  Bin
 .../images}/icon_contact_yahoo.gif            |  Bin
 theme/images/icon_delete_cookies.gif          |  Bin 0 -> 108 bytes
 theme/images/icon_download.gif                |  Bin 0 -> 198 bytes
 theme/images/icon_faq.gif                     |  Bin 255 -> 255 bytes
 theme/images/icon_fontsize.gif                |  Bin 559 -> 0 bytes
 theme/images/icon_gallery.gif                 |  Bin 960 -> 0 bytes
 .../images}/icon_gallery_locked.gif           |  Bin
 .../images}/icon_gallery_reported.gif         |  Bin
 .../images}/icon_gallery_unapproved.gif       |  Bin
 theme/images/icon_home.gif                    |  Bin 306 -> 204 bytes
 theme/images/icon_logout.gif                  |  Bin 219 -> 219 bytes
 theme/images/icon_mark.gif                    |  Bin 0 -> 360 bytes
 theme/images/icon_mcp.gif                     |  Bin 0 -> 342 bytes
 theme/images/icon_members.gif                 |  Bin 264 -> 264 bytes
 theme/images/icon_notification.gif            |  Bin 0 -> 551 bytes
 theme/images/icon_offline.gif                 |  Bin 0 -> 322 bytes
 theme/images/icon_online.gif                  |  Bin 0 -> 331 bytes
 theme/images/icon_pages.gif                   |  Bin 167 -> 105 bytes
 theme/images/icon_pastebin.gif                |  Bin 1006 -> 0 bytes
 theme/images/icon_pm.gif                      |  Bin 0 -> 576 bytes
 .../images}/icon_post_delete.gif              |  Bin
 {imageset => theme/images}/icon_post_info.gif |  Bin
 .../de => theme/images}/icon_post_quote.gif   |  Bin
 theme/images/icon_post_quote_.gif             |  Bin 0 -> 1362 bytes
 theme/images/icon_post_quote_r.gif            |  Bin 0 -> 1362 bytes
 theme/images/icon_post_quote_w.gif            |  Bin 0 -> 1362 bytes
 .../images}/icon_post_report.gif              |  Bin
 theme/images/icon_post_target.gif             |  Bin 0 -> 124 bytes
 theme/images/icon_post_target_unread.gif      |  Bin 0 -> 89 bytes
 theme/images/icon_print.gif                   |  Bin 0 -> 204 bytes
 theme/images/icon_print.png                   |  Bin 859 -> 0 bytes
 theme/images/icon_profile.gif                 |  Bin 0 -> 538 bytes
 theme/images/icon_rate_bad.gif                |  Bin 0 -> 465 bytes
 theme/images/icon_rate_good.gif               |  Bin 0 -> 462 bytes
 theme/images/icon_register.gif                |  Bin 231 -> 231 bytes
 theme/images/icon_search.gif                  |  Bin 334 -> 334 bytes
 theme/images/icon_sendemail.gif               |  Bin 0 -> 303 bytes
 theme/images/icon_sendemail.png               |  Bin 1878 -> 0 bytes
 theme/images/icon_subscribe.gif               |  Bin 216 -> 216 bytes
 theme/images/icon_team.gif                    |  Bin 0 -> 1009 bytes
 theme/images/icon_textbox_search.gif          |  Bin 335 -> 335 bytes
 theme/images/icon_topic_attach.gif            |  Bin 0 -> 82 bytes
 theme/images/icon_topic_deleted.png           |  Bin 0 -> 1205 bytes
 theme/images/icon_topic_latest.gif            |  Bin 0 -> 124 bytes
 theme/images/icon_topic_newest.gif            |  Bin 0 -> 93 bytes
 theme/images/icon_topic_poll.gif              |  Bin 0 -> 120 bytes
 theme/images/icon_topic_reported.gif          |  Bin 0 -> 246 bytes
 theme/images/icon_topic_unapproved.gif        |  Bin 0 -> 253 bytes
 theme/images/icon_ucp.gif                     |  Bin 254 -> 254 bytes
 theme/images/icon_unsubscribe.gif             |  Bin 214 -> 214 bytes
 theme/images/icon_user_online.gif             |  Bin 0 -> 364 bytes
 {imageset => theme/images}/icon_user_warn.gif |  Bin
 theme/images/icon_user_warn_oben.gif          |  Bin 0 -> 388 bytes
 theme/images/icon_user_warn_unten.gif         |  Bin 0 -> 363 bytes
 theme/images/icon_wink.gif                    |  Bin 0 -> 374 bytes
 theme/images/icons_button.png                 |  Bin 0 -> 7367 bytes
 theme/images/icons_contact.png                |  Bin 0 -> 8507 bytes
 theme/images/icons_pagination.png             |  Bin 0 -> 1043 bytes
 theme/images/index.htm                        |    0
 theme/images/loading.gif                      |  Bin 0 -> 1320 bytes
 theme/images/no_avatar.gif                    |  Bin 474 -> 930 bytes
 theme/images/quote_rtl.gif                    |  Bin 0 -> 154 bytes
 theme/images/site_logo.gif                    |  Bin 0 -> 2208 bytes
 theme/images/sticky_read.gif                  |  Bin 0 -> 625 bytes
 theme/images/sticky_read_locked.gif           |  Bin 0 -> 646 bytes
 theme/images/sticky_read_locked_mine.gif      |  Bin 0 -> 662 bytes
 theme/images/sticky_read_mine.gif             |  Bin 0 -> 633 bytes
 {imageset => theme/images}/sticky_unread.gif  |  Bin 648 -> 622 bytes
 .../images}/sticky_unread_locked.gif          |  Bin 626 -> 626 bytes
 .../images}/sticky_unread_locked_mine.gif     |  Bin 682 -> 682 bytes
 theme/images/sticky_unread_mine.gif           |  Bin 0 -> 643 bytes
 theme/images/subforum_read.gif                |  Bin 0 -> 124 bytes
 theme/images/subforum_unread.gif              |  Bin 0 -> 124 bytes
 theme/images/topic_moved.gif                  |  Bin 0 -> 667 bytes
 theme/images/topic_read.gif                   |  Bin 0 -> 653 bytes
 {imageset => theme/images}/topic_read_hot.gif |  Bin 1469 -> 1469 bytes
 .../images}/topic_read_hot_mine.gif           |  Bin 1519 -> 1519 bytes
 .../images}/topic_read_locked.gif             |  Bin 748 -> 722 bytes
 theme/images/topic_read_locked_mine.gif       |  Bin 0 -> 723 bytes
 theme/images/topic_read_mine.gif              |  Bin 0 -> 669 bytes
 theme/images/topic_unread.gif                 |  Bin 0 -> 317 bytes
 .../images}/topic_unread_hot.gif              |  Bin 1431 -> 1431 bytes
 .../images}/topic_unread_hot_mine.gif         |  Bin 1364 -> 1364 bytes
 .../images}/topic_unread_locked.gif           |  Bin 745 -> 719 bytes
 .../images}/topic_unread_locked_mine.gif      |  Bin 764 -> 738 bytes
 theme/images/topic_unread_mine.gif            |  Bin 0 -> 678 bytes
 theme/imageset.css                            |  376 ++
 theme/index.htm                               |    0
 theme/large.css                               |    3 -
 theme/links.css                               |  210 +
 theme/medium.css                              |    3 -
 theme/normal.css                              |    3 -
 theme/print.css                               |  129 -
 theme/stylesheet.css                          | 3815 ++---------------
 theme/theme.cfg                               |   35 -
 372 files changed, 10673 insertions(+), 10488 deletions(-)
 create mode 100644 dfdeREADME.txt
 delete mode 100644 imageset/announce_read.gif
 delete mode 100644 imageset/announce_read_mine.gif
 delete mode 100644 imageset/announce_unread.gif
 delete mode 100644 imageset/announce_unread_mine.gif
 delete mode 100644 imageset/de/button_pm_forward.gif
 delete mode 100644 imageset/de/button_pm_new.gif
 delete mode 100644 imageset/de/button_upload_image.gif
 delete mode 100644 imageset/de/icon_contact_pm.gif
 delete mode 100644 imageset/de/icon_post_edit.gif
 delete mode 100644 imageset/de/icon_user_online.gif
 delete mode 100644 imageset/de/imageset.cfg
 delete mode 100644 imageset/de/imageset.cfg~
 delete mode 100644 imageset/de/index.htm
 delete mode 100644 imageset/en/button_pm_forward.gif
 delete mode 100644 imageset/en/button_pm_new.gif
 delete mode 100644 imageset/en/button_pm_reply.gif
 delete mode 100644 imageset/en/button_topic_locked.gif
 delete mode 100644 imageset/en/button_topic_new.gif
 delete mode 100644 imageset/en/button_topic_reply.gif
 delete mode 100644 imageset/en/button_upload_image.gif
 delete mode 100644 imageset/en/icon_contact_pm.gif
 delete mode 100644 imageset/en/icon_post_edit.gif
 delete mode 100644 imageset/en/icon_post_quote.gif
 delete mode 100644 imageset/en/icon_user_online.gif
 delete mode 100644 imageset/en/imageset.cfg
 delete mode 100644 imageset/en/index.htm
 delete mode 100644 imageset/icon_back_top.gif
 delete mode 100644 imageset/icon_offline.gif
 delete mode 100644 imageset/icon_online.gif
 delete mode 100644 imageset/icon_post_target.gif
 delete mode 100644 imageset/icon_post_target_unread.gif
 delete mode 100644 imageset/icon_rate_bad.gif
 delete mode 100644 imageset/icon_rate_good.gif
 delete mode 100644 imageset/icon_topic_attach.gif
 delete mode 100644 imageset/icon_topic_latest.gif
 delete mode 100644 imageset/icon_topic_newest.gif
 delete mode 100644 imageset/icon_topic_reported.gif
 delete mode 100644 imageset/icon_topic_unapproved.gif
 delete mode 100644 imageset/imageset.cfg
 delete mode 100644 imageset/index.htm
 delete mode 100644 imageset/sticky_read.gif
 delete mode 100644 imageset/sticky_read_locked.gif
 delete mode 100644 imageset/sticky_read_locked_mine.gif
 delete mode 100644 imageset/sticky_read_mine.gif
 delete mode 100644 imageset/sticky_unread_mine.gif
 delete mode 100644 imageset/subforum_read.gif
 delete mode 100644 imageset/subforum_unread.gif
 delete mode 100644 imageset/topic_moved.gif
 delete mode 100644 imageset/topic_read.gif
 delete mode 100644 imageset/topic_read_locked_mine.gif
 delete mode 100644 imageset/topic_read_mine.gif
 delete mode 100644 imageset/topic_unread.gif
 delete mode 100644 imageset/topic_unread_mine.gif
 create mode 100644 template/ajax.js
 delete mode 100644 template/breadcrumbs.html
 delete mode 100644 template/captcha_simplemath.html
 create mode 100644 template/confirm_delete_body.html
 delete mode 100644 template/custom_profile_fields.html
 create mode 100644 template/display_options.html
 delete mode 100644 template/editor.js
 delete mode 100644 template/gallery/album_body.html
 delete mode 100644 template/gallery/albumlist_body.html
 delete mode 100644 template/gallery/comment_body.html
 delete mode 100644 template/gallery/gallery_footer.html
 delete mode 100644 template/gallery/gallery_header.html
 delete mode 100644 template/gallery/imageblock_body.html
 delete mode 100644 template/gallery/imageblock_popup.html
 delete mode 100644 template/gallery/index.htm
 delete mode 100644 template/gallery/index_body.html
 delete mode 100644 template/gallery/mcp_body.html
 delete mode 100644 template/gallery/plugins_header.html
 delete mode 100644 template/gallery/posting_body.html
 delete mode 100644 template/gallery/posting_javascript.html
 delete mode 100644 template/gallery/recent_body.html
 delete mode 100644 template/gallery/search_body.html
 delete mode 100644 template/gallery/search_results.html
 delete mode 100644 template/gallery/ucp_gallery.html
 delete mode 100644 template/gallery/viewimage_body.html
 delete mode 100644 template/login_body.html.original
 create mode 100644 template/login_body_oauth.html
 delete mode 100644 template/mcp_viewlogs.html
 delete mode 100644 template/memberlist_leaders.html
 create mode 100644 template/memberlist_team.html
 create mode 100644 template/navbar_footer.html
 create mode 100644 template/navbar_header.html
 create mode 100644 template/notification_dropdown.html
 create mode 100644 template/plupload.html
 delete mode 100644 template/posting_advice.html
 create mode 100644 template/posting_pm_header.html
 create mode 100644 template/profilefields/bool.html
 create mode 100644 template/profilefields/date.html
 create mode 100644 template/profilefields/dropdown.html
 create mode 100644 template/profilefields/int.html
 create mode 100644 template/profilefields/string.html
 create mode 100644 template/profilefields/text.html
 create mode 100644 template/profilefields/url.html
 delete mode 100644 template/search_body_google.html
 delete mode 100644 template/search_body_wiki.html
 delete mode 100644 template/styleswitcher.js
 delete mode 100755 template/syndication_atom.xml
 delete mode 100755 template/syndication_rss2.xml
 delete mode 100644 template/template.cfg
 create mode 100644 template/timezone.js
 create mode 100644 template/timezone_option.html
 create mode 100644 template/ucp_auth_link.html
 create mode 100644 template/ucp_auth_link_oauth.html
 create mode 100644 template/ucp_avatar_options_gravatar.html
 create mode 100644 template/ucp_avatar_options_local.html
 create mode 100644 template/ucp_avatar_options_remote.html
 create mode 100644 template/ucp_avatar_options_upload.html
 delete mode 100644 template/ucp_header.html~
 create mode 100644 template/ucp_login_link.html
 create mode 100644 template/ucp_notifications.html
 delete mode 100644 template/ucp_pm_popup.html
 create mode 100644 template/ucp_profile_autologin_keys.html
 create mode 100644 template/viewtopic_topic_tools.html
 create mode 100644 theme/buttons.css
 create mode 100644 theme/colours.css
 create mode 100644 theme/common.css
 create mode 100644 theme/content.css
 create mode 100644 theme/cp.css
 create mode 100644 theme/df_images.css
 create mode 100644 theme/forms.css
 delete mode 100644 theme/gallery.css
 create mode 100644 theme/images/alert_close.png
 create mode 100644 theme/images/announce_read.gif
 rename {imageset => theme/images}/announce_read_locked.gif (53%)
 rename {imageset => theme/images}/announce_read_locked_mine.gif (60%)
 create mode 100644 theme/images/announce_read_mine.gif
 create mode 100644 theme/images/announce_unread.gif
 rename {imageset => theme/images}/announce_unread_locked.gif (62%)
 rename {imageset => theme/images}/announce_unread_locked_mine.gif (65%)
 create mode 100644 theme/images/announce_unread_mine.gif
 create mode 100644 theme/images/bg_button.gif.1.gif
 create mode 100644 theme/images/bg_header.gif
 create mode 100644 theme/images/bg_list.gif
 delete mode 100644 theme/images/bg_menu.gif
 delete mode 100644 theme/images/bg_tabs1.gif
 delete mode 100644 theme/images/bg_tabs2.gif
 rename {imageset/de => theme/images}/button_topic_new.gif (100%)
 create mode 100644 theme/images/button_topic_new_r.gif
 create mode 100644 theme/images/button_topic_new_w.gif
 rename {imageset/de => theme/images}/button_topic_reply.gif (100%)
 rename imageset/de/button_pm_reply.gif => theme/images/button_topic_reply.gif.1.gif (99%)
 rename imageset/de/button_topic_locked.gif => theme/images/button_topic_reply.gif.2.gif (84%)
 rename {imageset => theme/images}/debian.png (100%)
 rename {imageset => theme/images}/debian_hell.png (100%)
 create mode 100644 theme/images/feed.gif
 create mode 100644 theme/images/forum_link.gif
 rename {imageset => theme/images}/forum_link.png (100%)
 create mode 100644 theme/images/forum_read.gif
 rename {imageset => theme/images}/forum_read.png (100%)
 create mode 100644 theme/images/forum_read_locked.gif
 rename {imageset => theme/images}/forum_read_locked.png (100%)
 create mode 100644 theme/images/forum_read_subforum.gif
 rename {imageset => theme/images}/forum_read_subforum.png (100%)
 create mode 100644 theme/images/forum_unread.gif
 rename {imageset => theme/images}/forum_unread.png (100%)
 create mode 100644 theme/images/forum_unread_locked.gif
 rename {imageset => theme/images}/forum_unread_locked.png (100%)
 create mode 100644 theme/images/forum_unread_subforum.gif
 rename {imageset => theme/images}/forum_unread_subforum.png (100%)
 create mode 100644 theme/images/gradient.gif
 create mode 100644 theme/images/icon_acp.gif
 create mode 100644 theme/images/icon_back_top.gif
 create mode 100644 theme/images/icon_contact.png
 rename {imageset => theme/images}/icon_contact_aim.gif (100%)
 rename {imageset => theme/images}/icon_contact_email.gif (100%)
 rename {imageset => theme/images}/icon_contact_gallery.gif (100%)
 rename {imageset => theme/images}/icon_contact_icq.gif (100%)
 rename {imageset => theme/images}/icon_contact_jabber.gif (100%)
 rename {imageset => theme/images}/icon_contact_msnm.gif (100%)
 rename {imageset => theme/images}/icon_contact_www.gif (100%)
 rename {imageset => theme/images}/icon_contact_yahoo.gif (100%)
 create mode 100644 theme/images/icon_delete_cookies.gif
 create mode 100644 theme/images/icon_download.gif
 delete mode 100644 theme/images/icon_fontsize.gif
 delete mode 100644 theme/images/icon_gallery.gif
 rename {imageset => theme/images}/icon_gallery_locked.gif (100%)
 rename {imageset => theme/images}/icon_gallery_reported.gif (100%)
 rename {imageset => theme/images}/icon_gallery_unapproved.gif (100%)
 create mode 100644 theme/images/icon_mark.gif
 create mode 100644 theme/images/icon_mcp.gif
 create mode 100644 theme/images/icon_notification.gif
 create mode 100644 theme/images/icon_offline.gif
 create mode 100644 theme/images/icon_online.gif
 delete mode 100644 theme/images/icon_pastebin.gif
 create mode 100644 theme/images/icon_pm.gif
 rename {imageset => theme/images}/icon_post_delete.gif (100%)
 rename {imageset => theme/images}/icon_post_info.gif (100%)
 rename {imageset/de => theme/images}/icon_post_quote.gif (100%)
 create mode 100644 theme/images/icon_post_quote_.gif
 create mode 100644 theme/images/icon_post_quote_r.gif
 create mode 100644 theme/images/icon_post_quote_w.gif
 rename {imageset => theme/images}/icon_post_report.gif (100%)
 create mode 100644 theme/images/icon_post_target.gif
 create mode 100644 theme/images/icon_post_target_unread.gif
 create mode 100644 theme/images/icon_print.gif
 delete mode 100644 theme/images/icon_print.png
 create mode 100644 theme/images/icon_profile.gif
 create mode 100644 theme/images/icon_rate_bad.gif
 create mode 100644 theme/images/icon_rate_good.gif
 create mode 100644 theme/images/icon_sendemail.gif
 delete mode 100644 theme/images/icon_sendemail.png
 create mode 100644 theme/images/icon_team.gif
 create mode 100644 theme/images/icon_topic_attach.gif
 create mode 100644 theme/images/icon_topic_deleted.png
 create mode 100644 theme/images/icon_topic_latest.gif
 create mode 100644 theme/images/icon_topic_newest.gif
 create mode 100644 theme/images/icon_topic_poll.gif
 create mode 100644 theme/images/icon_topic_reported.gif
 create mode 100644 theme/images/icon_topic_unapproved.gif
 create mode 100644 theme/images/icon_user_online.gif
 rename {imageset => theme/images}/icon_user_warn.gif (100%)
 create mode 100644 theme/images/icon_user_warn_oben.gif
 create mode 100644 theme/images/icon_user_warn_unten.gif
 create mode 100644 theme/images/icon_wink.gif
 create mode 100644 theme/images/icons_button.png
 create mode 100644 theme/images/icons_contact.png
 create mode 100644 theme/images/icons_pagination.png
 delete mode 100644 theme/images/index.htm
 create mode 100644 theme/images/loading.gif
 create mode 100644 theme/images/quote_rtl.gif
 create mode 100644 theme/images/site_logo.gif
 create mode 100644 theme/images/sticky_read.gif
 create mode 100644 theme/images/sticky_read_locked.gif
 create mode 100644 theme/images/sticky_read_locked_mine.gif
 create mode 100644 theme/images/sticky_read_mine.gif
 rename {imageset => theme/images}/sticky_unread.gif (50%)
 rename {imageset => theme/images}/sticky_unread_locked.gif (66%)
 rename {imageset => theme/images}/sticky_unread_locked_mine.gif (65%)
 create mode 100644 theme/images/sticky_unread_mine.gif
 create mode 100644 theme/images/subforum_read.gif
 create mode 100644 theme/images/subforum_unread.gif
 create mode 100644 theme/images/topic_moved.gif
 create mode 100644 theme/images/topic_read.gif
 rename {imageset => theme/images}/topic_read_hot.gif (52%)
 rename {imageset => theme/images}/topic_read_hot_mine.gif (79%)
 rename {imageset => theme/images}/topic_read_locked.gif (50%)
 create mode 100644 theme/images/topic_read_locked_mine.gif
 create mode 100644 theme/images/topic_read_mine.gif
 create mode 100644 theme/images/topic_unread.gif
 rename {imageset => theme/images}/topic_unread_hot.gif (83%)
 rename {imageset => theme/images}/topic_unread_hot_mine.gif (80%)
 rename {imageset => theme/images}/topic_unread_locked.gif (57%)
 rename {imageset => theme/images}/topic_unread_locked_mine.gif (52%)
 create mode 100644 theme/images/topic_unread_mine.gif
 create mode 100644 theme/imageset.css
 delete mode 100644 theme/index.htm
 delete mode 100644 theme/large.css
 create mode 100644 theme/links.css
 delete mode 100644 theme/medium.css
 delete mode 100644 theme/normal.css
 delete mode 100644 theme/print.css
 delete mode 100644 theme/theme.cfg

diff --git a/dfdeREADME.txt b/dfdeREADME.txt
new file mode 100644
index 0000000..a50f417
--- /dev/null
+++ b/dfdeREADME.txt
@@ -0,0 +1,47 @@
+
+Der Style basiert auf dem "alten Template" entwickelt von Timo Salmen, das wiederum war basierend auf dem Debian Live Template, entwickelt von Christoph Haas. 
+Vielen DANK dafür an Timo und Christoph!
+
+Infos zur Umstellung gibts in den Threads 
+ https://debianforum.de/forum/viewtopic.php?f=5&t=158531
+ https://debianforum.de/forum/viewtopic.php?f=14&t=165612
+ https://debianforum.de/forum/viewtopic.php?f=15&t=165808
+ https://debianforum.de/forum/viewtopic.php?f=5&t=165804
+sowie im Wiki auf
+ https://wiki.debianforum.de/Dfdebugtrackerchen
+
+Dort im Wiki bitte auch gefundene Fehler etc eintragen, erleichtert uns hoffentlich die Koordination.
+
+
+
+Aktuell eingesetzte Version des Boards ist 
+https://www.phpbb.com/files/release/phpBB-3.2.0.zip (sha256: 1ffd519239acfb9ffe6c83f7e04879c10d02c40f30464906f90fb21ff7f83681 )
+
+
+
+
+Wenn Ihr Änderungen machen wollt: Mitarbeit ist ausdrücklich gewünscht. 
+ Wichtig ist aber, dass der Style eine "minimal-inversive" Fassung bleibt. Daher bitte (wenn möglich) keine Änderungen vornehmen, die tiefer in die Struktur eingreifen - wir wollen, dass spätere Updates so schmerzlos wie möglich ablaufen! D.h. Änderungen an den Template und Theme Dateien sind ok, direkte Änderungen am php-Code des Boards eher nicht.
+
+
+
+Sinnvolle Einstellung (während des Testens) im Board damit die Styles nicht aus dem Cache sondern direkt von der Platte genommen werden:
+ Administration Control Panel >> Load Settings >> Recompile Stale Style Components: Yes
+
+
+
+
+Falls jemand die Grafiken schöner machen möchte: 
+
+ Auch an Grafiken wurde was geändert: die Anführungszeichen fürs quote-icon sind jetzt "unsicherbare Pixel", sonst muss man zuviel am Style rumpatchen - falls dazu jemand ne bessere Idee hat immer her damit.
+
+ Umwandeln der blauen Icons (aus dem "normalen Style") zu roten: 
+
+    ls *.gif -1 |xargs -I{}  convert {}   -modulate 100,100,-20   converted/{};
+
+  Achtung, das funktioniert nur in ca. 80% der Fälle, bringt aber nen guten Start für händische Korrekturen.
+
+
+
+
+Aktuell (falls jemandem sehr sehr sehr langweilig ist) könnten auch noch einige der Template-Dateien auf das aktuelle prosilver umgestellt werden. Das würde spätere Migrationen erleichtern (oder auch nicht, falls Upstreamseitig alles umgeschmissen wird). Zur Zeit stammen die Template-Dateien aus drei unterschiedlichen Releases, daher sind in einigen noch falsche Variablen, sollte beim Testen aber auffallen, und falls nicht, wars wohl doch nicht wichtig ;) 
diff --git a/imageset/announce_read.gif b/imageset/announce_read.gif
deleted file mode 100644
index b06f2c85fe1b4ea110a39a17bdddf7ed03b9fa7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmV<O0uB8~Nk%w1VH*G&0M$PL^YioX@9*2&+rq-ac6N64_4T*6x0{=r_V)Jj^7N#n
zq~qh{prD|}#>TU=v+3#Tii(QH#>Ugr(`994kdTno)z#+a=KTEpg@uLe?Cf}Wc%7Y{
z)YR1H=jZbB^1r{o`1twE%*>LKlKT4ke0+TE?d|^l{&aM7?(Xj2-{1ZH{rLI$f`Wo_
za&muve{XMZY;0`#`uhF;{^H`}&(F{G_4SL3i~9Tf=;-L=<mSD-y``n4_xJem@$vuv
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5#({Y?_wFc8Cz4&>y4a+8JmSn&IF&F``e7h9Us?&S({&LeX%*(i6>m^OQ39K;q^D
zgkE1z3>X4FDghliGmDEk9X%>C0xp3?B!xT~ISZT%79J`!4>=hiJ_0XqLmD(bJP#H*
zva$&d6B`9N77rjMAsRyr6aXqE7RSgLDHF^n9TpuWCIA$HFNGc*+S?ruJ<Jd*+#Ws^
zCqFtE2sb4U?(g0_2n!%R@Ff=j7#{~aJ_Q-zJqR#jzy=5sJP6EyK*j+s4SXcPL(u~d
z1rP`jfN+B%#RNXmov0wOgh`VoHsEleQ2~gPCqdFkQYb-yn>Q2S7?F{Hg!KYAae@@k
zVx*56K?8V5Ab|x72qu!=tl?uO1|2>S^w`Sv#s;SjZg3roAS8x|GFBv5yS4@j2yk(%
zsKJ))3Wo>MAy83(?%EXt;BGK607Zei1=Q^Oam_~z1O+0SP#{8tg8>p&M2?IgM!9oR
zhWS{5pmfU08&ZHM&3Z+jYO6xXP_cpsj~gj4^B7^fcMKI5LXaTBp|Ok`D^}b99wWK)
z8zxS{P!-ID02w|m+=#)wdyE?w3<)4ni3o!iA<P&8e&K=&6=wi6fKfiom<j-}qshL;
k1_|nLFmQqk2N)1S1r2OLf){W^VT6Azkidi!U<3gGJFS^i*Z=?k

diff --git a/imageset/announce_read_mine.gif b/imageset/announce_read_mine.gif
deleted file mode 100644
index b59d90a38c2ee6be60ccfd406328f264d28af259..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 750
zcmV<K0ulX3Nk%w1VH*G&0M$PLn3$OT{r%I^)6vn<?(Xix!^5GWp>c6><KyGn+S-YU
ziMO}6!^6XPczE^o_4D)do12^V_V%Qtr1SIhpg&N?#>TX?wCU;UWo2dM<>i`NW`%`?
z?Ck9F^76b(UXYNGczAe*F+b<$=+xBI%*@R9_xSqy`h0wR-{0Wh$jj~R?e6aG`1$$l
z%+k}BqJMvX@!8$^`uh6&`}Otpi;Iig#>(W?*Z1-A_VMz)y}jh*=Jn?2$Y*%*@$vuv
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5yYLXrKd#1}O|Xz7BEvGaO!q#UMdiKwgK1s1~Y;GSm_1lbHD4@W3Qv!;xDz8;58e
zxMdv#9D@W8GCmq1i9CuWLk1fOJ^?)<ItZAUIwCVRE*=yfE--sPBp{L{9G96H9RV{J
zIu0qJ9xVhzAOk)n7a7384;B~z4xAwrJ03hZ2vr{w0V)}1)*L7p+LaGAHa;mZBti$0
z9U|!IA{RZ{3M}XZ1W*YFKRFu_GAbAS{_G_pATZJ6p9(n}j2Q6YfWyBF1WYghpg=%}
zha4gVfbgY)j|YQ7b|@i1L4yVgWP}X)zz4ovA63Yd832F?3nwM8m^riMfbk@f9>|l|
z<H10a4Ft>>I<#dym@|4v?XjY$0Fw$RO`ST!$IlHpd_>qPRfYtV7GjW<8o}iTjsaLa
zm^*jI3I%vYu$V!YZj6l(@M(0=HwFW|5&|$-L71)sgigx&h!Meo<p2^WT3{f6g=NbT
zVtBO&%?*nPsA~dPjUpgw)GT~V_+UU6i2!j+ln8)=GYc8IgZ~Xc;slWqk^{(K@f&vx
z=FnvX@KJBX6az03OjjPGyZ0E<CnW$;n~D_@ZYJSgKV5c(1LdjwQ1ii0`#2K@&^TdT
gKA$TPEI>j66?kz1dH(rl#C`{yK!X8J_!k5KJMv&wBme*a

diff --git a/imageset/announce_unread.gif b/imageset/announce_unread.gif
deleted file mode 100644
index 9234d2523f7a6c069f8943d6992bb34b0fdb315d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmV<Q0t@{|Nk%w1VH*G&0M$PL<G{x3?Cj62weRomp=566$<E!exu<S-^Yioe_V((}
z)bi@<yJ>i_f{W?t>G<#Qy?~6;y20k==K1vXen3jXo}~Qz{KAQqu0~kr+1tX0le1D|
z*v-}F=jXt1ezsd{*}})LOkIplSorw)wv3eb_xS$){`&j-<KyJ);NkxK{rLI$xMFd~
zev0z)^7;Du{{8;q;^Wt%to8Nv`}_R;{r#9(WaQ-L&5M`p)7S0R*|JYzvsPyD@$vuv
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5#)W7`xDh0f`Ww(4PkL!N~vxfUNZiX`)Zg#-n)n&S=%6;Ms7%(hy+cJGlmd`~X4o
zJpdRNQ5q~cJ~aalH!+NiHx4~DFbW@nL?9bFJ|zJ+D4!@2E;TcX0V6&N7;i%x0GkdH
zH?y-d6%-8#HxdpbFaR4v8XgZO0TRf`0T~p{i4q+FCJ!E#7z#cv4jtUx4htd_2P@tP
zJ_R8^0t^#00S@r-kR>x2D?Rc777r`}5I8<&ypuOzM1%$hKxoUC07eT49}M_Fkf)-H
z2_z1P5OLr{#fs((un19L;>Q3r8l<SOk;I6T0n7orHgSMWn-4O)AYj8r0rvzqZ<<p@
zGGNdFE)sy~NdVE&0W*96V<9m?kE>W|G$25r!U?Qk6ZjAbp#_W;2-2pVv4AUq6f0(^
zRl7pP!*vr>B$&HGzySgfY6w^$S8akC`~>`<`69uL$2Bw@I8Z?bh`5huBzSRdhmc`r
zRwNj00>S|g5EO_WJ$i+oYOMgksIj6%i5EHqfSB>Zw(k`+Q~=;Xgab_zCswRDVZp)+
z<<L)<NVV$8g%1i~_^@!|h4=3-nEOznfQKdP7yy_#RHM0t8a2*5Fc1h12Ob^@JkXA2
m{2B%yumVRMAGB~q0S0XG!4BsQSi})Lgzy0a8aM$)5CA(2lvsWM

diff --git a/imageset/announce_unread_mine.gif b/imageset/announce_unread_mine.gif
deleted file mode 100644
index e3fbb103e99191d4ae77245fb3d8ce466d75dd78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*umNk%w1VH*G&0M$PLp=55eRAsM2R^!0N#fp}*OJ45o?$52Y?Ck8_vAL&i
zck}4!^z`)g_4nr1*z3{N`SkU>X?U@Mi|WnNemqCLfQ;$s>i6#O(z?Os=H}YO$ikka
z{QUgq$j#NFtc^@qi!eav=jXwQli1DG?B3wt$jtB9+rn{w`1tv@jFk8H_~PQ@`uqFi
z<K+JS{{H;^`1$#{UT(*Jit_UE)0d+8`uhI;{`>p<_4W1r{r#6%WB2j$<mBe@@$vuv
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5%(NB85UAQo#&oz8P`)6BS|vPp32R$YKRgNCVP@GSpGvG`aZR@YjXp*pVkY2ZCrF
z?0hUU1_*=(3^zVHAOIjIAUY^RA~6p>IXxjfE1R1<Aq@^R1p);$CVM{`0VX~w2s|yZ
zEg3U8I2Jq&B?7z?215Y@tri(P#yqqe9}*2A3?Ls1S34_JCp$I>8Qa_l4iw;+3?&mj
z9VP=p0+ll%?(ZQM1|Jj(FzyBhP!9z^2N4i%Ah1BNpoJbPaFBpuz#sw+J7OHDK)^?X
zfd&nrz#u^Zh8YGeAZTDiMuiv&d@vxyat4GH3O;;Lz=9=920jvi>7ddkg8v*6NGQ{h
z0)|fnI0pnMP>w;qd_68WU;#jfjuJSYKE*j92~Qk7!iJsEK!a5PF2t(E;X^4(i)zE(
zkN^O{hCp$9G{_mFf(#ol7zh@OV?kX23vmn{4C95#e-K_YSPbKU0ss|q99S@UaDyBX
z5Byl?qeg?%pG7E8u)%`{7^qLzFxStT8`!5^R8YWV1Pc|hVfeUkLIkh@HgdpFp@M~j
z10^7EU``!Iju%Raj3DiT1q>KBa(Mqvo`nk^4+M;uGU<U09~@ZJm`}e33l2VBJP1I5
z$`1kp4B&<(IdEWL4mrGWK>`Bw=id)%oY27q@4=DZ1sy~X!+H-&avFsU9t_Yy0$v0V
VfN>pCVMGK=#SnoAPCOU{06QcQSReoZ

diff --git a/imageset/de/button_pm_forward.gif b/imageset/de/button_pm_forward.gif
deleted file mode 100644
index 5120828341fa161dd563015c366b977a63d1e668..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15345
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

diff --git a/imageset/de/button_pm_new.gif b/imageset/de/button_pm_new.gif
deleted file mode 100644
index aac8e79ff3dca26b3290830d7b3272e249f5a20e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15465
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

diff --git a/imageset/de/button_upload_image.gif b/imageset/de/button_upload_image.gif
deleted file mode 100644
index b56a4263dc76bd12d8791cb01400a170c84ae644..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2682
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
WWJH!^oUkj;`CWmg0i6T@r~U<Esrc~#

diff --git a/imageset/de/icon_contact_pm.gif b/imageset/de/icon_contact_pm.gif
deleted file mode 100644
index a829fba8b68fd1eb9da756657d4fd407e9ed2b82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1473
zcmW-gdo<Kp9Ke4VHOV_RMVZP$9ox#b8?vo3Oic*e#!#ELp_vW4WsMPr)q^1lc`PFb
z<CU3C(XodahM6%B%oy`F52HO{b5yog*=BEj|G4L#bMO7$&-e4a7j-7Y*Dt{Z@`T<Q
zA)$a96cjXy#7qe%XQp{tjbcHs)@fCGomw+5=kxi}Igwm8E1D6^Nv72*>3DeJtavIs
zJY1($&a35GjZ&$Ql$4Z+L?W4NPAnF)SS&T4FBA&(I@RPPM=F~uC@ARc>{JT{ZEbBN
z5=oenqnTGs@_0>6O>8!s$K%mxw2+XH)YMev<flmYyR^BvIg?F_i;Kfzv5b*nNdZ|=
z_CUqsH8eD2`d=gxiRzlx-r%_4;9yC9Sx!z427}?^iE6cCY;0_ygH~Bt$v|R4P?%}l
zjhW1%`crXSE_aGl0kG%QvVU}o1ElJfmKL#SN~MycP$)DSZ7>+9RBC&ByFegFOH0!|
z>?0nJ<?%R~nVEHUbpS(<e0{pS_Qi`ABkcnpKN_iFNwu}L(&DOBz6gM+R4Qpn^~%bM
zTrMAu&PYs5%!tbc8$jV;><Ld<U0v<(@4t5Kno=<bXxAk2tW(L2jg2|K6#*)4EUvh?
zxW2wVH#avwKVLe+>FeuLRx}EW$bZp?^zHp+Wo2rWoXKRqdGiJ=B_$<2dh{qEAwew>
zcXf5m*R+O)hRS7PVCL<@b0iXZ_3BkXu2RZSr_q9(--m{V^78VeMU|AGIBqOnsg!{X
z-QC@TcN%KK)1<OlI-R~gugBqVz&~(RRaG@TJw0`W*cp`$gn+Z9x5z*~C?70k`(Mn@
zzX9Zf>nbWLnm@<#C>QisL2l^j>A8RZ{%5vX(0aXIFZ!kUVelm^3d>+HK%*xnCZ0Zh
z3extc<WeXUg?v_iyDly!>u-**sjeG%01{rld<h6+Vq%sUY&;%6n|DW}(THnXp5&Ep
zY;07Vz<`&@&MqdC$zYpSt7Q(b&U_A#Tv}N9?AbH$APEElfRsKS=5RQR1}&e*HY{ia
zd^RX;U|_(oFb_e{z73cO1Q{VOFo!<<2?%b4jIW$e(<r0GTg+3}IJ8#QO<U(wCnx&D
z;8KS@vE6#o_{6PUyMB_tr8*97cRb;5nU1?_8Q^qb6W#hafg3%W{GuVJ(wyAjwDHZa
zb}Lp**3Lwq^R|dU-vWEI=UrNqXOLZ~GQN<m|01j)w3US2E$#TRiq{-=s3bcbDllPh
ziFhZ)u>zv^)5}8O_uzvjV@#|4tv^SU!eiytqAycxUE$2#)=UYFQSP7oN72#npskLC
zfN;F$$&=f<ukT1YG8k%BiaGQ|0-+=KKJaNCq!?ls=erslBH`&sOS^!`E-{u=8<i5`
zfC`ATu!YZg?m=Q(%rmldr&b+3ER4w0BLR#8<NL15(<8$l-Y(%68_zLD{`;_wr)oJ2
zhS3Op?A!~%?EmHXXUijXBugKv2C}tgnjyL+_GUJhkyL%DT{nt(b9CK)!uuHfG3&5v
z2X)~Nj4ET6B|Z>w_WKHStYcrfQw$XWBl1Fm9c+p0aLFyI&4!4iF}It-y~nrNdcHP=
zdBAoR5v-FBmVb?gvRF>XT?~Qle((qgR&x}SYJ%~nXiPH?+m5+Bk1(L%=e^>soK4Ro
z0)4`&MQKgTN8+)2R<TLv{Cf(ctjzK<XWaaDz-=vHrlIkkX3Lm(6SME17%Y5cULs2m
z%K*d@tk(jO-q9S}OwpLx%oOq66;4^Vo!!U1%^eN|>PF4>26~frjEUbD5*&yN{C!uv
z#X&X`-alCEbU;w>1Ip`XM+cW35mw)3%$ULszPgoUYJY(i#r$)Py}h5X^=MVe&QNs%
z+6CLhI{RIP3u284v*~R%*}^mp_29zRO5D~Lqs+$~qH%P>`{dqNY?mAXo#3iF@S5vZ
UhkMO+UB9Qv^BU~U4up>X52-W>PXGV_

diff --git a/imageset/de/icon_post_edit.gif b/imageset/de/icon_post_edit.gif
deleted file mode 100644
index 38225aa92b4aac4c1f2af54976b815dde550c5e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14886
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

diff --git a/imageset/de/icon_user_online.gif b/imageset/de/icon_user_online.gif
deleted file mode 100644
index 90c53816424a893aef349f515ea0e6cbb912642b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 423
zcmV;Y0a*S=Nk%w1VLAXh0J9GO>%PnDg{bQ_ck2>j>mO?Cr@iY}jO##t>us9roVM#s
zh3m7#>yWSOd7<md(f|MeA^8LW000jFEC2ui06G9V000F4(8)<_eK_mQyU$h_eq{NH
z=wz;JnzAtIqH)d5qOD{2xZ6F;4;Z8jYenM`mQ*cUD8OMbKwO?H5kMedFa%a5wiId*
z01^g4I3`yRhe=?~Zl5S~bb)}77Or+46$S)T23rFSb%8e&2?z;W1OtC)VvHLWTLN<q
zd4QN2Zvp@a3IPKF4hf*4JQQdL0;vuL0}HLL7F4RXs*A1<um-)fIl&-<#u5O3m%$Zt
z&JJ5~xuMYnm0SP;(-O$ZatE8;1J=*F6bsy_d_LiC=BSYe-wxrg6A7vO<(5w3Idaf|
z3#mQ70wS}ZV8B5F3J4?wmv7L+GYGF?s?dyp0RsnA!=%H8hf*zcz|_gn=HQ-2M%i$=
z$R}(d4w_9U3QR(?W|5vgdjJhOV<^!VMui$Z3NPu*rTUIRWvUP=jj7^Z4sD9{XxB_5
Rv4$0^^Q$O)W^Y6Q06U#&t{VUV

diff --git a/imageset/de/imageset.cfg b/imageset/de/imageset.cfg
deleted file mode 100644
index 027a838..0000000
--- a/imageset/de/imageset.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# Images
-img_icon_contact_pm = icon_contact_pm.gif*20*28
-
-img_icon_post_edit = icon_post_edit.gif*20*61
-img_icon_post_quote = icon_post_quote.gif*20*65
-
-img_icon_user_online = icon_user_online.gif*58*58
-img_icon_user_offline = 
-img_icon_user_search = 
-
-img_button_pm_forward = button_pm_forward.gif*25*119
-img_button_pm_new = button_pm_new.gif*25*87
-img_button_pm_reply = button_pm_reply.gif*25*102
-
-img_button_topic_locked = button_topic_locked.gif*25*102
-img_button_topic_new = button_topic_new.gif*25*119
-img_button_topic_reply = button_topic_reply.gif*25*102
-
-img_button_upload_image = button_upload_image.gif*25*96
\ No newline at end of file
diff --git a/imageset/de/imageset.cfg~ b/imageset/de/imageset.cfg~
deleted file mode 100644
index 8c07e30..0000000
--- a/imageset/de/imageset.cfg~
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# Images
-img_icon_contact_pm = icon_contact_pm.gif*20*28
-
-img_icon_post_edit = icon_post_edit.gif*20*61
-img_icon_post_quote = icon_post_quote.gif*20*65
-
-img_icon_user_online = icon_user_online.gif*58*58
-img_icon_user_offline = 
-img_icon_user_search = 
-
-img_button_pm_forward = button_pm_forward.gif*25*119
-img_button_pm_new = button_pm_new.gif*25*87
-img_button_pm_reply = button_pm_reply.gif*25*102
-
-img_button_topic_locked = button_topic_locked.gif*25*102
-img_button_topic_new = button_topic_new.gif*25*119
-img_button_topic_reply = button_topic_reply.gif*25*102
diff --git a/imageset/de/index.htm b/imageset/de/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/imageset/en/button_pm_forward.gif b/imageset/en/button_pm_forward.gif
deleted file mode 100644
index 3384df34be5926db98693854fd66da017ec9d013..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2168
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

diff --git a/imageset/en/button_pm_new.gif b/imageset/en/button_pm_new.gif
deleted file mode 100644
index cc0381c6b27979aa7d0bfcea25928583653e4041..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2005
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

diff --git a/imageset/en/button_pm_reply.gif b/imageset/en/button_pm_reply.gif
deleted file mode 100644
index 3275b06d525af8176c4d76059a11d1e6916cb68d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2126
zcmV-U2(kA^Nk%w1VPF6<0OkMy?%Ut!)!Fvr=lk*V?c?RnV|><#n%Ih*;kv`-zsTdf
z#q!kK@8;<3<mS98O~5x;zc*OGI9R|qS;ItQ#YSbsMP$cPZpc$_$yIU5UU<u3dd_Tw
z&~Ap$ZiUiuh|zkF*MF4MhMCianAL}x*NL3ljiA|;rr4CE*OQ~#mZsX4r{J8d-lMVH
zp|9JZuHU4x+o7-Is<_^*x#P0F;IF&sxWwVQ#OJ`u<h{r3#?a=;(B;U_<j2nH&D814
z)9TjS=hWHr>Fn|6>fYYr-rwQf-rxXg#sEu=#Ma`-*yGCC<LLDJ3Xaeak<lEL(jJ!5
zA(zr>wApXA+H$wriOA@T%IT2I>gDtL>-PKk`S{7k!pFnE=H%k#<Kg7u;M3C4%ErUU
z#KF|k(bLh;`uX|)|Ns8}{{8*^{QUg;`}_L(`uX|!`1ttu_xJYp_VxAk^z`)e^YilZ
z^6~NU@bK{O@9*yJ?(OaE?Ck98>+9<3>gnm}=;-K=kB?+zWZ~lFA^8LW004ggEC2ui
z0AK(z000O7fPX|{U|WWVh>41ejE#<ukd9ztM1MnJURh<EoSmMZprN9pq@|--USUID
zU1euzu(7hUw6(UkxVgHxXJuVqT57Mm#Kp$P#Aj++TV-j_(9zP<)YaD4*xA}?Wrk&H
z;Njxq<mKk)=;`X~YTeCi@bU8V^!4`l`1$(#Ywl%i00RmfNU)&6g9sBUT*$^>n}-l@
zTyWrkLy(6QGdciJF`|PuFEUE_08yiZ3q9JHbZ|hWMvE>XPMq;@hJy+hAFffeMkh~*
z5B<3rI+Wvw9ycmz80vsTkEcD{P@FL|q#G3up3bPyfoW3`9ULsBNTMtWs${`B=t_~O
z%?d;RXA)(z#?KlzbnUVs>c-!jzkfplP7vX*0~LS`M~EQgjbN;RZTfga5pd<oi77h(
ze4#MrzhPBiy^xrVA3to`nD*0$O=5p=V#nraA%zdwa2%w-otwpj4scjFfRkc)Y#|O<
z<Tj4OfraI~p~trHKzeK+4jxo+a9g(N)~j2)!R;@O`SUn5P<+6`yvYY~k~gOzJdOzm
z=i{4*udxCH{u;UGfB^<<;J^m_<rjwm6n&sz8>~SX;TsD2GslG&D$qcN2I??}10(1l
z;twCTFvkWJoZ!G5Dq`4x12lXHBMl!oaDt2@<T%2GCT*}GMHpWA14SeT=>}_kur^-*
zkQe$x$CFPw00WeCNLl3xR8~190T4{!039kq34;R!RQY9;6PTH$npsk`rkh#5fn*<v
z#X+S%b>x}n2N1ZhgAE1-P=^B{>|p2)gSwEX3>4LYf&+%S0Ko@&Hd^TfgAy9TrZQxz
zr=ApTx~ZU+ehSB&NuCDBr~cUC>Z>9^Kv4!fxVjP$4j}Mq1`gQaLPijX@G3>GPB4KT
zD+x>NtG1dX1G2p`YeyWY_R&Wib1>`A9o%;7?YH2DEAF`DmTT@D3Ys^^xBlSa?z`~D
zEAPDY)@$#*_~wg;KY8@)@4o;CEbzbt7i{ps2<PFC9t=0^@WT*CEb+t?S8VbB#d>rT
z%pH4l?D5AShb;2QB$sUR$tT~j3@c@DjPlDc$1HQozKn4R7i5^C^Ugf?Yzi4%sPab<
zV=xoR(MTt)G$dM#QN$mAC@}>TOjK?4)mUe(_10W>?e*7PLotOCe<aZa6<7GI_S$TZ
zas?GlBq2o=EzfNC-FTOLM;TQ};RF_V@FDo%gcol3;fN=$_~MK+jt3S_Fj0mcc~@>Z
z-WgXtImVoK?)m2xm!WyWq?c~`=?9B0xx8_3Q^p!|;L*k>v%~K0>_Kf}MjLd<?nxSP
z%<f6<oWL%88+f!{2J*h6@rJ(cs@}4<Y~+9eMIH<gM;R*#;D85f+#yH*4i1zNgGeB(
zAqV#wVXy%E8kGP)_5-lravImy@CF<;I6%PwcHmY+*dV}vuuF5yqJ#H9uz(y;paAV~
zKnWH=!S_+525or5`O2^Y2T-sE6aXLlN>Bn1IG_L{Bw-0^kU|rBz<zdkL;oo7iu}33
zRSh{p8SIe5e`rf{pVDCYhLQsbn1OpMaDyC{$UO;2U;skoVEN?WhW=Twd<~(9{Q?4q
zEusMf60l#M)L_CDbPxk*&{G+Xpu-#<!3bqwmFB1<2k&8E1q(2P8M3$nP8`tzF_3@<
z)Ud%0mVpj)7yuycR|fK7fRUT%hZfoJ#V~5|NpM(z10+BJ54r*WN^6AU8sGT3J86zd
zYsf(XC?bIvNKzw~i~;#-P{{H%$pL*d$^Yi3#TI_gei&Lq2`G}jAcb<2aD<&PHJ2YX
z<X`}3Xru`(I6(>ufO|1Wg9j*JNJGW}4vJ*q1#18TT&9qO5!6Wb?023wc+UX>pwM|j
zX#`TLAzjiV4<OaxhS@C=mv<QoHrX%$PL|J*ZXl!s>NiR5QNVuT$YS|6kp_R3FC1^M
zA8+U>%1x+&Jeo^P8bHv>2Ac4i60D#FU8#ot9n^yh2qXx&p~Z~)@0=^N-)ktM!V;jg
ze3{{BJ=s`>*JzF}Y)C^1BtVe@EP$pa@m>!0a)wo!Pb4L)NP|Sn;07~L;Grv#pBDMT
zO9zN^h-7`E5!Sj^XOLBMKv7K^j_3+Cv>}?Fh$b2yB8)P?!jD?L>n8R(S2N(X6Myw9
zP!7w9#O`&mpm;1qq{ooTTK2M-RfzQX!P(Aw_Otqs9y>-$+R~a<9isai8n(gO*1Gn!
z*FXd0=H?1y*!H%#<ptlQU^Xi(p>4nouG*Ghg(e{34@ii@6TrsY<~sMeV0%IojvEL7
EJ6a7+7XSbN

diff --git a/imageset/en/button_topic_locked.gif b/imageset/en/button_topic_locked.gif
deleted file mode 100644
index b08918a24f3c8d82d357b6abecef1a016f54488a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1923
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
J3N#G_06Tv4yea?y

diff --git a/imageset/en/button_topic_new.gif b/imageset/en/button_topic_new.gif
deleted file mode 100644
index 5b7b1e0e605dd5aed90d5c0067c15c3b480c6d37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2737
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

diff --git a/imageset/en/button_topic_reply.gif b/imageset/en/button_topic_reply.gif
deleted file mode 100644
index e900c80c708d055098e399ef0fa6adef90cf9730..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2135
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
NjtvP)Xl@_?06RStF?j$0

diff --git a/imageset/en/button_upload_image.gif b/imageset/en/button_upload_image.gif
deleted file mode 100644
index aa940421730f5f3920329468b5d41425fb415559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2808
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
NfEpx%6cvC|{{uSIdoch2

diff --git a/imageset/en/icon_contact_pm.gif b/imageset/en/icon_contact_pm.gif
deleted file mode 100644
index ec190118fe5be0251bd9a36552de1b5fa0c74cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 677
zcmV;W0$Tk?Nk%w1VH^M`0K@<Q+^)9ayTjp%p3FI3+iHgP)!kH7aq{;3B|l+dbd9ga
z=a!|pfR3Kc&B*2D;ojcb+S=CD)zQAbyU)(a;^ExT&&#>Ew70gh<>cVx<KN@r-p0kk
z)Y8t+&(F5Dw*UYCA^8LW0018VEC2ui02}})000I5;Ma|0X`ZGCWmxOJaNI&;X5V<O
z=cDHP3qxY@D;kX>iju-eC>9CEV@a(plgb6-a8M|s8LOBwdOS3S#=+qYn#W6X*=$g-
z+Xk})fnZP&2}}qQavcy54^R(YUkr#I2oVSyd=Lf*9uG8zhY(Fq2??4Hkdh623w)WI
zov8~DPYACNkbMsb2DzArBN4s`9b9dZv<POm41K#1y%7vsU5rBzdk+yBnAs8#%pDvY
z2o48}j6oes98*eD)*K@oP<M=82o2x&`1m6g5(W$l3)(aRR-vH5g9i6?@DS<}t|$!<
zN=(>cg2js%GiuDZuYt#pAVZ4$SfPUm6ev^wn*89QrOTHvW5Q(V;eySZICJW}>C%GF
zpFo2O4cgMD1fL9YF*s_0sZ*m+TS}NJA(VgtLM~9<%9X0rsZB5hAb@pg*Rv8@ZdhyJ
zLID5*$Qqd1scwZ%8`64MyTO2fzXarNm;hkF009sN5P)zsz=REI*Cq`dSV+Xe0R|Kv
zFjn*9mL4r8@M}212784$a5j8ZGlvE(FS-Ii;L?Hy5jGQ`V3@4y3N61)7*t>^Sp*ew
z515kpDp>#!IJETjtT^1tjxraB@IbTo0Nh$~LlB_A-?(xiP?!=yOaxjUXc?f4{`mX4
zhcwk~`GArE!vJE103yc}Xkbf9G?3IHCAmbQo*3#Z(b5qVR%irh4rHj|h8%XNA#60s
LB;tr4ga80L?XxS0

diff --git a/imageset/en/icon_post_edit.gif b/imageset/en/icon_post_edit.gif
deleted file mode 100644
index 19006f95a7b5b7fa8e6427210f9a45f041963b9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmV-b1FHN-Nk%w1VJZM90M!5h`|<PJji2MZ#ooZj^3>bBDowvPSHL(~&2@^@ev{OO
znbnY?*_EZ>oUGHCr`4OO-lVeRs<`RN(c#3)?b+V+<mm42^5o{~@bUBM>+VE+uF~Z7
z0AH~KQ<x5M$Rd8uEpDb!mC<^w+KaW?yVB;&+vx7}_^GR`|NsB|{QUa*`uO<x_V)Jl
z^z`!b^6>ER?d|RA>gwg?<>TYy;Nalj-{0BU+1A$9&d$z{kB^0gg>-auYHDg$R#r+%
zO55J!A^8LW002J#EC2ui04e||000L6z@KnPEE<o<BnE{^I-keO1?R&_q1a@`=AzzO
zwv%p5E}PHj@kzMi`F6gXkB6$;@A$mlu3K+UJ3TumH7P2Gh>41ej4E|HLKZkZJUlms
zjhUK=D3CNRlrcOzEGwoE1*ruAEUE<wr3DZxuCk`LokB1;Hz+tXDlNhcvJemyEd>e^
z5C#d!3@ieu2@n;+*ttR%Cn>@&;4j4C-~|le3I;Fc;q2t#+Cn-gF!lBet^zOx3-$Q>
z{p#_vM=;)xc`*_y#5bW~LVgL;#en#5fx?Rh=gHW}5#NK45@fs@@W229kqbET<H#~2
z3K=tE#&qB+!3<XjVis^9bEi!InKE3`7)rEgjT%LhDqZRl#nGowqe`6`^$`&<d$MZP
z)2E1-G+@J?S(Bx#*|TWVs(rGg$=b3~NOT|}<HB1g8A@P~OTt8n5g`H#9!$8f;lLx<
zfasv1Lx>I_wo2X;B5__39yoXqu>r=<&!9txt`i~>3C$izSb!;`#T{X<W4MO>nq|<^
zG+IF3;NgRb7&2Z&a1{VWO%}!@7<U!nMa$AZERZ09g2aXwz*{sZ5TSbo;{ganIFP`2
z0~Qj7Cx`$bp^Stmp#O*=0>ujp3bhxov%-7}76BaK-wXc1a8V5L5fK7C1hKH4DiWB-
zf`j`Na2^a25>!uuLoE1m&I;QRAfh7{ni8OSD-c-XI|R!2!-Cidqr!IGMeyA!;*n=w
zFgwNwn~MuhD5MI*sZv}`Bu1bDa@;K`<b)gwvEVJYq;N+HR@z~Rl_{9QC6%}US;r=1
fW<nYffK8^R9+edV*kN$SSy*Cs)oCXdK>z?d!?mAo

diff --git a/imageset/en/icon_post_quote.gif b/imageset/en/icon_post_quote.gif
deleted file mode 100644
index c3708a1477407397362a5516d5fdb73d7f5cc34b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1109
zcmV-b1giT-Nk%w1VKx9L0M!5h`|<PGlcVIh!}8SI-NVVeDowvOSHL(~#6@JpP;AIp
zbIoIX(|eH9i=E$`tmLb?+@`bb#?a%&&GqEy?A+kr-rw!+@#E#`^Yr%V>+Yzjs$Pw^
zim=iEYQ+F$yZ~6F2T_tDW1KUH(JyhTQI*kVp3iWo*s{*%%-rhT>h<#T^VHPS$;rt7
z|Ns8}{{8*^`uh6#`1tkp_3-fU?d|RA>gwj^=Huhz;Nak!o12f1kA;PWW@ctmQc^`l
zMcdxvA^8LW002J#EC2ui05$+9000L6z@KnPEE<o<r1FQeU@pQ;EVHayk(Zffhxu75
zycP6HwyJbK&5Bj&@ou@Dd`_?1@A$b!Xwmp`EG;cPJ~V=dh>41ejEXyZF+4pQE-frR
zJT)&coSmMZprN9jf;&GiZage88g4r-qp`BFEvBeEJUK9}xHT~`4F?4a6u$)!#>f;4
z1qTf=5CziGG1JYz*fF(U8n`PlHn=)3G64q<0t*N-G6ezb?lK4q1P=!R6A%o?0__YC
z5c;tjxDCgQ7nNqjs02gCi~|g2%#ct(zzla1-9?iik--6p0SZXG7+|DHiQ9(kXhEZ;
zOB(K6#*7IwKuDK2Y2<`CZNba`mMMj-tU<JB4Fe2n2oO-fK@E3A-8m>gfG7h4L_-!W
z(13sh3K@*n2>N5Cjk9QNG%x@`K>-A36C}__)dm6u0w5S@aJE4Kv;`PA2p}NsS+Xl{
zC|<1iYJmg>D&QcHpuk?m65JwP9CEQW12`DpK->a{>C>o9LrBfKwd>ZTTU3}$yS8K;
zwsY&=ZMzhaEscT;ACBlzku7<WD_^dsjPvKvqf4JoT}hKCQKnRnenAC?4Kuu;7=dEU
z_A)9qfH1KJ1qkvcNXVa0zrOwZ_~&zo!U05y6M}>QLJGtcSRe`e!7#!HCbR&<2_STk
z0u7>7XyJtzGA0NKr-0!9K?f&T&|e24z;J^ND!kA_3>3=Hf($pf2qO*Jyr6;&E+Uen
zAT}~)Lkk?X5Mc)-c=tgE64oF?FvCnRLkk5w@MM%TOu&pYDm-9K0Z>kJzzc=}=>-QL
zqF_M^BM=z_1`Zq`Km_Wj*pv!TI`G0g5eRUA0{}d*&jS%a$-o1E%3wnchmOTz1y8>4
zLJb(e0Lu(6Kor9a0~8QwQ!X~8<p2tK<bn)SwJ@avf?O(=m_v}j5)Br(RA&ryHdSY*
z4wOm*sa*2PQkT*&Aj40r3gPNWltKhU1QA3zYn`9U0E4J8lsaVt0}KFwLnambgR3fp
zD=rLert_Ag3gESJ&j5EWkmsJ9lv?YcfWjbdxZb)t(7rI3Q-A^o01(3fZovzKmCZEJ
z5DZ$r2y8Q>?wjw5+57?nLM^xu!3!~5TnWb=tJuOOzo^Ku$cKQ8&BPAQ;_}O$Y)AwL
bt{Q0bf&0yz-_AVuOkd9D1ub;YK>z?d4CnHx

diff --git a/imageset/en/icon_user_online.gif b/imageset/en/icon_user_online.gif
deleted file mode 100644
index 90c53816424a893aef349f515ea0e6cbb912642b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 423
zcmV;Y0a*S=Nk%w1VLAXh0J9GO>%PnDg{bQ_ck2>j>mO?Cr@iY}jO##t>us9roVM#s
zh3m7#>yWSOd7<md(f|MeA^8LW000jFEC2ui06G9V000F4(8)<_eK_mQyU$h_eq{NH
z=wz;JnzAtIqH)d5qOD{2xZ6F;4;Z8jYenM`mQ*cUD8OMbKwO?H5kMedFa%a5wiId*
z01^g4I3`yRhe=?~Zl5S~bb)}77Or+46$S)T23rFSb%8e&2?z;W1OtC)VvHLWTLN<q
zd4QN2Zvp@a3IPKF4hf*4JQQdL0;vuL0}HLL7F4RXs*A1<um-)fIl&-<#u5O3m%$Zt
z&JJ5~xuMYnm0SP;(-O$ZatE8;1J=*F6bsy_d_LiC=BSYe-wxrg6A7vO<(5w3Idaf|
z3#mQ70wS}ZV8B5F3J4?wmv7L+GYGF?s?dyp0RsnA!=%H8hf*zcz|_gn=HQ-2M%i$=
z$R}(d4w_9U3QR(?W|5vgdjJhOV<^!VMui$Z3NPu*rTUIRWvUP=jj7^Z4sD9{XxB_5
Rv4$0^^Q$O)W^Y6Q06U#&t{VUV

diff --git a/imageset/en/imageset.cfg b/imageset/en/imageset.cfg
deleted file mode 100644
index ffdf982..0000000
--- a/imageset/en/imageset.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# Images
-img_icon_contact_pm = icon_contact_pm.gif*20*28
-
-img_icon_post_edit = icon_post_edit.gif*20*42
-img_icon_post_quote = icon_post_quote.gif*20*54
-
-img_icon_user_online = icon_user_online.gif*58*58
-img_icon_user_offline = 
-img_icon_user_search = 
-
-img_button_pm_forward = button_pm_forward.gif*25*96
-img_button_pm_new = button_pm_new.gif*25*84
-img_button_pm_reply = button_pm_reply.gif*25*96
-
-img_button_topic_locked = button_topic_locked.gif*25*88
-img_button_topic_new = button_topic_new.gif*25*96
-img_button_topic_reply = button_topic_reply.gif*25*96
-img_button_upload_image = button_upload_image.gif*25*96
-img_button_upload_image = button_upload_image.gif*25*96
diff --git a/imageset/en/index.htm b/imageset/en/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/imageset/icon_back_top.gif b/imageset/icon_back_top.gif
deleted file mode 100644
index 8a0b82809a4bcc8e0196a79e69319f73f71da2c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmZ?wbhEHb<YwSzI3mWdd;R81$4>29yYcj)qhCLNKDuk)l{4q}tlzwE<JMn4f1N*e
z^3u_h7muFUyJ5@6XRn^$zW?Fr%N?uNKe~H==b8=w|Nq~%a_!G|pBQih#h)yU3=Con
zIv^z=I~iC#7o=Kp2PyU_N1YGZ`~FK0)0zWK!Uvd54>TUrc3L2yw4QBK(gF)!XGMjF
nOH>%99$OSNp<-|ADW*qF2h{|^e%c5-O0=J9oVcxpfx#L8XINXn

diff --git a/imageset/icon_offline.gif b/imageset/icon_offline.gif
deleted file mode 100644
index c5e41a41db9534e46f0b9e64d09eec735c37f313..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmZ?wbhEHb<YwSzxN6Ms|NsAg|NedY^y%;4zaKw-{Qdj)uV24*?b_AX*Z21A+y4Ik
z9Xobhy?XWY=g$od4JS{YJay{S+O=yRJa};Y`0;Dku4QLu&zUo4_3G7CRaGxuyr`?I
z+puB7)2C059zFW!&!4!sxScz9?%ut7-n@Bl-n`kmb?cckXMX<t`RLK34<A01m6a`C
zym-r&EiYfboIij5!-o&gpFiK(+4=qZ_cd$Q02MG00TlmP**N<LMA|v$7gQEyre~BW
z7#SFtD1>CBDimZCI5{b}7v+~0=qNbm<R}Dz<ck%8Qj1fI%2HGG7!-f9FfuS0Gw6V9
z0)+?zTl|5WJpv38%q$Pj2rQToH9hEnfiMf-go_QO0=z5@*N=GIYw6Kqk_?z&(Zj*N
zQ^6v%r|XD`+XI^*H*P@<PDwo;E+YnBHV!da9&Q6EHC|&@W(7WZ32kOpudozGCMQP*
FYXF$7t9$?e

diff --git a/imageset/icon_online.gif b/imageset/icon_online.gif
deleted file mode 100644
index 0e40cf73b5114c15246e4390572331ef3d6eb774..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 393
zcmV;40e1dJNk%w1VG95Y0M$PL|NsB~{{Hgv^8Nk&`uh5gj*kCoj{E!j)meA{Zj$0(
zf4aK5wY9bXa+LA$@$>WZfPjGeXpFeHxbb9%tgNiXU3SS^cAuZ0c6N6EcbM&Cg}7I5
z|A3#5T4&GC&zxj(<zImRkE;ERsMglj|AwUTi=%#iers!MkB^V{XNv5Ws-vT$x`L44
zW`kZ{Ui^HV>4%^Hd7AoYi-}ld`T6<iV1dV(q{^SEdU|^8aF5K)%&l#FuyBC#WrzQD
zm+<iLA^ti%Lr+jyK0|MCd2(rIXmlVlFfcSARA^-&aA<HsLLf(SZ*_1iAVF+wAW~^(
zXmoQRQe|^xa&~28E&w6<1OWg5KL9KM0000B01E&B257+F&k+C^0}kPj5EwBo6kUMu
z69g7Fl?cYV3<Lm=EkxqP8oY&ZRpMkCiAW1#EWCUPL!_rT8BsX~GAR=v78phnI};i;
n3J4t(01pHO9~B52GbS_-KL-N~5H2_j0|!c0MgRc<LO}pKIRCV2

diff --git a/imageset/icon_post_target.gif b/imageset/icon_post_target.gif
deleted file mode 100644
index a29dbffa35b6e29b3f4bc03cb984c37733de9234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 186
zcmZ?wbhEHb<YwSx*v!jNUS9tH|Noyqe;zw_?BBnC@7}$8^5n_q&!7MP{rlz1m#<&H
z9zTBk@#Dt~FrfI)%EsA0Akxk`zo4=xGd-h3!N|bCL?I+2RiPlGz{yF$y(qu5Ku5tb
zCr2R&Bwwr$lv<oxRF;~e$DsI=g^_`Qmq7<)9LNO>ESeik9aio!&ggCw3w0OZaAKId
efQzS!(W^+NO`FkkA^*1&o@Und!JMW_4Aua&@kmkt

diff --git a/imageset/icon_post_target_unread.gif b/imageset/icon_post_target_unread.gif
deleted file mode 100644
index 0a4fbd422964c0f10b70795a1d4b6c8c5191db11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmZ?wbhEHb<YwSxSj58M>+AbrRqOMjfX8`$3`junpOuZXe?X+2bACZ(QD%BZiGq=V
zfr&y$Myf(VMuC%)f_qVZX@QP{V@{4j5J<jQAt<#twWusLMUO%8CkrD30}F!=$V8A$
p49s#KEN6acd$2e1ti7ku@XTp>>!Am>VHPt&cW%m<EXc`V4FHU7ENuV)

diff --git a/imageset/icon_rate_bad.gif b/imageset/icon_rate_bad.gif
deleted file mode 100644
index b0175eafd316bd935fc6694a7708d7897763f6e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 465
zcmV;?0WSVWNk%w1VH5x;0M!5h1p)%uh?U-rn$V1w#*dh|lbNrdp(X|l8w3c_aDnQA
zl;eby$8&<|iJIYsl^zll-G`OdiI%%~gzK89(~FnzpRLM^mfxPL$d8%DkeRxRlfaOf
zw3wW!mzqvUNn~JQBn=S?0tB0plLG+(^z`)Z?(XX9>gVU@<mBYx;o;ui-rU^W+1c6G
z*Voe0(yy<tg@uKAd3khnbZ2L0US3{1J3BBiFf1%AB_$;t9UU1N85R~65)u*&3=9AO
z0RR90A^8LW002J#EC2ui02BZy000K=z@KnPEE<o<q;knr!eY=F^C?rcuB_W~<+{39
zw(!!*Dz8|oR8N_5omDQCuD4F2R4UdgwQ8YOJV_@mDR?L-J3Ko|Cx<7GC?+N=i%2*-
zk|sMkn>kB5FC`^9O+z{+BqpAvKRGHSTC6`eDI_?uKQ$(|xV*T(z`?@6GBh7F9!xXG
z6$;J`2ul;r&Ivv~A<_v83l8280zOI;-w+TC2iHm$3;_WV5fl^y7UD=3@bd!_AwDDP
z0|HvWfPp{;4fc+J@KG>>4*=J)DFLvdV!|dq3KZb*kChJ&9HPlW(7`}QRu4p6EVXjj
Hk01a$BwoW!

diff --git a/imageset/icon_rate_good.gif b/imageset/icon_rate_good.gif
deleted file mode 100644
index 8b244843ba10e493b4c9795c4f2238e908512e1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtnZNk%w1VH5x;0M!5hYin!E%gZt{G6n_)U0q!h6B7;&4z;zly}iA>yu7-)
zy12Nwx3{;pwzjmiw8h261Ox=9r>DKWy`-e1wY9aoySt*IqPn`e$jHdKxw*KwxVE;o
zx3{;&#l^L?wZp^1aBy&{s;b7u#z;s=dV72O`}_Cz_wn)Z?d|R9>FMR=<>27p-rnBa
z+}zmM*wob2iHV7BZf<C3XkK1kQc_YpJUlQkFfA=DDJdx?CMFyl91{~03kwSd1_l5C
z0RR90A^8LW002J#EC2ui02BZy000K-z@KnPEE<nP5_0*2m2ylYEQNwblPDAJnlzbK
zI_{4YIGw`W8100rj$*MHlifz8RH>9}w>-7(cq%)COm-<ND=I54i#$syEh;RFU_6eG
zh$}5DEiErSOe!v%FD*7UH&LiIFD|YDTU<D^I96h}xVgH!xpKKA4?egc4<W*0G7k<0
zw=yCQ#$o^>9v;V61T`KF4LkxfGb2nN3=A9`3kw<<8`nl3=^E=613vCX9To}-7Z(*3
z2`Jnn(xKnK1QQC_V}fBqf&>U6N;oi(2nLA~BG?-c#Ya5}ASW{8Vh@5xUMN$l{1F5I
EJ3mCg^#A|>

diff --git a/imageset/icon_topic_attach.gif b/imageset/icon_topic_attach.gif
deleted file mode 100644
index 9a70638650757f26e65f15d58350abcd43ef939e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmZ?wbhEHbWM|-FSj58c|NnnuW8<{6w3#z!0@(~Op!m<q#@Rn0(#|=*pt2}4J)=ay
z$iTovAtWPJp&+Bc$w|SzD8IBoN5L^CM<EC#U#t+6TAW%`mYSl+p!k!8k%57QK?h_U
k$R-A6aStJ;C2RLSSi$=E606?zvtI>ftIS}0tioUo0OwgP7XSbN

diff --git a/imageset/icon_topic_latest.gif b/imageset/icon_topic_latest.gif
deleted file mode 100644
index d79d31ac43e29f51e34c0cf43f91ec4ecfc3c3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 186
zcmZ?wbhEHb<YwSx*v!pPUS96&>-+!z|DQj9{`>du*s)_@zkYr4<jI#WU;h66`|jO4
z22`N<&&tNxKOoZ1IlrK?C^J2yM8U|wz(gS=BUPawqrk~Y!M!NIv_MC}F(*eM2qa&u
z5R_V+T2z*rqQ{{4lZBCiftx`GWGKi53@n-jx(=)NIArj?yTbgOk!2!}bNj;PcFA0Y
YlR^z!yaX>?4m@Mcle&@Hje)@$00s?2x&QzG

diff --git a/imageset/icon_topic_newest.gif b/imageset/icon_topic_newest.gif
deleted file mode 100644
index 02b37796fb6b9b8aefe71b10a445a716a47c46bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmZ?wbhEHb<YwSxSj5KQ>+AbrRjaYF@$;g9$9aCojvZqF1I2$<HqQP5k#^4c1(ija
z=@}&oMg|5Z3LzP(3I!PjPEHE$Mfs%#Itq?CISN4_`C^5j)Z)~lveXnk2F0H&j0_BH
z3_2jQKsGTjD`l|V`K92&d2iMgH%qtHIjnqb3ubt^NVPWTF&FL<2;P;(#9$2ooK!C~

diff --git a/imageset/icon_topic_reported.gif b/imageset/icon_topic_reported.gif
deleted file mode 100644
index 957a5c0b458cc2245ee1cd6707521656dd7b5855..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015v`Nk%w1VGsZg0K^{v|NsBJYkAb3sMyTZsyt7%Rc6A8l+KQr`S<v)MOXRp
z^7ZHG-nPB`{QSwDsomY*@7mqw#mmmEwy;QB!+VFgVR8NX`>a1w>)hY#(bf3w@c#Y%
z#*&`*_xIAe!r$NDA^8LW0018VEC2ui01yBU000GZpfM3-X_AwXXh7?}t&$#aLBNOc
zTu{3;w#KHlxI8|NK&yc$Ob`vghQj$+1CbWuQ0TNW6{}TJumBo@Ky*`ah^+=e3&UtJ
wC~xZ^q1bQ%3I!f{a5Odm0tSRuJ3Rmk2?L8(Ni9^9VptGHm}3P2Zh0X9J2X^zNB{r;

diff --git a/imageset/icon_topic_unapproved.gif b/imageset/icon_topic_unapproved.gif
deleted file mode 100644
index 2a6a602d65bf2881f157bb2e6c49d70b62cfcae5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 253
zcmV<Z00RF<Nk%w1VGsZg0K^{vl9H0r($d@8+uhyW%gf9E|NrRd=%%Kojg5`IzP`uD
z$Fj1rwY9ZIMn;m7lDWCL^Yioe_V)St`Ezq~_xJa_yu5&bfS;eAp`oFfnVGGvt?%#e
zzP`Scl$87Y{NLZ-A^8LW0018VEC2ui01yBU000GgAmbopX_Age6)Xz{P+L$PQ^`Q1
z11-l42m?#d;8_}j!Ui$;Bo3?qW)R6GHII+>AYetR4NJjr(P{}7Pr;KYvMvd;cA;P~
zCf$HWt`#^|0|5mR83cS<HU$$61qus?T0jO57!VFkkWNqq3t5?40tQT<XBh`^d?5fk
DRGe|?

diff --git a/imageset/imageset.cfg b/imageset/imageset.cfg
deleted file mode 100644
index ac005bf..0000000
--- a/imageset/imageset.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# General Information about this style
-name = debianforum.de
-copyright = &copy; 2008 Timo Salmen for debianforum.de
-version = 1.0.1
-
-# Images
-img_site_logo = debian.png*70*56
-img_poll_left = 
-img_poll_center = 
-img_poll_right = 
-img_icon_friend = 
-img_icon_foe = 
-
-img_forum_link = forum_link.png*25*30
-img_forum_read = forum_read.png*25*30
-img_forum_read_locked = forum_read_locked.png*25*30
-img_forum_read_subforum = forum_read_subforum.png*25*30
-img_forum_unread = forum_unread.png*25*30
-img_forum_unread_locked = forum_unread_locked.png*25*30
-img_forum_unread_subforum = forum_unread_subforum.png*25*30
-
-img_topic_moved = topic_moved.gif*27*27
-
-img_topic_read = topic_read.gif*27*27
-img_topic_read_mine = topic_read_mine.gif*27*27
-img_topic_read_hot = topic_read_hot.gif*27*27
-img_topic_read_hot_mine = topic_read_hot_mine.gif*27*27
-img_topic_read_locked = topic_read_locked.gif*27*27
-img_topic_read_locked_mine = topic_read_locked_mine.gif*27*27
-
-img_topic_unread = topic_unread.gif*27*27
-img_topic_unread_mine = topic_unread_mine.gif*27*27
-img_topic_unread_hot = topic_unread_hot.gif*27*27
-img_topic_unread_hot_mine = topic_unread_hot_mine.gif*27*27
-img_topic_unread_locked = topic_unread_locked.gif*27*27
-img_topic_unread_locked_mine = topic_unread_locked_mine.gif*27*27
-
-img_sticky_read = sticky_read.gif*27*27
-img_sticky_read_mine = sticky_read_mine.gif*27*27
-img_sticky_read_locked = sticky_read_locked.gif*27*27
-img_sticky_read_locked_mine = sticky_read_locked_mine.gif*27*27
-img_sticky_unread = sticky_unread.gif*27*27
-img_sticky_unread_mine = sticky_unread_mine.gif*27*27
-img_sticky_unread_locked = sticky_unread_locked.gif*27*27
-img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*27*27
-
-img_announce_read = announce_read.gif*27*27
-img_announce_read_mine = announce_read_mine.gif*27*27
-img_announce_read_locked = announce_read_locked.gif*27*27
-img_announce_read_locked_mine = announce_read_locked_mine.gif*27*27
-img_announce_unread = announce_unread.gif*27*27
-img_announce_unread_mine = announce_unread_mine.gif*27*27
-img_announce_unread_locked = announce_unread_locked.gif*27*27
-img_announce_unread_locked_mine = announce_unread_locked_mine.gif*27*27
-
-img_global_read = announce_read.gif*27*27
-img_global_read_mine = announce_read_mine.gif*27*27
-img_global_read_locked = announce_read_locked.gif*27*27
-img_global_read_locked_mine = announce_read_locked_mine.gif*27*27
-img_global_unread = announce_unread.gif*27*27
-img_global_unread_mine = announce_unread_mine.gif*27*27
-img_global_unread_locked = announce_unread_locked.gif*27*27
-img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27
-
-img_subforum_read = subforum_read.gif*9*11
-img_subforum_unread = subforum_unread.gif*9*11
-
-img_pm_read = topic_read.gif*27*27
-img_pm_unread = topic_unread.gif*27*27
-
-img_icon_back_top = icon_back_top.gif*11*11
-
-img_icon_contact_aim = icon_contact_aim.gif*20*20
-img_icon_contact_email = icon_contact_email.gif*20*20
-img_icon_contact_icq = icon_contact_icq.gif*20*20
-img_icon_contact_jabber = icon_contact_jabber.gif*20*20
-img_icon_contact_msnm = icon_contact_msnm.gif*20*20
-
-img_icon_contact_www = icon_contact_www.gif*20*20
-img_icon_contact_yahoo = icon_contact_yahoo.gif*20*20
-
-img_icon_post_delete = icon_post_delete.gif*20*20
-
-img_icon_post_info = icon_post_info.gif*20*20
-
-img_icon_post_report = icon_post_report.gif*20*20
-img_icon_post_target = icon_post_target.gif*9*11
-img_icon_post_target_unread = icon_post_target_unread.gif*9*11
-
-img_icon_topic_attach = icon_topic_attach.gif*10*7
-img_icon_topic_latest = icon_topic_latest.gif*9*11
-img_icon_topic_newest = icon_topic_newest.gif*9*11
-img_icon_topic_reported = icon_topic_reported.gif*14*16
-img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16
-
-img_icon_user_profile = 
-
-img_icon_user_warn = icon_user_warn.gif*20*20
diff --git a/imageset/index.htm b/imageset/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/imageset/sticky_read.gif b/imageset/sticky_read.gif
deleted file mode 100644
index 6bf725cafeaf3b0c7332c9c892c9638b896bd4f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 651
zcmV;60(AXHNk%w1VH*G&0M$PL=jZ3Sxw-7@?1qMhhK7dj?(Y5l{>#hDp`oF0aB%YS
z@{o{__xJbg?CfP_Wto|ok&%&ne0=Ka>fGGi#KgpRcX!v<*wWI{`T6<v_4VcD<!o$h
z<KyJ#=jYJS(B0kL`uh5_v$L9-n#RV)!NI}3y}tAF^UKT2X=!Qj@bK5y*Zlna@$vKI
z<mQ-|nRRt_;^N}~008y%^_G^Fy}iAPii%!dUhwen;o;%m-{1TD{DFair>Cde+uQ&D
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5y|5YLQA!bRasPLe--32%J2DM`X~1J`t!uW92LRR*FCc;Uyv>y_F$T5C{sgGHxJh
z|1Jq1J{STTFo!TL0t`MlJ8WJ90fQ1P9G93J9T`3z6<#DeH$H_LF)=TxFB%#GD>4g^
zPBRa49jp#6y1J|#CO!cJP!%3NDILhk%E$#i04Pu>06qm0)~62H+13RH4HXwo6Vk@k
z=I7?!Hx*q(2|Ye6c6KE;HZJo5DLxGeDo>Jp(3!Wvh65WT=Kb;n1;GpuI#LvvNI;v0
zi77A`c+ls`I2=A0q>vb5!v+W=Q!wfm4vL5c4MLhoVZmgG6f77im@&i8f{q6<b!0F>
z;DrSl7<?#ruw#NB6*U%2!yqFB0TW3Z%-HeIkB}J^8W><uf(HWwHzF)>>UBtk6N4Bq
z(3k^S+aeKe7_b0=KnWi*2GF=GgvJ0F23$Z`TmZy^0EB-W$m@eIgb{#u42~QDu7S@6
le0)d{S;*uMWb_P>6&cI}3KS4j=vX?6h#fm-v}_Xu06T&HCBFaw

diff --git a/imageset/sticky_read_locked.gif b/imageset/sticky_read_locked.gif
deleted file mode 100644
index efd8974ee4a8fa314cca3c26e548e2d69442ca0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 646
zcmV;10(t#MNk%w1VH*G&0M$PL=H}+Pxw><6bA*J1?Ck8KqN4Ed@b2#J>FMe7^YgK>
zvAesw{r&#-_V(lB<7H)Kl9G~!hK9t%#Hy;Q;^O1i*VvbrmztWI(b3UtY;1pjfBE_O
z`T6<v_4VW9<k#2N?d|O^FE8BO-00}&#>U2sjEvOO)cpMX%gf7_mX>O2YLb$YdwYA|
z-{0}^@ojBw7#J9lk&$(Eb(ol$0002>_4SO5jH|1w^YioY@bF$<UU6}8t*xyyGc*7H
z|NsC0A^8LW002J#EC2ui02=@s000L6z@Kn994S^B*6P+GI-kNsigj6_FpG=EHiAMG
zDh24|EBhF^1?%P|Dl{U7uX7*}4z+U2#%|{XB0d`g02GE49s~_O4jKw=HVc9X9+j4r
z2pv8cEM6iJIX;8{G&C}&G5`Ps3<)uhPX!kY9SEuqGr75{060DiHc%`WJ_fwU$Onun
zP%0xn2ME%o57pJu2MizrAWkRF#nR&A;vqdDFd<KXJ}!240XjM}?*juo6BhPPk#lu+
z8RY38VQ0VuV<vbEaH1f^h7&FhNE~1dfW#0y4u}xJqlY&Y4tz9lVZZ>73>iw4bkSn~
z0uuxVcyw}O1qhKiTvR|Azy*$@jv*{q=-7kDlN1+jZs>qxfQ$+?HuRXV<AuF@Gl_7B
zk>c5g8UY4G^%2y<1RiKRdMUt-L4yDj8lZup?<&?dEKmq)&|m|D7BJEZ&g!I54h9uU
zlnB6}#tU;jB1c{b1w(`y3}!&sY=FZG32mMj_EBLo2_Fd}d<gwSgI)%(<%kf#S~Lq0
gWXd?O0jstf6&EB(xFMjAZzl-~M2Juz2kRgJI{}m-2><{9

diff --git a/imageset/sticky_read_locked_mine.gif b/imageset/sticky_read_locked_mine.gif
deleted file mode 100644
index d2aab20456af52abe3bceb48369d0bc9d4bb58f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q6Nk%w1VH*G&0M$PL+S=M}ZEa^~XY=v%mzS94=H|P*ypWKPzhrcTgoN?&
z@#p8~?Ck9B?(XX9>WM;5qN1Yp_4WP!{_*kg!JMPJySv21#Idols;a7ohlls~_u}H?
z*VovYnVHItnV6WE`T6;`eTVJs?X7Qm($do7<K!<dFMfW0{QUgdq^`!s#<f6Hj*gDY
z%gcN#IeL0}Zf<TE7#MSNa{vGU)408>tE=(k=JDCxU|?Y1-{0-y<dBe%t*xyyGc*7H
z|NsC0A^8LW002J#EC2ui02=@s000L6z@Kn9EL;w!*P)jC`JO(abU5j}I+Yfw(#af9
zkI-{UyaX;H6x1gf_(TtnPZuR$P5_B7(qJ$eAT%x`4+sb@Zc`HhIX)l^3mcLf4KyAr
zm<TC1bwmdhjt(WGq$La*A($y+QUDnfK9D6dGcvX^3KT9W2rD+7Ll7Mj5evow1j)&j
zBPccqoKr6(J_^Ry*b9Je8XaT-1wIW9<g^0k=j06%A}=CRDB#uP^!4;6Jti?GQvm?g
ze*74~frCK61PORx*nv>Wr#*fA2q1_<g`Wf%8Z02eBY~6)9YCN^(4b@jblMu2;L#vQ
z4jw(=G4i27flVIgSlCq1BY^|65)2Z=lv3k>2$};FaInQg!2p;hK74@LgU6H(9gc#C
zFd%^p4iP}~zyJdV!h}PKXgF{n+}4g^eMJ3$frnj~WPU(!CqaV&3>qX%i1FbpLcDoT
zv~Uz5tb`mf?n+K8rND^^5;(A6VSpG6d_6*k_DF_Ah6oY}Y-R!IfQ7tdEW_fEOvRoI
w0AQ0*%mxJtJpcmej{PEsnkP9jTo`UAKnDvJY6PgkJZ}UD88SeaFgyqVI|hO$v;Y7A

diff --git a/imageset/sticky_read_mine.gif b/imageset/sticky_read_mine.gif
deleted file mode 100644
index 2bef350d93ded845a83d29c05103e44f8c836c1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 659
zcmV;E0&M+9Nk%w1VH*G&0M$PL%F4>z+}vkpXQ82?mX?;Xva{yq=C!r8n3$OE?(XL1
z=Ire3hK7cqKTvRRaQ*)NhK7cakdXKH_w4NKnp<Xbb93<U@V!o9>gwv++S<g##QFL8
z*Vov4dwbH-(uOfVczAgA_4VW9<n#0M`uh69!ouO<;m^;{-^k0$%ggM{(rIaF@bK`{
zm!k6W^6}Z-{QUd?007*^%H-A8_4W0>zP?~!V2X;0_wn-f@$&WN=*)D3`uh8TfPnx1
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5w}EZXM8V0Qk9lE~1p^iF6Q$)aigg3{W4LLNO%{9ES<a$M!vDIoU^rn=Q(}K`*cl
zB^C<_4-_ASJB1Qu9u5IM8w&~|k|GH+Ef)<JEiZRd5H$}Q7?Y$fD47>3ol+V-7Cw+7
zF)<aj3?Uy4Iu{o>CR1GxA!7;x1jolNGBX<}FEwQ#Cq691V;C633EMssD`hJNJ_*<u
zvjXVo*n$%v9#R?M)aCT`>>y22j8K4pB{nt)^jpB9n}ZCVYWVQePXIt0CHjr<aRNk{
z0SHL&V6iO$0~_cRY-7RWL6<V|#7SVmu>d*-ELlkKVZa@p0TCwnkT8M;hn89eM!1-1
z;Uu0P5fJF)5yAz73LHXg@KLk}!lM~(<b1%i00SCRCm^tTln4R`6NHs0AmM?94iT=F
z9nv9%qYxuPJP6=mt`q<rEIi=AfI$f#G(PzqQUd~w2gn$>AQ9ofVj+NEaX41uL1Ji^
tf7EpYV~r2Kp)q&h!{&hj2m?|J8L$F@1`Pv1Ado#I!`L1O-jxjk06PFkE;j%G

diff --git a/imageset/sticky_unread_mine.gif b/imageset/sticky_unread_mine.gif
deleted file mode 100644
index ef27b96611748e0d9627689182d46ca6e2946f3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmV;O0%H9~Nk%w1VH*G&0M$PL_2=r%ueY;QWV}vc?(Xh?KT782=GxNOt8aOuW^n!e
z{^P*Lu1Z_mt+wmU(z|AL#fz8h?CjOT%Gk`)>Cx4{d56-z#loPc#&?A3>gvLVlKJ`i
z<KyIzPFnBS+`e#rhc7<$_4WGk^VgxP#(jzN^Yh)u%ktvn;o;%8UTv#AQSk8az<-SQ
z_xJMh^3s){+S%Xy`1#>}kN^Mx<ki>p_4W7h@}_}^xQ~|h?e3XkZ20*3zFTbl`~3g^
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5$7e9s<EbWBIv!E~1n;`3Nwh#bQJvK};Zt!7wF4R3kvo$Mz{`Hn77+i<Ezw6h+|+
z5h4);3LPK`AQ&JWJ!KON6h0df1{{<eE;KI#Dg!Sbc2f@x3OgB<rY<I%Dh?}U0Vx1J
zk{mNLJhu-vi2wsUHYigSBz<EB3^K^bB_<9rCLRrC0t-GX#n;6I+CC>LWhy5=1R3PD
z4Cm+Mf&dH?QZV4v<n#3N1U)$d5>pHgP=J5}6ew^5V1yMu*c|}XppUjd0|#0FSi;8w
z0c9Xyh|yz(HUc^#a?rM7g8~vP%E0sBqs0o37djL`@Nz{9Ztd=9_z<f_iJ%n|I&`?O
z!o|%T7%JQm@_|IG4Iy0U=y0IM1|K;{q=2#X$AJeJ!fmK=L5J0Z7*Z_kDx?Af0183`
zz|lfMz7Jg44w>d-M~DzR6nOBacZdZ6IeeH%kRX5p5f1_s782lr2n7f-BLEQN!-dH|
z4kxCN*)e3vpr<KV&Bq4?2B3vV5I|uK8xKoj3(=s0M1uw|7--Nv<N%8lDJr<@8Uz44
D31=@>

diff --git a/imageset/subforum_read.gif b/imageset/subforum_read.gif
deleted file mode 100644
index f880dbca965caf65d19519a3d51e6c19ce415cd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmZ?wbhEHb<YwSx*v!C?o}T{y|Nnpg{{8*?_vg=_U%!6+^5x6t&!6ADd-vqYlgE!A
zA3uKl*s)_kH4I>&_>+Z^fq|Dn2gC!J!N8)q!PH^p9^;JeMzv6Nj>8HJvI~W{su)`f
YWjeJP*%ldpn_|$zx;~iGREfbF0Q0an3jhEB

diff --git a/imageset/subforum_unread.gif b/imageset/subforum_unread.gif
deleted file mode 100644
index cd0c84c2137085f5836e2c174c715b79503cde00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmZ?wbhEHb<YwSx*v!DN%Etfy|NsB~{rmg(@6Vq<zkdDt<;$1PpFh8Q_wLD)CyyUL
zK7Rc8v17-8Y8b#k@h1x-0|PIE4u}UbgMmeJgQ>&HJ;oW`jcTFl9ETMcWETo?RWY^}
Y%5-WovMn<HHpQTab$u|WsS<-V0Q3tt3jhEB

diff --git a/imageset/topic_moved.gif b/imageset/topic_moved.gif
deleted file mode 100644
index f17560b61b540dadd4094fc05fcb7aeaea44da4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 693
zcmV;m0!sZyNk%w1VH*G&0M$PL)z#J5*w}@Ig?M;)?Ck8+)YSa^{O9NAzrVlp^Yh!=
z+nbx4&CSi@<K+1G`S<tte0+TB>gvM6!sh1Yjg5`S$jHUT#k;$^{{H@Sbab1WoBjR%
zk&%&da&qzU@qd4RZ*Om&o}O%MZ0YIgU0q$}<>meU{`va)prD}f@$sRdq0i6H`uqFh
z;^T^ninq77`1$$m?d{~`=JoaUrKP35zP|hW{O<1V?d|RL_4V`f^YHNSgoK1<W@i8Y
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5%IqT!YTQwXhJM&>yPvp}kgt)l2iqprX&hfD=gg&S;YdKp7Ok(#*=t(%lI7o6hD-
zFhD9%Ap#0M8#^O1EsKjXBRd-=3Lk+)D+7fO1Tqbso}MxU4n7JXZ$kqsJ`WKSC9klt
zB@+=27z_hLC>%2zI1>{j!o$GD69+LE2^?QPAcZ<32L~iP*4NY72O~N@02x0Q0y8!^
zBj?rD=j-evF$M_&2n#emIRp{;>DKxE{sa$9Xjt$;f)5>d@Khsk4Ns4U2?=zoAs_>Q
zgE%tcsFv}X#*a9<UFs0v;Ej_fd7xBz<6#e!dVB=vVA0-=n>cgo%$dW-CAa}KR;3u4
z!lhB8L{mKQL2-cw6EJj0ol3PTRTu&ni0hSO>d~)Lb8Lu*z*(UaInt_K%Qo!^Z{Va*
zFazVkgRge;+J(`F87c-QHq_NiI4_J1HW)x4Qs9{n6D(jzo=h1A3k;-0oEoCyg8~yi
z46rysy7UPa1`H{HQ0a*Z5Dd&1+F+peh7D&tR1nb`N&yHI0C)h6#?TrH5H`a>k>P`e
b7Zn0j*a9I#Z#YGcK<EI$MF=Ngf&c(J5Q<N&

diff --git a/imageset/topic_read.gif b/imageset/topic_read.gif
deleted file mode 100644
index b00a64918af88136c5e79851b531ab59c223ae83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 679
zcmV;Y0$BY=Nk%w1VH*G&0M$PL)z#J5*w}@Ig?M;))YR1c{QT_f?C$RF=jZ3YzrXbK
z^xNCpo12@>&CTQE<oNjc_xJaFe0;*f!i|lM$jHdW#l`04=KlWvbaZr^o16Xp{*jT9
za&mI<@$r9ue{XMZo}QlR>FI22Y~|(U{r>*>`udrfnRRt_prD}f@$sRdq5Av#;^O1a
z&(F8Fw~C62`1$$!`~2<g?d0U<ySux-zP_cUrS<jo>FMd}>gx0J^YHNS?d|RV|NmxY
zX5Zi6A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5$_mUIWhH#i$UU&>xE9vAJ4-mMi1IprTL0U=vXE&S+8xFc}cQQcTOd(j5%=gD%!n
zG(IX(AOZ_L8ap^MEQ^aXI6E373m$<)EdzxR1~U$wo}M!X4?PPXZ$kquJrE%lBd@Tr
zBNjOi7YzeLC>shIJQfxw!o$MAzz8xI3L9TPAB8$N2nZ(C*45M5I66H57(X-u5HUPB
z=I7|?<}w8e0tpN@JvRn9_V@Vt_686n84MmI^w5C^kB@^06Z$A<fLjd#7yu09L9wF6
zix#<E;t*iqfsY3iiUg^rM*t2H=j~X@vZc$GH+ozWP-9h!n<+#p#F+v@kE(|ZGLV3w
zqo~oNNRPts#~>U84L6MHOlb6m26qXZ6)JI~tJkk!yO!woP09o_Fd#q>skW_J7=4(b
zYCu9mTDN%H!q5<-K?EWMp7kKH0*2wkh+(X_KuW}^Au2p9Akm}1iV~PJmsnB2(1Hk+
zo~ZcHz>Fac1yXC!aHazV5uu?Fh%f;_2g+y+t(g$vF&q>aJY;Y|ApnIf5irDtQ{+el
N4iR2}Z~`U>06QQ@NM`^5

diff --git a/imageset/topic_read_locked_mine.gif b/imageset/topic_read_locked_mine.gif
deleted file mode 100644
index cf1323ae238be1ec56f49da3a1b4005047321a4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 749
zcmV<J0uud4Nk%w1VH*G&0M$PL<KyLWa&qS8=BTKte}I6|(b2=h!~OmJp`oGL+S=6A
z)a&c(b#--`nwz(`x0{=r?(XjM^YfrTQ2F}$#>U3;^Yiuf_2S~<_V)JE)6<$;W`%`?
zy-s0}kdX25^M)}$>FMdr%*^%X=<Mw5FfcIO+}wG2dEdy(@bK`=%*@{2-t_eJ+1c6b
z%+k}BqS)Bje}8}R+1-nai`>S_<ki>u`}_Ct^1Z#i_VM!W?(U9{kLBg%%yfhI_xS(+
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5ywPWTt>g_Am@RJ`ZvFLj+(5M<Ee%JYWHbVD^~_1XP8olZg1<@Iz!r!;xDy+K6Z^
zxN9B|3xg09H9i_2i9CuuLkJrQJ_jfu02h~;AS*O391<KZF?&BDCXzi10IRI602U{p
z94(|jCIvn{AOZlqzP-HyD<2Xf92__oRUHurBWKX77t^Z(6*DwGCov&H0g@iO(In*L
zC71#^IZz1!KQ|i~H6tMPy95LS`uHpt0`)oMY%qerhlN211>{3GfItQn0uW+2@ZbxD
zC?hgv6hLACLlP+<YOLS`UI1JkG;Sn803iX8B?OE-P#}q<3J`Ka7%_mHzVMzT8nBR=
zlVrP-K31Suief}ZeE1kNAdvyUh@}>2n%Ho|2L`51JN|4ymg<G8C@_@VQ1QTo3LfG*
zZAgHDT^(jec&IRe;sbaSF;p0wqa#@zi1Aj<Q6X!Dfj_?am|&r@2L|ObGk75Yg@p+|
z3b<S5W&#EbDKD_d@FIij7bWz9j?e+Y5ECH|xb0yfr8sCH^!CtgiiiTq2Ws@-y<%|l
z3M)Pz@X=1e6a+95Oiw<cyY~q-wkI%Qn~IeXZYJqoKix+J3IWPf`JtwRpZ0Mg6p#VK
f`g}fDJm5eG2~gk#81nr$g%L<x!Gsh41pxp%p*LA8

diff --git a/imageset/topic_read_mine.gif b/imageset/topic_read_mine.gif
deleted file mode 100644
index 207bae814dcc3d9a8facbdf26c6a2287cff5e88e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmV;o0!aNwNk%w1VH*G&0M$PL`1$$w_xIY`+U4ctx3{;Oo163V^PoRaprD|}#>VOC
z>Bh#!kdTno)zz9?W`%`?<KyMMPGNX>c+}L?{QUfeF+ab*zv}7j?(Xi)%*=dzeBa2+
zbaZt7{{G?N;qmeD{r&yy%+hjla({n+(2JLEZ*TPU^zqr<Y;0`({{ESnnRRt_;^O1a
z&(DjCi`>S_^78WJ)z|v_`~Cg>_VMzirKP>Sz4!6*yu7^a?d|pT_4D)d@bK{e|NmxY
zX5Zi6A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5!8PToRGQRag+8&>uoHsu5a^7NIcWAfnHSgds5W&ghh(!H`VAQclY(gJCXs%ud!b
zWJ+I92oC~1AUp~XEQ^Z}3IJyUBY{O49z6jU5SyHv3KuUGFFhV5Z$lC-m<j`}uB|*V
zG@&6kF&+{_2n+@tIjt+f!YdFC6~-jTG7Nzwg)poND$~>|I58v<2N5JEJq;W`HV*+Z
zIST0M>Iym=+Yuo;6b26#1vNc77whX6G{+|*M7R+kMFB1edhE!-Fo%za5Fg@r5rW2s
z69G*07{{T3!iFG2=J)_32aFFncJyeGq|gowFfl}&`7kC1jRHh;%*Ugr&$^#Lf9hB%
z;eicIACi8cIaBF}02?11OaZ{ej;mO+YQ1U#fWZRe0?g21qAb&hWliV+LC?YuXFUMu
zm`k^=-MNs!3E5=^K!5-={|f#K$pAA{8B&1oJGil603c>$&_HAY+!QhZXx_{jfQ$}3
z1fV#jYlMIlJt$=E?3qH383Hs=B7&eq1~Z00P}mIu#2Et#P|OZ9rhx&}XkM>zp@B3U
d1RO>bAdsO!f-M@nz=>jnxd;tRoPY@e06W9}Lumj2

diff --git a/imageset/topic_unread.gif b/imageset/topic_unread.gif
deleted file mode 100644
index 23f127ef3822e5bda8961e62336678767332c589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 678
zcmV;X0$Ke>Nk%w1VH*G&0M$PL=g7_D!N=RIwZey!vr=Q&&DGDZxcvP5?Ck8WMp*9d
z?!a(<wp(lG=jZwF@zc7)uuWdTfQ|a{^W)>>`1twv_xHPIb>`;g{{H^BVQ|NOivIll
z>FMd^<>mhU{`va);eL?4T5R$0@xzIh>(JHW;^X@J``4nZ{r&yAYkBwX@A&!o>dn&o
z`~1y|m+kHC<mBe!y~E+RzPMv@>(A8f)!DOFX7%;;>FMd}>gx0J^YHNS?d|QZOI`o}
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5#KKQiL8M6?qV!(BB}zaGe6Iz)8b^45H5hVZl=Q&S;Mcupkt`Qb<7JGwBqFyh7LV
zIbsPTQ3Dw@J}5glFeQwPFgQCX9wZEcL=QHG6$mgBo}ZsE2oydf32#FL0X`KR7ag#%
zvK<#W6c{lCLjwyEC_EPzA;ZMO!NCnL7!C`T2{b-BI1LRT*4Nh5+BiBs01!V077{Hy
zIOpi;>gO*94jBd!E<QI1IrsSa`u7MG9vTrC$cUCFPmhBL6ZR;Gpqqdh5CBBuL9wF6
zix#^DAdrAXGzB0PC>$Abj}I0JBGTKzvZc$HE^qkQm_Yz55jaJRRG3pl1*snoBWUoj
zLWj|#NRuL6@h^fnUpJ2KOnCGLigyNnJoEA4hS#rP!+QPT4V;t(4t%VrP+=t7w`^DV
zX*R@03=b&Q!rl9J1&R$ZY!E4sfP@bWCRQk3%y@+f45dyz8Nq;r2OkGaeAvwSgNXw^
zHqfwPX>x)XX%C?|z#0XLGb&^Rf>Xf80sty5qY1qx1p`!Y;xN!~A_f2%Te_4EUgU_4
M9t@Z`0TToOJMOGTMF0Q*

diff --git a/imageset/topic_unread_mine.gif b/imageset/topic_unread_mine.gif
deleted file mode 100644
index 8f8ab645d2334322dd343b12ae589692c64de8be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdsnNk%w1VH*G&0M$PL`1$$c!N=w0<<+05#fp~Cueh*GUAt*`_2%g5>FMjw
z)aS^}?99@dTV}3BSJlGG+pDy~h?KKZW7y5r@Y&t`{QQeBK>6|Wz;J%HTWjm<?D+2R
z(Ye9*_xJAZ?!bYK<KyK1{{G#@%JK2>xMFd~ev1D5{q*$oy;^MHevtnC{^H`}{r&y&
z^77=>*ZTYW_wn-Kx4yhiVePQH!&`04bc3=_VY60dgE>X*?d|pT_4D)d@bK`iOI`o}
z|KH!=A^sLTLr+jyJ~A*cH6U<ka6&>LM{;j<Z~!6s1OWg5KL9KM0000R02=@R2LHgH
za5&_A4mN}2@Zk`j&|k!nAq*Caz@U^dM551$1f$sa&S=$UfsstWQbXY4d$l~8yl40F
zZ2}GiQ4u5xJ}f*5AS;ZFAPE3IAqrJb4-ynU9U1~4o}Z5zA{Gxm6b^4g5&@bC0<W;I
zJT5Q~77Q>h6cR%b7#A!#uPDUDC=?AA$u-I*7+*gQhAplMDc9I3GcE%%4l)Co3kE+0
zBo`Gq3G3|b2`8i83py1SBn2M?J~|ri?iw&~^gtkk28<3WN_@x=!^e(1d3s2kC=r4P
z20BDg&~d^C1QG@oILtw^q{)&kTI6UkBF7FN0VGIs=%J<uiZ~_O^w3d(gTs*fcnBRz
zv?x&>FeQ+HplO8D5jk-_9nrxfi4P@I064LutJkk!yPg1$@PoMvAvm5m5tZWF6FOMf
zD-g{P03CSq>fMVs(l{Z$%mC=nAt&L(gd=TurYe967K0H>J`8|`i2yf<Oqdzs1%S_>
zLj!mb!iUdPLkMJ0pu$H5&!R_H@L@v14QNjYI0#_o5Q_@HS+F>>A%+9oP{d$Zu%R^?
m+G`GEKn*8?fea-E#9$C(O9mUr;S@P?qeq4V5uAVt0suR2NJvEh

diff --git a/style.cfg b/style.cfg
index 8fd0767..4a28ad6 100644
--- a/style.cfg
+++ b/style.cfg
@@ -1,22 +1,32 @@
 #
 # phpBB Style Configuration File
 #
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+# This file is part of the phpBB Forum Software package.
 #
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
 #
 # At the left is the name, please do not change this
 # At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
 #
 # Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
+# the value, then enclose the value with single or double quotes.
 # Single and double quotes do not need to be escaped.
 #
-# 
+#
 
 # General Information about this style
-name = debianforum.de
-copyright = &copy; 2008 Timo Salmen for debianforum.de
-version = 1.0.1
\ No newline at end of file
+name = debianforumde
+copyright = based on gplv2-ed "© phpBB Limited, 2007" - with additions by dfde: patched colors to match debians ci
+style_version = 3.2.0
+phpbb_version = 3.2.0
+
+# Defining a different template bitfield
+# template_bitfield = lNg=
+
+# Parent style
+# Set value to empty or to this style's name if this style does not have a parent style
+parent = prosilver
diff --git a/template/ajax.js b/template/ajax.js
new file mode 100644
index 0000000..1bb3aab
--- /dev/null
+++ b/template/ajax.js
@@ -0,0 +1,394 @@
+/* global phpbb */
+
+(function($) {  // Avoid conflicts with other libraries
+
+'use strict';
+
+// This callback will mark all forum icons read
+phpbb.addAjaxCallback('mark_forums_read', function(res) {
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
+		forum_unread: 'forum_read',
+		forum_unread_subforum: 'forum_read_subforum',
+		forum_unread_locked: 'forum_read_locked'
+	};
+
+	$('li.row').find('dl[class*="forum_unread"]').each(function() {
+		var $this = $(this);
+
+		$.each(iconsArray, function(unreadClass, readClass) {
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
+			}
+		});
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
+	});
+
+	// Mark subforums read
+	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
+
+	// Mark topics read if we are watching a category and showing active topics
+	if ($('#active_topics').length) {
+		phpbb.ajaxCallbacks.mark_topics_read.call(this, res, false);
+	}
+
+	// Update mark forums read links
+	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
+
+	phpbb.closeDarkenWrapper(3000);
+});
+
+/**
+* This callback will mark all topic icons read
+*
+* @param {bool} [update_topic_links=true] Whether "Mark topics read" links
+* 	should be updated. Defaults to true.
+*/
+phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
+		global_unread: 'global_read',
+		announce_unread: 'announce_read',
+		sticky_unread: 'sticky_read',
+		topic_unread: 'topic_read'
+	};
+	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unreadClassSelectors;
+	var classMap = {};
+	var classNames = [];
+
+	if (typeof updateTopicLinks === 'undefined') {
+		updateTopicLinks = true;
+	}
+
+	$.each(iconsArray, function(unreadClass, readClass) {
+		$.each(iconsState, function(key, value) {
+			// Only topics can be hot
+			if ((value === '_hot' || value === '_hot_mine') && unreadClass !== 'topic_unread') {
+				return true;
+			}
+			classMap[unreadClass + value] = readClass + value;
+			classNames.push(unreadClass + value);
+		});
+	});
+
+	unreadClassSelectors = '.' + classNames.join(',.');
+
+	$('li.row').find(unreadClassSelectors).each(function() {
+		var $this = $(this);
+		$.each(classMap, function(unreadClass, readClass) {
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
+			}
+		});
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
+	});
+
+	// Remove link to first unread post
+	$('a.unread').has('.icon-red').remove();
+
+	// Update mark topics read links
+	if (updateTopicLinks) {
+		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
+	}
+
+	phpbb.closeDarkenWrapper(3000);
+});
+
+// This callback will mark all notifications read
+phpbb.addAjaxCallback('notification.mark_all_read', function(res) {
+	if (typeof res.success !== 'undefined') {
+		phpbb.markNotifications($('#notification_list li.bg2'), 0);
+		phpbb.closeDarkenWrapper(3000);
+	}
+});
+
+// This callback will mark a notification read
+phpbb.addAjaxCallback('notification.mark_read', function(res) {
+	if (typeof res.success !== 'undefined') {
+		var unreadCount = Number($('#notification_list_button strong').html()) - 1;
+		phpbb.markNotifications($(this).parent('li.bg2'), unreadCount);
+	}
+});
+
+/**
+ * Mark notification popup rows as read.
+ *
+ * @param {jQuery} $popup jQuery object(s) to mark read.
+ * @param {int} unreadCount The new unread notifications count.
+ */
+phpbb.markNotifications = function($popup, unreadCount) {
+	// Remove the unread status.
+	$popup.removeClass('bg2');
+	$popup.find('a.mark_read').remove();
+
+	// Update the notification link to the real URL.
+	$popup.each(function() {
+		var link = $(this).find('a');
+		link.attr('href', link.attr('data-real-url'));
+	});
+
+	// Update the unread count.
+	$('strong', '#notification_list_button').html(unreadCount);
+	// Remove the Mark all read link and hide notification count if there are no unread notifications.
+	if (!unreadCount) {
+		$('#mark_all_notifications').remove();
+		$('#notification_list_button > strong').addClass('hidden');
+	}
+
+	// Update page title
+	var $title = $('title');
+	var originalTitle = $title.text().replace(/(\((\d+)\))/, '');
+	$title.text((unreadCount ? '(' + unreadCount + ')' : '') + originalTitle);
+};
+
+// This callback finds the post from the delete link, and removes it.
+phpbb.addAjaxCallback('post_delete', function() {
+	var $this = $(this),
+		postId;
+
+	if ($this.attr('data-refresh') === undefined) {
+		postId = $this[0].href.split('&p=')[1];
+		var post = $this.parents('#p' + postId).css('pointer-events', 'none');
+		if (post.hasClass('bg1') || post.hasClass('bg2')) {
+			var posts1 = post.nextAll('.bg1');
+			post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
+			posts1.removeClass('bg1').addClass('bg2');
+		}
+		post.fadeOut(function() {
+			$(this).remove();
+		});
+	}
+});
+
+// This callback removes the approve / disapprove div or link.
+phpbb.addAjaxCallback('post_visibility', function(res) {
+	var remove = (res.visible) ? $(this) : $(this).parents('.post');
+	$(remove).css('pointer-events', 'none').fadeOut(function() {
+		$(this).remove();
+	});
+
+	if (res.visible) {
+		// Remove the "Deleted by" message from the post on restoring.
+		remove.parents('.post').find('.post_deleted_msg').css('pointer-events', 'none').fadeOut(function() {
+			$(this).remove();
+		});
+	}
+});
+
+// This removes the parent row of the link or form that fired the callback.
+phpbb.addAjaxCallback('row_delete', function() {
+	$(this).parents('tr').remove();
+});
+
+// This handles friend / foe additions removals.
+phpbb.addAjaxCallback('zebra', function(res) {
+	var zebra;
+
+	if (res.success) {
+		zebra = $('.zebra');
+		zebra.first().html(res.MESSAGE_TEXT);
+		zebra.not(':first').html('&nbsp;').prev().html('&nbsp;');
+	}
+});
+
+/**
+ * This callback updates the poll results after voting.
+ */
+phpbb.addAjaxCallback('vote_poll', function(res) {
+	if (typeof res.success !== 'undefined') {
+		var poll = $('.topic_poll');
+		var panel = poll.find('.panel');
+		var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible');
+		var mostVotes = 0;
+
+		// Set min-height to prevent the page from jumping when the content changes
+		var updatePanelHeight = function (height) {
+			height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
+			panel.css('min-height', height);
+		};
+		updatePanelHeight();
+
+		// Remove the View results link
+		if (!resultsVisible) {
+			poll.find('.poll_view_results').hide(500);
+		}
+
+		if (!res.can_vote) {
+			poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function () {
+				poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
+			});
+		} else {
+			// If the user can still vote, simply slide down the results
+			poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
+		}
+
+		// Get the votes count of the highest poll option
+		poll.find('[data-poll-option-id]').each(function() {
+			var option = $(this);
+			var optionId = option.attr('data-poll-option-id');
+			mostVotes = (res.vote_counts[optionId] >= mostVotes) ? res.vote_counts[optionId] : mostVotes;
+		});
+
+		// Update the total votes count
+		poll.find('.poll_total_vote_cnt').html(res.total_votes);
+
+		// Update each option
+		poll.find('[data-poll-option-id]').each(function() {
+			var $this = $(this);
+			var optionId = $this.attr('data-poll-option-id');
+			var voted = (typeof res.user_votes[optionId] !== 'undefined');
+			var mostVoted = (res.vote_counts[optionId] === mostVotes);
+			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100);
+			var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100);
+			var altText;
+
+			altText = $this.attr('data-alt-text');
+			if (voted) {
+				$this.attr('title', $.trim(altText));
+			} else {
+				$this.attr('title', '');
+			};
+			$this.toggleClass('voted', voted);
+			$this.toggleClass('most-votes', mostVoted);
+
+			// Update the bars
+			var bar = $this.find('.resultbar div');
+			var barTimeLapse = (res.can_vote) ? 500 : 1500;
+			var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
+
+			setTimeout(function () {
+				bar.animate({ width: percentRel + '%' }, 500)
+					.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5')
+					.addClass(newBarClass)
+					.html(res.vote_counts[optionId]);
+
+				var percentText = percent ? percent + '%' : res.NO_VOTES;
+				$this.find('.poll_option_percent').html(percentText);
+			}, barTimeLapse);
+		});
+
+		if (!res.can_vote) {
+			poll.find('.polls').delay(400).fadeIn(500);
+		}
+
+		// Display "Your vote has been cast." message. Disappears after 5 seconds.
+		var confirmationDelay = (res.can_vote) ? 300 : 900;
+		poll.find('.vote-submitted').delay(confirmationDelay).slideDown(200, function() {
+			if (resultsVisible) {
+				updatePanelHeight();
+			}
+
+			$(this).delay(5000).fadeOut(500, function() {
+				resizePanel(300);
+			});
+		});
+
+		// Remove the gap resulting from removing options
+		setTimeout(function() {
+			resizePanel(500);
+		}, 1500);
+
+		var resizePanel = function (time) {
+			var panelHeight = panel.height();
+			var innerHeight = panel.find('.inner').outerHeight();
+
+			if (panelHeight !== innerHeight) {
+				panel.css({ minHeight: '', height: panelHeight })
+					.animate({ height: innerHeight }, time, function () {
+						panel.css({ minHeight: innerHeight, height: '' });
+					});
+			}
+		};
+	}
+});
+
+/**
+ * Show poll results when clicking View results link.
+ */
+$('.poll_view_results a').click(function(e) {
+	// Do not follow the link
+	e.preventDefault();
+
+	var $poll = $(this).parents('.topic_poll');
+
+	$poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
+	$poll.find('.poll_view_results').hide(500);
+});
+
+$('[data-ajax]').each(function() {
+	var $this = $(this);
+	var ajax = $this.attr('data-ajax');
+	var filter = $this.attr('data-filter');
+
+	if (ajax !== 'false') {
+		var fn = (ajax !== 'true') ? ajax : null;
+		filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null;
+
+		phpbb.ajaxify({
+			selector: this,
+			refresh: $this.attr('data-refresh') !== undefined,
+			filter: filter,
+			callback: fn
+		});
+	}
+});
+
+
+/**
+ * This simply appends #preview to the action of the
+ * QR action when you click the Full Editor & Preview button
+ */
+$('#qr_full_editor').click(function() {
+	$('#qr_postform').attr('action', function(i, val) {
+		return val + '#preview';
+	});
+});
+
+
+/**
+ * Make the display post links to use JS
+ */
+$('.display_post').click(function(e) {
+	// Do not follow the link
+	e.preventDefault();
+
+	var postId = $(this).attr('data-post-id');
+	$('#post_content' + postId).show();
+	$('#profile' + postId).show();
+	$('#post_hidden' + postId).hide();
+});
+
+/**
+* Toggle the member search panel in memberlist.php.
+*
+* If user returns to search page after viewing results the search panel is automatically displayed.
+* In any case the link will toggle the display status of the search panel and link text will be
+* appropriately changed based on the status of the search panel.
+*/
+$('#member_search').click(function () {
+	var $memberlistSearch = $('#memberlist_search');
+
+	$memberlistSearch.slideToggle('fast');
+	phpbb.ajaxCallbacks.alt_text.call(this);
+
+	// Focus on the username textbox if it's available and displayed
+	if ($memberlistSearch.is(':visible')) {
+		$('#username').focus();
+	}
+	return false;
+});
+
+/**
+* Automatically resize textarea
+*/
+$(function() {
+	var $textarea = $('textarea:not(#message-box textarea, .no-auto-resize)');
+	phpbb.resizeTextArea($textarea, { minHeight: 75, maxHeight: 250 });
+	phpbb.resizeTextArea($('textarea', '#message-box'));
+});
+
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/template/attachment.html b/template/attachment.html
index 7472aba..0978d91 100644
--- a/template/attachment.html
+++ b/template/attachment.html
@@ -1,20 +1,21 @@
+<!-- EVENT attachment_file_before -->
 
 <!-- BEGIN _file -->
 	<!-- IF _file.S_DENIED -->
 	<p>[{_file.DENIED_MESSAGE}]</p>
 	<!-- ELSE -->
+		<!-- EVENT attachment_file_prepend -->
 
 		<!-- IF _file.S_THUMBNAIL -->
 		<dl class="thumbnail">
-			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
+			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
 			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->
 		</dl>
 		<!-- ENDIF -->
 
-
 		<!-- IF _file.S_IMAGE -->
 		<dl class="file">
-			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
+			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
 			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
 			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
 		</dl>
@@ -28,95 +29,20 @@
 		</dl>
 		<!-- ENDIF -->
 
-
-
-		<!-- IF _file.S_WM_FILE -->
-			<!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix -->
-			<object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}">
-				<param name="url" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="showcontrols" value="1" />
-				<param name="showdisplay" value="0" />
-				<param name="showstatusbar" value="0" />
-				<param name="autosize" value="1" />
-				<param name="autostart" value="0" />
-				<param name="visible" value="1" />
-				<param name="animationstart" value="0" />
-				<param name="loop" value="0" />
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<!--[if !IE]>-->
-					<object width="320" height="285" type="video/x-ms-wmv" data="{_file.U_DOWNLOAD_LINK}">
-						<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-						<param name="controller" value="1" />
-						<param name="showcontrols" value="1" />
-						<param name="showdisplay" value="0" />
-						<param name="showstatusbar" value="0" />
-						<param name="autosize" value="1" />
-						<param name="autostart" value="0" />
-						<param name="visible" value="1" />
-						<param name="animationstart" value="0" />
-						<param name="loop" value="0" />
-					</object>
-				<!--<![endif]-->
-			</object>
-
-		<!-- ELSEIF _file.S_FLASH_FILE -->
+		<!-- IF _file.S_FLASH_FILE -->
 			<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{_file.WIDTH}" height="{_file.HEIGHT}">
-				<param name="movie" value="{_file.U_DOWNLOAD_LINK}" />
+				<param name="movie" value="{_file.U_VIEW_LINK}" />
 				<param name="play" value="true" />
 				<param name="loop" value="true" />
 				<param name="quality" value="high" />
 				<param name="allowScriptAccess" value="never" />
 				<param name="allowNetworking" value="internal" />
-				<embed src="{_file.U_DOWNLOAD_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
-			</object>
-		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="0" height="16">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="controller" value="true" />
-				<param name="autoplay" value="false" />
-				<param name="type" value="video/quicktime" />
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="0" height="16" type="video/quicktime" autoplay="false"></embed>
-			</object>
-		<!-- ELSEIF _file.S_RM_FILE -->
-			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="autostart" value="false" />
-				<param name="controls" value="ImageWindow" />
-				<param name="console" value="ctrls_{_file.ATTACH_ID}" />
-				<param name="prefetch" value="false" />
-				<embed name="rmstream_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" src="{_file.U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="ctrls_{_file.ATTACH_ID}" prefetch="false"></embed>
+				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
 			</object>
-			<br />
-			<object id="ctrls_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36">
-				<param name="controls" value="ControlPanel" />
-				<param name="console" value="ctrls_{_file.ATTACH_ID}" />
-				<embed name="ctrls_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" width="200" height="36" controls="ControlPanel" console="ctrls_{_file.ATTACH_ID}"></embed>
-			</object>
-
-			<script type="text/javascript">
-			// <![CDATA[
-				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
-				{
-					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
-					{
-					}
-
-					var width = document.rmstream_{_file.ATTACH_ID}.GetClipWidth();
-					var height = document.rmstream_{_file.ATTACH_ID}.GetClipHeight();
-
-					document.rmstream_{_file.ATTACH_ID}.width = width;
-					document.rmstream_{_file.ATTACH_ID}.height = height;
-					document.ctrls_{_file.ATTACH_ID}.width = width;
-				}
-			// ]]>
-			</script>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
-			<p>
-			<!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
-			<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
+			<p><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
 		<!-- ENDIF -->
 
+		<!-- EVENT attachment_file_append -->
 	<!-- ENDIF -->
 <!-- END _file -->
+<!-- EVENT attachment_file_after -->
diff --git a/template/bbcode.html b/template/bbcode.html
index f792436..8c4e941 100644
--- a/template/bbcode.html
+++ b/template/bbcode.html
@@ -8,12 +8,47 @@
 <!-- BEGIN listitem --><li><!-- END listitem -->
 <!-- BEGIN listitem_close --></li><!-- END listitem_close -->
 
-<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}:</cite><!-- END quote_username_open -->
+<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}{L_COLON}</cite><!-- END quote_username_open -->
 <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->
 <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close -->
+<!-- BEGIN quote_extended -->
+<blockquote>
+	<xsl:if test="not(@author)">
+		<xsl:attribute name="class">uncited</xsl:attribute>
+	</xsl:if>
+	<div>
+		<xsl:if test="@author">
+			<cite>
+				<xsl:choose>
+					<xsl:when test="@url">
+						<a href="{@url}" class="postlink"><xsl:value-of select="@author"/></a>
+					</xsl:when>
+					<xsl:when test="@profile_url">
+						<a href="{@profile_url}"><xsl:value-of select="@author"/></a>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="@author"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="$L_WROTE"/>
+				<xsl:value-of select="$L_COLON"/>
+				<xsl:if test="@post_url">
+					<xsl:text> </xsl:text>
+					<a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
+				</xsl:if>
+				<xsl:if test="@date">
+					<div class="responsive-hide"><xsl:value-of select="@date"/></div>
+				</xsl:if>
+			</cite>
+		</xsl:if>
+		<xsl:apply-templates/>
+	</div>
+</blockquote>
+<!-- END quote_extended -->
 
-<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open -->
-<!-- BEGIN code_close --></code></dd></dl><!-- END code_close -->
+<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><pre><code><!-- END code_open -->
+<!-- BEGIN code_close --></code></pre></div><!-- END code_close -->
 
 <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
 <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
@@ -31,10 +66,10 @@
 
 <!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: 116%;">{TEXT}</span><!-- END size -->
 
-<!-- BEGIN img --><img src="{URL}" alt="{L_IMAGE}" /><!-- END img -->
+<!-- BEGIN img --><img src="{URL}" class="postimage" alt="{L_IMAGE}" /><!-- END img -->
 
-<!-- BEGIN url --><a href="{URL}" class="postlink" rel="nofollow">{DESCRIPTION}</a><!-- END url -->
+<!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url -->
 
 <!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email -->
 
-<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash -->
\ No newline at end of file
+<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash -->
diff --git a/template/breadcrumbs.html b/template/breadcrumbs.html
deleted file mode 100644
index ad18025..0000000
--- a/template/breadcrumbs.html
+++ /dev/null
@@ -1,8 +0,0 @@
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
-	<tr>
-		<td class="row1">
-			<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
-			<p class="datetime">{S_TIMEZONE}</p>
-		</td>
-	</tr>
-	</table>
\ No newline at end of file
diff --git a/template/captcha_default.html b/template/captcha_default.html
index bccf231..02899bc 100644
--- a/template/captcha_default.html
+++ b/template/captcha_default.html
@@ -1,16 +1,16 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+<div class="panel captcha-panel">
+	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
 <!-- ENDIF -->
 
 	<dl>
-		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
-		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
+		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>
+		<dd class="captcha captcha-image"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
 		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
 		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
 		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
@@ -19,6 +19,6 @@
 
 <!-- IF S_TYPE == 1 -->
 	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- ENDIF -->
diff --git a/template/captcha_qa.html b/template/captcha_qa.html
index 0b18ada..b8c6678 100644
--- a/template/captcha_qa.html
+++ b/template/captcha_qa.html
@@ -1,14 +1,14 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+<div class="panel captcha-panel">
+	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<fieldset class="fields2">
 <!-- ENDIF -->
 
 	<dl>
-	<dt><label>{QA_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
-	<dd>
+	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+	<dd class="captcha">
 		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
 		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
 	</dd>
@@ -16,6 +16,6 @@
 
 <!-- IF S_TYPE == 1 -->
 	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- ENDIF -->
diff --git a/template/captcha_recaptcha.html b/template/captcha_recaptcha.html
index cc4db0b..a123f54 100644
--- a/template/captcha_recaptcha.html
+++ b/template/captcha_recaptcha.html
@@ -1,8 +1,8 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+<div class="panel captcha-panel">
+	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
@@ -10,32 +10,13 @@
 
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
-	<dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
-	<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-		var RecaptchaOptions = {
-			lang : '{L_RECAPTCHA_LANG}',
-			tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->
-		};
-		// ]]>
-		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
-		<script type="text/javascript">
-		// <![CDATA[
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			document.getElementById('recaptcha_table').style.direction = 'ltr';
-		<!-- ENDIF -->
-		// ]]>
-		</script>
+	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
+	<dd class="captcha">
 		<noscript>
-		<div>
-			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
-			<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-			<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-		</div>
+			<div>{L_RECAPTCHA_NOSCRIPT}</div>
 		</noscript>
-
+		<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
+		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-tabindex="<!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->"></div>
 	</dd>
 	</dl>
 <!-- ELSE -->
@@ -44,6 +25,6 @@
 
 <!-- IF S_TYPE == 1 -->
 	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- ENDIF -->
diff --git a/template/captcha_simplemath.html b/template/captcha_simplemath.html
deleted file mode 100644
index 1a7d3cd..0000000
--- a/template/captcha_simplemath.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- IF S_TYPE == 1 -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_CONFIRMATION}</h3>
-	<fieldset class="fields2">
-<!-- ENDIF -->
-
-	<dl>
-	<dt><label for="confirm_code">{SIMPLEMATH_TEMPLATE}</label></dt>
-	<dd>
-		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="confirm_code" id="confirm_code" size="25" class="inputbox autowidth" title="{L_ANSWER}" />
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
-		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
-	</dd>
-	<dd>{L_SIMPLEMATH_EXPLAIN}</dd>
-	</dl>
-
-<!-- IF S_TYPE == 1 -->
-	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
diff --git a/template/confirm_body.html b/template/confirm_body.html
index cddbdee..aaea5cf 100644
--- a/template/confirm_body.html
+++ b/template/confirm_body.html
@@ -1,15 +1,28 @@
+<!-- IF S_AJAX_REQUEST -->
+	<form action="{S_CONFIRM_ACTION}" method="post">
+		<h3>{MESSAGE_TITLE}</h3>
+		<p>{MESSAGE_TEXT}</p>
+
+		<fieldset class="submit-buttons">
+			<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		</fieldset>
+	</form>
+
+<!-- ELSE -->
+
 <!-- INCLUDE overall_header.html -->
 
 <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
 <div class="panel">
 	<div class="inner">
 
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
-	
+
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
 		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 	</fieldset>
 
@@ -18,3 +31,5 @@
 </form>
 
 <!-- INCLUDE overall_footer.html -->
+
+<!-- ENDIF -->
diff --git a/template/confirm_delete_body.html b/template/confirm_delete_body.html
new file mode 100644
index 0000000..9897496
--- /dev/null
+++ b/template/confirm_delete_body.html
@@ -0,0 +1,70 @@
+<!-- IF S_AJAX_REQUEST -->
+	<form action="{S_CONFIRM_ACTION}" method="post">
+		<p>{MESSAGE_TEXT}</p>
+
+		<!-- IF not S_SHADOW_TOPICS -->
+		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+			<label>
+				<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
+				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+				<!-- IF S_TOPIC_MODE -->{DELETE_TOPIC_PERMANENTLY_EXPLAIN}<!-- ELSE -->{DELETE_POST_PERMANENTLY_EXPLAIN}<!-- ENDIF -->
+			</label>
+		<!-- ENDIF -->
+
+		<label for="delete_reason">
+			<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
+			<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+		</label>
+		<!-- ENDIF -->
+
+		<fieldset class="submit-buttons">
+			<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		</fieldset>
+	</form>
+
+<!-- ELSE -->
+
+<!-- INCLUDE overall_header.html -->
+
+<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
+<div class="panel">
+	<div class="inner">
+
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
+
+	<p>{MESSAGE_TEXT}</p>
+
+	<!-- IF not S_SHADOW_TOPICS -->
+	<fieldset class="fields1">
+		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+			<dl>
+				<dt><label for="delete_permanent">{L_DELETE_PERMANENTLY}{L_COLON}</label></dt>
+				<dd>
+					<label for="delete_permanent">
+						<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+						<!-- IF S_TOPIC_MODE -->{DELETE_TOPIC_PERMANENTLY_EXPLAIN}<!-- ELSE -->{DELETE_POST_PERMANENTLY_EXPLAIN}<!-- ENDIF -->
+					</label>
+				</dd>
+			</dl>
+		<!-- ENDIF -->
+
+		<dl>
+			<dt><label for="delete_reason">{L_DELETE_REASON}{L_COLON}</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt>
+			<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
+		</dl>
+	</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" name="confirm" value="{L_YES}" class="button1" />&nbsp;
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
+	</div>
+</div>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
diff --git a/template/custom_profile_fields.html b/template/custom_profile_fields.html
deleted file mode 100644
index 44c68f5..0000000
--- a/template/custom_profile_fields.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- BEGIN dropdown -->
-<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
-	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-</select>
-<!-- END dropdown -->
-
-<!-- BEGIN text -->
-<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox autowidth">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
-
-<!-- BEGIN string -->
-<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
-
-<!-- BEGIN bool -->
-<!-- IF bool.FIELD_LENGTH eq 1 -->
-	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
-<!-- ELSE -->
-	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
-<!-- ENDIF -->
-<!-- END bool -->
-
-<!-- BEGIN int -->
-<input type="text" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
-
-<!-- BEGIN date -->
-<label for="{date.FIELD_IDENT}_day">{L_DAY}: <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label> 
-<label for="{date.FIELD_IDENT}_month">{L_MONTH}: <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label> 
-<label for="{date.FIELD_IDENT}_year">{L_YEAR}: <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label>
-<!-- END date -->
diff --git a/template/display_options.html b/template/display_options.html
new file mode 100644
index 0000000..d1ec3dc
--- /dev/null
+++ b/template/display_options.html
@@ -0,0 +1,27 @@
+<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools">
+	<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select">
+		<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i>
+		<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>
+	</span>
+	<div class="dropdown hidden">
+		<div class="pointer"><div class="pointer-inner"></div></div>
+		<div class="dropdown-contents">
+			<fieldset class="display-options">
+			<!-- IF S_SORT_OPTIONS -->
+				<label>{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>
+				<label>{L_SORT_DIRECTION}{L_COLON} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
+				<hr class="dashed" />
+				<input type="submit" class="button2" name="sort" value="{L_SORT}" />
+			<!-- ELSE -->
+				<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
+				<!-- IF S_SELECT_SORT_KEY -->
+				<label>{L_SORT_BY}{L_COLON} {S_SELECT_SORT_KEY}</label>
+				<label>{L_SORT_DIRECTION}{L_COLON} {S_SELECT_SORT_DIR}</label>
+				<!-- ENDIF -->
+				<hr class="dashed" />
+				<input type="submit" class="button2" name="sort" value="{L_GO}" />
+			<!-- ENDIF -->
+			</fieldset>
+		</div>
+	</div>
+</div>
diff --git a/template/drafts.html b/template/drafts.html
index dea3bb4..ea2849a 100644
--- a/template/drafts.html
+++ b/template/drafts.html
@@ -2,43 +2,48 @@
 
 <!-- IF .draftrow -->
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
-	<h3>{L_LOAD_DRAFT}</h3>
+	<h3 class="draft-title">{L_LOAD_DRAFT}</h3>
 	<p>{L_LOAD_DRAFT_EXPLAIN}</p>
 
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 
 <div class="<!-- IF not S_PRIVMSGS -->forumbg<!-- ELSE -->panel<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
-	<ul class="topiclist">
+	<ul class="topiclist two-long-columns">
 		<li class="header">
 			<dl>
 				<dt>{L_LOAD_DRAFT}</dt>
-				<dd class="posted">{L_SAVE_DATE}</dd>
+				<dd class="info">{L_SAVE_DATE}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->">
+	<ul class="topiclist two-long-columns<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->">
 
 	<!-- BEGIN draftrow -->
 	<li class="row<!-- IF draftrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 		<dl>
 			<dt>
-				<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
-				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
+				<div class="list-inner">
+					<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
+					<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+					<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+					<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
+					<div class="responsive-show" style="display: none;">
+						{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong>
+					</div>
+				</div>
 			</dt>
-			<dd class="posted">{draftrow.DATE}</dd>
+			<dd class="info"><span>{draftrow.DATE}</span></dd>
 		</dl>
 	</li>
 	<!-- END draftrow -->
 
 	</ul>
 
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- ENDIF -->
diff --git a/template/editor.js b/template/editor.js
deleted file mode 100644
index 66731a1..0000000
--- a/template/editor.js
+++ /dev/null
@@ -1,450 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-var bbcodeEnabled = true;
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-var baseHeight;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help)
-{
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
-{
-	var doc;
-
-	if (document.forms[form_name])
-	{
-		doc = document;
-	}
-	else 
-	{
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-
-	if (is_ie && typeof(baseHeight) != 'number')
-	{
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-
-		if (!document.forms[form_name])
-		{
-			document.body.focus();
-		}
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber)
-{	
-	if (bbnumber != -1)
-	{
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
-	{
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose)
-{
-	theSelection = false;
-
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
-		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-	
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}	
-	// IE
-	else if (document.selection)
-	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup)
-{
-	var textarea;
-	
-	if (!popup) 
-	{
-		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
-	{
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-	if (spaces) 
-	{
-		text = ' ' + text + ' ';
-	}
-	
-	if (!isNaN(textarea.selectionStart))
-	{
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '')
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	}
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
-			textarea.focus();
-			storeCaret(textarea);
-		}
-
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	}
-	else
-	{
-		textarea.value = textarea.value + text;
-	}
-	if (!popup) 
-	{
-		textarea.focus();
-	}
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename)
-{
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username)
-{
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-
-	if (document.all)
-	{
-		divarea = document.all[message_name];
-	}
-	else
-	{
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie && !window.opera)
-	{
-		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection)
-	{
-		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
-	{
-		if (divarea.innerHTML)
-		{
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		}
-		else if (document.all)
-		{
-			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
-			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection)
-	{
-		if (bbcodeEnabled)
-		{
-			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-		}
-		else
-		{
-			var lines = split_lines(theSelection);
-			for (i = 0; i < lines.length; i++)
-			{
-				insert_text('> ' + lines[i] + '\n')
-			}
-		}
-	}
-
-	return;
-}
-
-function split_lines(text)
-{
-	var lines = text.split('\n');
-	var splitLines = new Array();
-	var j = 0;
-	for(i = 0; i < lines.length; i++)
-	{
-		if (lines[i].length <= 80)
-		{
-			splitLines[j] = lines[i];
-			j++;
-		}
-		else
-		{
-			var line = lines[i];
-			do
-			{
-				var splitAt = line.indexOf(' ', 80);
-				
-				if (splitAt == -1)
-				{
-					splitLines[j] = line;
-					j++
-				}
-				else
-				{
-					splitLines[j] = line.substring(0, splitAt);
-					line = line.substring(splitAt);
-					j++;
-				}
-			}
-			while(splitAt != -1)
-		}
-	}
-	return splitLines;
-}
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close)
-{
-	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd == 1 || selEnd == 2) 
-	{
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selEnd + open.length + close.length;
-	txtarea.selectionEnd = txtarea.selectionStart;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height)
-{
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
-
-	for (r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
-				document.writeln('<tr>');
-			}
-			
-			for (b = 0; b < 5; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir == 'v')
-			{
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir == 'h')
-		{
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-
-/**
-* Caret Position object
-*/
-function caretPosition()
-{
-	var start = null;
-	var end = null;
-}
-
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea)
-{
-	var caretPos = new caretPosition();
-	
-	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if(document.selection)
-	{
-	
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-		
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
-			range_all.moveStart('character', 1);
-		}
-	
-		txtarea.sel_start = sel_start;
-	
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
-	}
-
-	return caretPos;
-}
\ No newline at end of file
diff --git a/template/faq_body.html b/template/faq_body.html
index 108ffd9..90371cb 100644
--- a/template/faq_body.html
+++ b/template/faq_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_FAQ_TITLE}</h2>
+<h2 class="faq-title">{L_FAQ_TITLE}</h2>
 
 
 <div class="panel bg1" id="faqlinks">
@@ -16,7 +16,7 @@
 			<dl class="faq">
 				<dt><strong>{faq_block.BLOCK_TITLE}</strong></dt>
 				<!-- BEGIN faq_row -->
-					<dd><a href="#f{faq_block.S_ROW_COUNT}{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></dd>
+					<dd><a href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></dd>
 				<!-- END faq_row -->
 			</dl>
 		<!-- END faq_block -->
@@ -24,22 +24,20 @@
 	</div>
 </div>
 
-
-
-<div class="clear"></div>
-
 <!-- BEGIN faq_block -->
 	<div class="panel <!-- IF faq_block.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 		<div class="inner">
 
 		<div class="content">
-			<h2>{faq_block.BLOCK_TITLE}</h2>
+			<h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>
 			<!-- BEGIN faq_row -->
 				<dl class="faq">
-					<dt id="f{faq_block.S_ROW_COUNT}{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt>
+					<dt id="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt>
 					<dd>{faq_block.faq_row.FAQ_ANSWER}</dd>
-					<dd><a href="#faqlinks" class="top2">{L_BACK_TO_TOP}</a></dd>
 				</dl>
+				<a href="#faqlinks" class="top2">
+					<i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span>
+				</a>
 				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
 			<!-- END faq_row -->
 		</div>
diff --git a/template/forum_fn.js b/template/forum_fn.js
index 074c250..b803a6f 100644
--- a/template/forum_fn.js
+++ b/template/forum_fn.js
@@ -1,14 +1,26 @@
+/* global phpbb */
+
 /**
 * phpBB3 forum functions
 */
 
+/**
+* Find a member
+*/
+function find_username(url) {
+	'use strict';
+
+	popup(url, 760, 570, '_usersearch');
+	return false;
+}
+
 /**
 * Window popup
 */
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
+function popup(url, width, height, name) {
+	'use strict';
+
+	if (!name) {
 		name = '_popup';
 	}
 
@@ -19,19 +31,19 @@ function popup(url, width, height, name)
 /**
 * Jump to page
 */
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+function pageJump(item) {
+	'use strict';
+
+	var page = parseInt(item.val(), 10),
+		perPage = item.attr('data-per-page'),
+		baseUrl = item.attr('data-base-url'),
+		startName = item.attr('data-start-name');
+
+	if (page !== null && !isNaN(page) && page === Math.floor(page) && page > 0) {
+		if (baseUrl.indexOf('?') === -1) {
+			document.location.href = baseUrl + '?' + startName + '=' + ((page - 1) * perPage);
+		} else {
+			document.location.href = baseUrl.replace(/&amp;/g, '&') + '&' + startName + '=' + ((page - 1) * perPage);
 		}
 	}
 }
@@ -40,53 +52,40 @@ function jumpto()
 * Mark/unmark checklist
 * id = ID of parent container, name = name prefix, state = state [true/false]
 */
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
+function marklist(id, name, state) {
+	'use strict';
 
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-	
-	for (var r = 0; r < rb.length; r++)
-	{	
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
+	jQuery('#' + id + ' input[type=checkbox][name]').each(function() {
+		var $this = jQuery(this);
+		if ($this.attr('name').substr(0, name.length) === name) {
+			$this.prop('checked', state);
 		}
-	}
+	});
 }
 
 /**
 * Resize viewable area for attached image or topic review panel (possibly others to come)
 * e = element
 */
-function viewableArea(e, itself)
-{
-	if (!e) return;
-	if (!itself)
-	{
+function viewableArea(e, itself) {
+	'use strict';
+
+	if (!e) {
+		return;
+	}
+
+	if (!itself) {
 		e = e.parentNode;
 	}
-	
-	if (!e.vaHeight)
-	{
+
+	if (!e.vaHeight) {
 		// Store viewable area height before changing style to auto
 		e.vaHeight = e.offsetHeight;
 		e.vaMaxHeight = e.style.maxHeight;
 		e.style.height = 'auto';
 		e.style.maxHeight = 'none';
 		e.style.overflow = 'visible';
-	}
-	else
-	{
+	} else {
 		// Restore viewable area height to the default
 		e.style.height = e.vaHeight + 'px';
 		e.style.overflow = 'auto';
@@ -95,143 +94,101 @@ function viewableArea(e, itself)
 	}
 }
 
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s)
-{
-	var e = document.getElementById(n);
-
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? 'block' : 'none';
-}
-
 /**
 * Alternate display of subPanels
 */
-function subPanels(p)
-{
-	var i, e, t;
+jQuery(function($) {
+	'use strict';
 
-	if (typeof(p) == 'string')
-	{
-		show_panel = p;
-	}
+	$('.sub-panels').each(function() {
 
-	for (i = 0; i < panels.length; i++)
-	{
-		e = document.getElementById(panels[i]);
-		t = document.getElementById(panels[i] + '-tab');
-
-		if (e)
-		{
-			if (panels[i] == show_panel)
-			{
-				e.style.display = 'block';
-				if (t)
-				{
-					t.className = 'activetab';
-				}
-			}
-			else
-			{
-				e.style.display = 'none';
-				if (t)
-				{
-					t.className = '';
-				}
-			}
+		var $childNodes = $('a[data-subpanel]', this),
+			panels = $childNodes.map(function () {
+				return this.getAttribute('data-subpanel');
+			}),
+			showPanel = this.getAttribute('data-show-panel');
+
+		if (panels.length) {
+			activateSubPanel(showPanel, panels);
+			$childNodes.click(function () {
+				activateSubPanel(this.getAttribute('data-subpanel'), panels);
+				return false;
+			});
 		}
-	}
-}
+	});
+});
 
 /**
-* Call print preview
+* Activate specific subPanel
 */
-function printPage()
-{
-	if (is_ie)
-	{
-		printPreview();
-	}
-	else
-	{
-		window.print();
-	}
-}
+function activateSubPanel(p, panels) {
+	'use strict';
 
-/**
-* Show/hide groups of blocks
-* c = CSS style name
-* e = checkbox element
-* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles) 
-*/
-function displayBlocks(c, e, t)
-{
-	var s = (e.checked == true) ?  1 : -1;
+	var i, showPanel;
 
-	if (t)
-	{
-		s *= -1;
+	if (typeof p === 'string') {
+		showPanel = p;
 	}
+	$('input[name="show_panel"]').val(showPanel);
 
-	var divs = document.getElementsByTagName("DIV");
+	if (typeof panels === 'undefined') {
+		panels = jQuery('.sub-panels a[data-subpanel]').map(function() {
+			return this.getAttribute('data-subpanel');
+		});
+	}
 
-	for (var d = 0; d < divs.length; d++)
-	{
-		if (divs[d].className.indexOf(c) == 0)
-		{
-			divs[d].style.display = (s == 1) ? 'none' : 'block';
-		}
+	for (i = 0; i < panels.length; i++) {
+		jQuery('#' + panels[i]).css('display', panels[i] === showPanel ? 'block' : 'none');
+		jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === showPanel);
 	}
 }
 
-function selectCode(a)
-{
+function selectCode(a) {
+	'use strict';
+
 	// Get ID of code block
 	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
-
-	// Not IE
-	if (window.getSelection)
-	{
-		var s = window.getSelection();
-		// Safari
-		if (s.setBaseAndExtent)
-		{
-			s.setBaseAndExtent(e, 0, e, e.innerText.length - 1);
+	var s, r;
+
+	// Not IE and IE9+
+	if (window.getSelection) {
+		s = window.getSelection();
+		// Safari and Chrome
+		if (s.setBaseAndExtent) {
+			var l = (e.innerText.length > 1) ? e.innerText.length - 1 : 1;
+			try {
+				s.setBaseAndExtent(e, 0, e, l);
+			} catch (error) {
+				r = document.createRange();
+				r.selectNodeContents(e);
+				s.removeAllRanges();
+				s.addRange(r);
+			}
 		}
 		// Firefox and Opera
-		else
-		{
+		else {
 			// workaround for bug # 42885
-			if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) == '<BR>')
-			{
+			if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) === '<BR>') {
 				e.innerHTML = e.innerHTML + '&nbsp;';
 			}
 
-			var r = document.createRange();
+			r = document.createRange();
 			r.selectNodeContents(e);
 			s.removeAllRanges();
 			s.addRange(r);
 		}
 	}
 	// Some older browsers
-	else if (document.getSelection)
-	{
-		var s = document.getSelection();
-		var r = document.createRange();
+	else if (document.getSelection) {
+		s = document.getSelection();
+		r = document.createRange();
 		r.selectNodeContents(e);
 		s.removeAllRanges();
 		s.addRange(r);
 	}
 	// IE
-	else if (document.selection)
-	{
-		var r = document.body.createTextRange();
+	else if (document.selection) {
+		r = document.body.createTextRange();
 		r.moveToElementText(e);
 		r.select();
 	}
@@ -241,25 +198,24 @@ function selectCode(a)
 * Play quicktime file by determining it's width/height
 * from the displayed rectangle area
 */
-function play_qt_file(obj)
-{
+function play_qt_file(obj) {
+	'use strict';
+
 	var rectangle = obj.GetRectangle();
+	var width, height;
 
-	if (rectangle)
-	{
+	if (rectangle) {
 		rectangle = rectangle.split(',');
-		var x1 = parseInt(rectangle[0]);
-		var x2 = parseInt(rectangle[2]);
-		var y1 = parseInt(rectangle[1]);
-		var y2 = parseInt(rectangle[3]);
-
-		var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
-		var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
-	}
-	else
-	{
-		var width = 200;
-		var height = 0;
+		var x1 = parseInt(rectangle[0], 10);
+		var x2 = parseInt(rectangle[2], 10);
+		var y1 = parseInt(rectangle[1], 10);
+		var y2 = parseInt(rectangle[3], 10);
+
+		width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
+		height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
+	} else {
+		width = 200;
+		height = 0;
 	}
 
 	obj.width = width;
@@ -269,81 +225,32 @@ function play_qt_file(obj)
 	obj.Play();
 }
 
-/**
-* Check if the nodeName of elem is name
-* @author jQuery
-*/
-function is_node_name(elem, name)
-{
-	return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-}
-
-/**
-* Check if elem is in array, return position
-* @author jQuery
-*/
-function is_in_array(elem, array)
-{
-	for (var i = 0, length = array.length; i < length; i++)
-		// === is correct (IE)
-		if (array[i] === elem)
-			return i;
-
-	return -1;
-}
-
-/**
-* Find Element, type and class in tree
-* Not used, but may come in handy for those not using JQuery
-* @author jQuery.find, Meik Sievertsen
-*/
-function find_in_tree(node, tag, type, class_name)
-{
-	var result, element, i = 0, length = node.childNodes.length;
-
-	for (element = node.childNodes[0]; i < length; element = node.childNodes[++i])
-	{
-		if (!element || element.nodeType != 1) continue;
-
-		if ((!tag || is_node_name(element, tag)) && (!type || element.type == type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1))
-		{
-			return element;
-		}
-
-		if (element.childNodes.length)
-			result = find_in_tree(element, tag, type, class_name);
-
-		if (result) return result;
-	}
-}
-
-var in_autocomplete = false;
-var last_key_entered = '';
+var inAutocomplete = false;
+var lastKeyEntered = '';
 
 /**
 * Check event key
 */
-function phpbb_check_key(event)
-{
+function phpbbCheckKey(event) {
+	'use strict';
+
 	// Keycode is array down or up?
-	if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38))
-		in_autocomplete = true;
+	if (event.keyCode && (event.keyCode === 40 || event.keyCode === 38)) {
+		inAutocomplete = true;
+	}
 
 	// Make sure we are not within an "autocompletion" field
-	if (in_autocomplete)
-	{
+	if (inAutocomplete) {
 		// If return pressed and key changed we reset the autocompletion
-		if (!last_key_entered || last_key_entered == event.which)
-		{
-			in_autocompletion = false;
+		if (!lastKeyEntered || lastKeyEntered === event.which) {
+			inAutocomplete = false;
 			return true;
 		}
 	}
 
 	// Keycode is not return, then return. ;)
-	if (event.which != 13)
-	{
-		last_key_entered = event.which;
+	if (event.which !== 13) {
+		lastKeyEntered = event.which;
 		return true;
 	}
 
@@ -351,88 +258,713 @@ function phpbb_check_key(event)
 }
 
 /**
-* Usually used for onkeypress event, to submit a form on enter
+* Apply onkeypress event for forcing default submit button on ENTER key press
 */
-function submit_default_button(event, selector, class_name)
-{
-	// Add which for key events
-	if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
-		event.which = event.charCode || event.keyCode;
+jQuery(function($) {
+	'use strict';
+
+	$('form input[type=text], form input[type=password]').on('keypress', function (e) {
+		var defaultButton = $(this).parents('form').find('input[type=submit].default-submit-action');
+
+		if (!defaultButton || defaultButton.length <= 0) {
+			return true;
+		}
+
+		if (phpbbCheckKey(e)) {
+			return true;
+		}
+
+		if ((e.which && e.which === 13) || (e.keyCode && e.keyCode === 13)) {
+			defaultButton.click();
+			return false;
+		}
 
-	if (phpbb_check_key(event))
 		return true;
+	});
+});
 
-	var current = selector['parentNode'];
+/**
+* Functions for user search popup
+*/
+function insertUser(formId, value) {
+	'use strict';
 
-	// Search parent form element
-	while (current && (!current.nodeName || current.nodeType != 1 || !is_node_name(current, 'form')) && current != document)
-		current = current['parentNode'];
+	var $form = jQuery(formId),
+		formName = $form.attr('data-form-name'),
+		fieldName = $form.attr('data-field-name'),
+		item = opener.document.forms[formName][fieldName];
 
-	// Find the input submit button with the class name
-	//current = find_in_tree(current, 'input', 'submit', class_name);
-	var input_tags = current.getElementsByTagName('input');
-	current = false;
+	if (item.value.length && item.type === 'textarea') {
+		value = item.value + '\n' + value;
+	}
+
+	item.value = value;
+}
 
-	for (var i = 0, element = input_tags[0]; i < input_tags.length; element = input_tags[++i])
-	{
-		if (element.type == 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1)
-			current = element;
+function insert_marked_users(formId, users) {
+	'use strict';
+
+	for (var i = 0; i < users.length; i++) {
+		if (users[i].checked) {
+			insertUser(formId, users[i].value);
+		}
 	}
 
-	if (!current)
-		return true;
+	window.close();
+}
 
-	// Submit form
-	current.focus();
-	current.click();
-	return false;
+function insert_single_user(formId, user) {
+	'use strict';
+
+	insertUser(formId, user);
+	window.close();
 }
 
 /**
-* Apply onkeypress event for forcing default submit button on ENTER key press
-* The jQuery snippet used is based on http://greatwebguy.com/programming/dom/default-html-button-submit-on-enter-with-jquery/
-* The non-jQuery code is a mimick of the jQuery code ;)
+* Parse document block
 */
-function apply_onkeypress_event()
-{
-	// jQuery code in case jQuery is used
-	if (jquery_present)
-	{
-		$('form input').live('keypress', function (e)
-		{
-			var default_button = $(this).parents('form').find('input[type=submit].default-submit-action');
-			
-			if (!default_button || default_button.length <= 0)
-				return true;
-
-			if (phpbb_check_key(e))
-				return true;
-
-			if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
-			{
-				default_button.click();
-				return false;
+function parseDocument($container) {
+	'use strict';
+
+	var test = document.createElement('div'),
+		oldBrowser = (typeof test.style.borderRadius === 'undefined'),
+		$body = $('body');
+
+	/**
+	* Reset avatar dimensions when changing URL or EMAIL
+	*/
+	$container.find('input[data-reset-on-edit]').on('keyup', function() {
+		$(this.getAttribute('data-reset-on-edit')).val('');
+	});
+
+	/**
+	* Pagination
+	*/
+	$container.find('.pagination .page-jump-form :button').click(function() {
+		var $input = $(this).siblings('input.inputbox');
+		pageJump($input);
+	});
+
+	$container.find('.pagination .page-jump-form input.inputbox').on('keypress', function(event) {
+		if (event.which === 13 || event.keyCode === 13) {
+			event.preventDefault();
+			pageJump($(this));
+		}
+	});
+
+	$container.find('.pagination .dropdown-trigger').click(function() {
+		var $dropdownContainer = $(this).parent();
+		// Wait a little bit to make sure the dropdown has activated
+		setTimeout(function() {
+			if ($dropdownContainer.hasClass('dropdown-visible')) {
+				$dropdownContainer.find('input.inputbox').focus();
 			}
+		}, 100);
+	});
+
+	/**
+	* Adjust HTML code for IE8 and older versions
+	*/
+	// if (oldBrowser) {
+	// 	// Fix .linklist.bulletin lists
+	// 	$container
+	// 		.find('ul.linklist.bulletin > li')
+	// 		.filter(':first-child, .rightside:last-child')
+	// 		.addClass('no-bulletin');
+	// }
+
+	/**
+	* Resize navigation (breadcrumbs) block to keep all links on same line
+	*/
+	$container.find('.navlinks').each(function() {
+		var $this = $(this),
+			$left = $this.children().not('.rightside'),
+			$right = $this.children('.rightside');
+
+		if ($left.length !== 1 || !$right.length) {
+			return;
+		}
 
-			return true;
+		function resize() {
+			var width = 0,
+				diff = $left.outerWidth(true) - $left.width(),
+				minWidth = Math.max($this.width() / 3, 240),
+				maxWidth;
+
+			$right.each(function() {
+				var $this = $(this);
+				if ($this.is(':visible')) {
+					width += $this.outerWidth(true);
+				}
+			});
+
+			maxWidth = $this.width() - width - diff;
+			$left.css('max-width', Math.floor(Math.max(maxWidth, minWidth)) + 'px');
+		}
+
+		resize();
+		$(window).resize(resize);
+	});
+
+	/**
+	* Makes breadcrumbs responsive
+	*/
+	$container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
+		var $this = $(this),
+			$links = $this.find('.crumb'),
+			length = $links.length,
+			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
+			classesLength = classes.length,
+			maxHeight = 0,
+			lastWidth = false,
+			wrapped = false;
+
+		// Set tooltips
+		$this.find('a').each(function() {
+			var $link = $(this);
+			$link.attr('title', $link.text());
+		});
+
+		// Function that checks breadcrumbs
+		function check() {
+			var height = $this.height(),
+				width;
+
+			// Test max-width set in code for .navlinks above
+			width = parseInt($this.css('max-width'), 10);
+			if (!width) {
+				width = $body.width();
+			}
+
+			maxHeight = parseInt($this.css('line-height'), 10);
+			$links.each(function() {
+				if ($(this).height() > 0) {
+					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+				}
+			});
+
+			if (height <= maxHeight) {
+				if (!wrapped || lastWidth === false || lastWidth >= width) {
+					return;
+				}
+			}
+			lastWidth = width;
+
+			if (wrapped) {
+				$this.removeClass('wrapped').find('.crumb.wrapped').removeClass('wrapped ' + classes.join(' '));
+				if ($this.height() <= maxHeight) {
+					return;
+				}
+			}
+
+			wrapped = true;
+			$this.addClass('wrapped');
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			for (var i = 0; i < classesLength; i++) {
+				for (var j = length - 1; j >= 0; j--) {
+					$links.eq(j).addClass('wrapped ' + classes[i]);
+					if ($this.height() <= maxHeight) {
+						return;
+					}
+				}
+			}
+		}
+
+		// Run function and set event
+		check();
+		$(window).resize(check);
+	});
+
+	/**
+	* Responsive link lists
+	*/
+	var selector = '.linklist:not(.navlinks, [data-skip-responsive]),' +
+		'.postbody .post-buttons:not([data-skip-responsive])';
+	$container.find(selector).each(function() {
+		var $this = $(this),
+			filterSkip = '.breadcrumbs, [data-skip-responsive]',
+			filterLast = '.edit-icon, .quote-icon, [data-last-responsive]',
+			$linksAll = $this.children(),
+			$linksNotSkip = $linksAll.not(filterSkip), // All items that can potentially be hidden
+			$linksFirst = $linksNotSkip.not(filterLast), // The items that will be hidden first
+			$linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last
+			persistent = $this.attr('id') === 'nav-main', // Does this list already have a menu (such as quick-links)?
+			html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="js-responsive-menu-link responsive-menu-link"><i class="icon fa-bars fa-fw" aria-hidden="true"></i></a><div class="dropdown"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
+			slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured.
+
+		// Add a hidden drop-down menu to each links list (except those that already have one)
+		if (!persistent) {
+			if ($linksNotSkip.is('.rightside')) {
+				$linksNotSkip.filter('.rightside:first').before(html);
+				$this.children('.responsive-menu').addClass('rightside');
+			} else {
+				$this.append(html);
+			}
+		}
+
+		// Set some object references and initial states
+		var $menu = $this.children('.responsive-menu'),
+			$menuContents = $menu.find('.dropdown-contents'),
+			persistentContent = $menuContents.find('li:not(.separator)').length,
+			lastWidth = false,
+			compact = false,
+			responsive1 = false,
+			responsive2 = false,
+			copied1 = false,
+			copied2 = false,
+			maxHeight = 0;
+
+		// Find the tallest element in the list (we assume that all elements are roughly the same height)
+		$linksAll.each(function() {
+			if (!$(this).height()) {
+				return;
+			}
+			maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+		});
+		if (maxHeight < 1) {
+			return; // Shouldn't be possible, but just in case, abort
+		} else {
+			maxHeight = maxHeight + slack;
+		}
+
+		function check() {
+			var width = $body.width();
+			// We can't make it any smaller than this, so just skip
+			if (responsive2 && compact && (width <= lastWidth)) {
+				return;
+			}
+			lastWidth = width;
+
+			// Reset responsive and compact layout
+			if (responsive1 || responsive2) {
+				$linksNotSkip.removeClass('hidden');
+				$menuContents.children('.clone').addClass('hidden');
+				responsive1 = responsive2 = false;
+			}
+			if (compact) {
+				$this.removeClass('compact');
+				compact = false;
+			}
+
+			// Unhide the quick-links menu if it has "persistent" content
+			if (persistent && persistentContent) {
+				$menu.removeClass('hidden');
+			} else {
+				$menu.addClass('hidden');
+			}
+
+			// Nothing to resize if block's height is not bigger than tallest element's height
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			// STEP 1: Compact
+			if (!compact) {
+				$this.addClass('compact');
+				compact = true;
+			}
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			// STEP 2: First responsive set - compact
+			if (compact) {
+				$this.removeClass('compact');
+				compact = false;
+			}
+			// Copy the list items to the dropdown
+			if (!copied1) {
+				var $clones1 = $linksFirst.clone();
+				$menuContents.prepend($clones1.addClass('clone clone-first').removeClass('leftside rightside'));
+
+				if ($this.hasClass('post-buttons')) {
+					$('.button', $menuContents).removeClass('button');
+					$('.sr-only', $menuContents).removeClass('sr-only');
+					$('.js-responsive-menu-link').addClass('button').addClass('button-icon-only');
+					$('.js-responsive-menu-link .icon').removeClass('fa-bars').addClass('fa-ellipsis-h');
+				}
+				copied1 = true;
+			}
+			if (!responsive1) {
+				$linksFirst.addClass('hidden');
+				responsive1 = true;
+				$menuContents.children('.clone-first').removeClass('hidden');
+				$menu.removeClass('hidden');
+			}
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			// STEP 3: First responsive set + compact
+			if (!compact) {
+				$this.addClass('compact');
+				compact = true;
+			}
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			// STEP 4: Last responsive set - compact
+			if (!$linksLast.length) {
+				return; // No other links to hide, can't do more
+			}
+			if (compact) {
+				$this.removeClass('compact');
+				compact = false;
+			}
+			// Copy the list items to the dropdown
+			if (!copied2) {
+				var $clones2 = $linksLast.clone();
+				$menuContents.prepend($clones2.addClass('clone clone-last').removeClass('leftside rightside'));
+				copied2 = true;
+			}
+			if (!responsive2) {
+				$linksLast.addClass('hidden');
+				responsive2 = true;
+				$menuContents.children('.clone-last').removeClass('hidden');
+			}
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			// STEP 5: Last responsive set + compact
+			if (!compact) {
+				$this.addClass('compact');
+				compact = true;
+			}
+		}
+
+		if (!persistent) {
+			phpbb.registerDropdown($menu.find('a.js-responsive-menu-link'), $menu.find('.dropdown'), false);
+		}
+
+		// If there are any images in the links list, run the check again after they have loaded
+		$linksAll.find('img').each(function() {
+			$(this).load(function() {
+				check();
+			});
 		});
-	
+
+		check();
+		$(window).resize(check);
+	});
+
+	/**
+	* Do not run functions below for old browsers
+	*/
+	if (oldBrowser) {
 		return;
 	}
 
-	var input_tags = document.getElementsByTagName('input');
+	/**
+	* Adjust topiclist lists with check boxes
+	*/
+	$container.find('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark');
+
+	/**
+	* Appends contents of all extra columns to first column in
+	* .topiclist lists for mobile devices. Copies contents as is.
+	*
+	* To add that functionality to .topiclist list simply add
+	* responsive-show-all to list of classes
+	*/
+	$container.find('.topiclist.responsive-show-all > li > dl').each(function() {
+		var $this = $(this),
+			$block = $this.find('dt .responsive-show:last-child'),
+			first = true;
+
+		// Create block that is visible only on mobile devices
+		if (!$block.length) {
+			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+			$block = $this.find('dt .responsive-show:last-child');
+		} else {
+			first = ($.trim($block.text()).length === 0);
+		}
 
-	for (var i = 0, element = input_tags[0]; i < input_tags.length ; element = input_tags[++i])
-	{
-		if (element.type == 'hidden')
-			continue;
+		// Copy contents of each column
+		$this.find('dd').not('.mark').each(function() {
+			var column = $(this),
+				$children = column.children(),
+				html = column.html();
 
-		// onkeydown is possible too
-		element.onkeypress = function (evt) { submit_default_button((evt || window.event), this, 'default-submit-action'); }; 
-	}
+			if ($children.length === 1 && $children.text() === column.text()) {
+				html = $children.html();
+			}
+
+			$block.append((first ? '' : '<br />') + html);
+
+			first = false;
+		});
+	});
+
+	/**
+	* Same as above, but prepends text from header to each
+	* column before contents of that column.
+	*
+	* To add that functionality to .topiclist list simply add
+	* responsive-show-columns to list of classes
+	*/
+	$container.find('.topiclist.responsive-show-columns').each(function() {
+		var $list = $(this),
+			headers = [],
+			headersLength = 0;
+
+		// Find all headers, get contents
+		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
+			headers.push($(this).text());
+			headersLength++;
+		});
+
+		if (!headersLength) {
+			return;
+		}
+
+		// Parse each row
+		$list.find('dl').each(function() {
+			var $this = $(this),
+				$block = $this.find('dt .responsive-show:last-child'),
+				first = true;
+
+			// Create block that is visible only on mobile devices
+			if (!$block.length) {
+				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+				$block = $this.find('dt .responsive-show:last-child');
+			} else {
+				first = ($.trim($block.text()).length === 0);
+			}
+
+			// Copy contents of each column
+			$this.find('dd').not('.mark').each(function(i) {
+				var column = $(this),
+					children = column.children(),
+					html = column.html();
+
+				if (children.length === 1 && children.text() === column.text()) {
+					html = children.html();
+				}
+
+				// Prepend contents of matching header before contents of column
+				if (i < headersLength) {
+					html = headers[i] + ': <strong>' + html + '</strong>';
+				}
+
+				$block.append((first ? '' : '<br />') + html);
+
+				first = false;
+			});
+		});
+	});
+
+	/**
+	* Responsive tables
+	*/
+	$container.find('table.table1').not('.not-responsive').each(function() {
+		var $this = $(this),
+			$th = $this.find('thead > tr > th'),
+			headers = [],
+			totalHeaders = 0,
+			i, headersLength;
+
+		// Find each header
+		$th.each(function(column) {
+			var cell = $(this),
+				colspan = parseInt(cell.attr('colspan'), 10),
+				dfn = cell.attr('data-dfn'),
+				text = dfn ? dfn : cell.text();
+
+			colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+
+			for (i = 0; i < colspan; i++) {
+				headers.push(text);
+			}
+			totalHeaders++;
+
+			if (dfn && !column) {
+				$this.addClass('show-header');
+			}
+		});
+
+		headersLength = headers.length;
+
+		// Add header text to each cell as <dfn>
+		$this.addClass('responsive');
+
+		if (totalHeaders < 2) {
+			$this.addClass('show-header');
+			return;
+		}
+
+		$this.find('tbody > tr').each(function() {
+			var row = $(this),
+				cells = row.children('td'),
+				column = 0;
+
+			if (cells.length === 1) {
+				row.addClass('big-column');
+				return;
+			}
+
+			cells.each(function() {
+				var cell = $(this),
+					colspan = parseInt(cell.attr('colspan'), 10),
+					text = $.trim(cell.text());
+
+				if (headersLength <= column) {
+					return;
+				}
+
+				if ((text.length && text !== '-') || cell.children().length) {
+					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+				} else {
+					cell.addClass('empty');
+				}
+
+				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+				column += colspan;
+			});
+		});
+	});
+
+	/**
+	* Hide empty responsive tables
+	*/
+	$container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() {
+		var $items = $(this).children('tr');
+		if (!$items.length) {
+			$(this).parent('table:first').addClass('responsive-hide');
+		}
+	});
+
+	/**
+	* Responsive tabs
+	*/
+	$container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
+		var $this = $(this),
+			$ul = $this.children(),
+			$tabs = $ul.children().not('[data-skip-responsive]'),
+			$links = $tabs.children('a'),
+			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			$menu = $item.find('.dropdown-contents'),
+			maxHeight = 0,
+			lastWidth = false,
+			responsive = false;
+
+		$links.each(function() {
+			var $this = $(this);
+			maxHeight = Math.max(maxHeight, Math.max($this.outerHeight(true), $this.parent().outerHeight(true)));
+		});
+
+		function check() {
+			var width = $body.width(),
+				height = $this.height();
+
+			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
+				return;
+			}
+
+			$tabs.show();
+			$item.hide();
+
+			lastWidth = width;
+			height = $this.height();
+			if (height <= maxHeight) {
+				if ($item.hasClass('dropdown-visible')) {
+					phpbb.toggleDropdown.call($item.find('a.responsive-tab-link').get(0));
+				}
+				return;
+			}
+
+			responsive = true;
+			$item.show();
+			$menu.html('');
+
+			var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)'),
+				total = $availableTabs.length,
+				i, $tab;
+
+			for (i = total - 1; i >= 0; i--) {
+				$tab = $availableTabs.eq(i);
+				$menu.prepend($tab.clone(true).removeClass('tab'));
+				$tab.hide();
+				if ($this.height() <= maxHeight) {
+					$menu.find('a').click(function() {
+						check(true);
+					});
+					return;
+				}
+			}
+			$menu.find('a').click(function() {
+				check(true);
+			});
+		}
+
+		var $tabLink = $item.find('a.responsive-tab-link');
+		phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
+			visibleClass: 'activetab'
+		});
+
+		check(true);
+		$(window).resize(check);
+	});
+
+	/**
+	 * Hide UCP/MCP navigation if there is only 1 item
+	 */
+	$container.find('#navigation').each(function() {
+		var $items = $(this).children('ol, ul').children('li');
+		if ($items.length === 1) {
+			$(this).addClass('responsive-hide');
+		}
+	});
+
+	/**
+	* Replace responsive text
+	*/
+	$container.find('[data-responsive-text]').each(function() {
+		var $this = $(this),
+			fullText = $this.text(),
+			responsiveText = $this.attr('data-responsive-text'),
+			responsive = false;
+
+		function check() {
+			if ($(window).width() > 700) {
+				if (!responsive) {
+					return;
+				}
+				$this.text(fullText);
+				responsive = false;
+				return;
+			}
+			if (responsive) {
+				return;
+			}
+			$this.text(responsiveText);
+			responsive = true;
+		}
+
+		check();
+		$(window).resize(check);
+	});
 }
 
 /**
-* Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;)
+* Run onload functions
 */
-var jquery_present = typeof jQuery == 'function';
+jQuery(function($) {
+	'use strict';
+
+	// Swap .nojs and .hasjs
+	$('#phpbb.nojs').toggleClass('nojs hasjs');
+	$('#phpbb').toggleClass('hastouch', phpbb.isTouch);
+	$('#phpbb.hastouch').removeClass('notouch');
+
+	// Focus forms
+	$('form[data-focus]:first').each(function() {
+		$('#' + this.getAttribute('data-focus')).focus();
+	});
+
+	parseDocument($('body'));
+});
diff --git a/template/forumlist_body.html b/template/forumlist_body.html
index 89525f3..f8d6e36 100644
--- a/template/forumlist_body.html
+++ b/template/forumlist_body.html
@@ -7,46 +7,88 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- EVENT forumlist_body_category_header_before -->
 	<!-- IF forumrow.S_IS_CAT or forumrow.S_FIRST_ROW  or forumrow.S_NO_CAT  -->
 		<div class="forabg">
 			<div class="inner">
 			<ul class="topiclist">
 				<li class="header">
+					<!-- EVENT forumlist_body_category_header_row_prepend -->
 					<dl class="icon">
-						<dt onClick="location.href='{forumrow.U_VIEWFORUM}';" class="balken"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></dt>
+						<dt><div class="list-inner"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
 						<dd class="topics">{L_TOPICS}</dd>
 						<dd class="posts">{L_POSTS}</dd>
 						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
 					</dl>
+					<!-- EVENT forumlist_body_category_header_row_append -->
 				</li>
 			</ul>
 			<ul class="topiclist forums">
 	<!-- ENDIF -->
+	<!-- EVENT forumlist_body_category_header_after -->
 
 	<!-- IF not forumrow.S_IS_CAT -->
+		<!-- EVENT forumlist_body_forum_row_before -->
 		<li class="row">
-			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt>
-					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
-					<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
-					{forumrow.FORUM_DESC}
-					<!-- IF forumrow.MODERATORS -->
-						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
-					<!-- ENDIF -->
-					<!-- IF forumrow.SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
+			<!-- EVENT forumlist_body_forum_row_prepend -->
+			<dl class="icon {forumrow.FORUM_IMG_STYLE}">
+				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
+					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
+
+						<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
+						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a>
+						<!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF -->
+						<!-- IF forumrow.MODERATORS -->
+							<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}
+						<!-- ENDIF -->
+						<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->
+							<!-- EVENT forumlist_body_subforums_before -->
+							<br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
+							<!-- BEGIN subforum -->
+								<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF -->
+							<!-- END subforum -->
+							<!-- EVENT forumlist_body_subforums_after -->
+						<!-- ENDIF -->
+
+						<!-- IF not S_IS_BOT -->
+						<div class="responsive-show" style="display: none;">
+							<!-- IF forumrow.CLICKS -->
+								{L_REDIRECTS}{L_COLON} <strong>{forumrow.CLICKS}</strong>
+							<!-- ELSEIF not forumrow.S_IS_LINK and forumrow.TOPICS -->
+								{L_TOPICS}{L_COLON} <strong>{forumrow.TOPICS}</strong>
+							<!-- ENDIF -->
+						</div>
+						<!-- ENDIF -->
+					</div>
 				</dt>
 				<!-- IF forumrow.CLICKS -->
-					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
+					<dd class="redirect"><span>{L_REDIRECTS}{L_COLON} {forumrow.CLICKS}</span></dd>
 				<!-- ELSEIF not forumrow.S_IS_LINK -->
 					<dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd>
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
-						<a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span>
+						<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
+							<a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a>
+						<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
+							<a href="{forumrow.U_UNAPPROVED_POSTS}">{UNAPPROVED_POST_IMG}</a>
+						<!-- ENDIF -->
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+							<!-- EVENT forumlist_body_last_post_title_prepend -->
+							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
+						<!-- ENDIF --> 
+						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
+						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
 					</dd>
+				<!-- ELSE -->
+					<dd>&nbsp;</dd>
 				<!-- ENDIF -->
 			</dl>
+			<!-- EVENT forumlist_body_forum_row_append -->
 		</li>
+		<!-- EVENT forumlist_body_forum_row_after -->
 	<!-- ENDIF -->
 
 	<!-- IF forumrow.S_LAST_ROW -->
@@ -54,6 +96,7 @@
 
 			</div>
 		</div>
+	<!-- EVENT forumlist_body_last_row_after -->
 	<!-- ENDIF -->
 
 <!-- BEGINELSE -->
diff --git a/template/gallery/album_body.html b/template/gallery/album_body.html
deleted file mode 100644
index 21bd7fd..0000000
--- a/template/gallery/album_body.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<!-- IF not S_IN_GALLERY_POPUP and U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_ALBUM}">{ALBUM_NAME}</a></h2>
-
-<!-- IF not S_IN_GALLERY_POPUP and ALBUM_DESC or MODERATORS or U_MCP -->
-<div>
-	<!-- NOTE: remove the style="display: none !important;" when you want to have the album description on the album body -->
-	<!-- IF ALBUM_DESC --><div style="display: none !important;">{ALBUM_DESC}<br /></div><!-- ENDIF -->
-	<!-- IF ALBUM_CONTEST_START --><span>{ALBUM_CONTEST_START}<br /></span><!-- ENDIF -->
-	<!-- IF ALBUM_CONTEST_RATING --><span>{ALBUM_CONTEST_RATING}<br /></span><!-- ENDIF -->
-	<!-- IF ALBUM_CONTEST_END --><span>{ALBUM_CONTEST_END}<br /><br /></span><!-- ENDIF -->
-	<!-- IF MODERATORS --><strong>{L_MODERATORS}:</strong> {MODERATORS}<br /><!-- ENDIF -->
-	<!-- IF U_EDIT_ALBUM --><br /><strong><a href="{U_EDIT_ALBUM}">{L_EDIT_ALBUM}</a></strong><!-- ENDIF -->
-	<!-- IF U_CREATE_ALBUM --><br /><strong><a href="{U_CREATE_ALBUM}">{L_CREATE_SUBALBUM}</a></strong><!-- ENDIF -->
-</div>
-<!-- ENDIF -->
-
-<!-- IF .albumrow -->
-	<!-- IF not S_IS_BOT and U_MARK_ALBUMS -->
-	<ul class="linklist">
-		<li class="rightside"><a href="{U_MARK_ALBUMS}">{L_MARK_ALBUMS_READ}</a></li>
-	</ul>
-	<!-- ENDIF -->
-	<!-- INCLUDE gallery/albumlist_body.html -->
-<!-- ENDIF -->
-
-<!-- IF S_IS_POSTABLE and (U_UPLOAD_IMAGE or PAGINATION or TOTAL_IMAGES or (U_SLIDE_SHOW and not S_IS_BOT)) -->
-	<div class="topic-actions" <!-- IF S_HAS_SUBALBUM -->style="margin-top: 2em;"<!-- ENDIF -->>
-
-	<!-- IF not S_IN_GALLERY_POPUP and U_UPLOAD_IMAGE -->
-		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->upload-icon<!-- ENDIF -->"><a href="{U_UPLOAD_IMAGE}" title="<!-- IF S_IS_LOCKED -->{L_ALBUM_LOCKED}<!-- ELSE -->{L_UPLOAD_IMAGE}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_ALBUM_LOCKED}<!-- ELSE -->{L_UPLOAD_IMAGE}<!-- ENDIF --></a></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_IN_GALLERY_POPUP and S_DISPLAY_SEARCHBOX -->
-		<div class="search-box">
-			<form method="post" id="album-search" action="{S_SEARCHBOX_ACTION}">
-			<fieldset>
-				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_ALBUM}" onclick="if (this.value == '{LA_SEARCH_ALBUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_ALBUM}';" />
-				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{ALBUM_ID}" name="aid[]" />
-			</fieldset>
-			</form>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF PAGINATION or TOTAL_IMAGES -->
-		<div class="pagination">
-			{TOTAL_IMAGES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_IN_GALLERY_POPUP and S_IS_POSTABLE and U_SLIDE_SHOW and not S_IS_BOT -->
-		<div class="pagination"><a href="{U_SLIDE_SHOW}">{L_SLIDE_SHOW}</a><!-- IF PAGINATION or TOTAL_IMAGES or U_SLIDE_SHOW --> &bull;&nbsp;<!-- ENDIF --></div>
-	<!-- ENDIF -->
-
-	</div>
-<!-- ENDIF -->
-
-<!-- IF .imageblock -->
-	<!-- IF S_IN_GALLERY_POPUP -->
-		<!-- INCLUDE gallery/imageblock_popup.html -->
-	<!-- ELSE -->
-		<!-- INCLUDE gallery/imageblock_body.html -->
-	<!-- ENDIF -->
-<!-- ELSE -->
-	<!-- IF S_IS_POSTABLE -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<strong>{L_NO_IMAGES_LONG}</strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF S_IS_POSTABLE -->
-	<form action="{S_ALBUM_ACTION}" method="post">
-	<fieldset class="display-options">
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-	</fieldset>
-	</form>
-	<hr />
-	<!-- IF .imagerow -->
-	<div class="topic-actions">
-		<!-- IF U_UPLOAD_IMAGE -->
-			<div class="buttons">
-				<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->upload-icon<!-- ENDIF -->"><a href="{U_UPLOAD_IMAGE}" title="<!-- IF S_IS_LOCKED -->{L_ALBUM_LOCKED}<!-- ELSE -->{L_UPLOAD_IMAGE}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_ALBUM_LOCKED}<!-- ELSE -->{L_UPLOAD_IMAGE}<!-- ENDIF --></a></div>
-			</div>
-		<!-- ENDIF -->
-		<div class="pagination">
-			{TOTAL_IMAGES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ENDIF -->
-		</div>
-	</div>
-	<br />
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF not S_IN_GALLERY_POPUP -->
-	<p></p><p><a href="{U_RETURN_LINK}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {S_RETURN_LINK}</a></p>
-	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.album_id.value == -1){return false;}">
-		<fieldset class="jumpbox">
-			<label for="album_id" accesskey="album_id">{L_JUMP_TO}:</label>
-			<select name="album_id" id="album_id" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
-				{ALBUM_JUMPBOX}
-			</select>
-			<input type="submit" value="{L_GO}" class="button2" />
-		</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF not S_IN_GALLERY_POPUP and S_DISPLAY_ONLINE_LIST -->
-	<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
-	<p>{LOGGED_IN_USER_LIST}</p>
-<!-- ENDIF -->
-
-<!-- IF not S_IN_GALLERY_POPUP and S_IS_POSTABLE -->
-	<h3>{L_ALBUM_PERMISSIONS}</h3>
-	<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/albumlist_body.html b/template/gallery/albumlist_body.html
deleted file mode 100644
index 18a2edc..0000000
--- a/template/gallery/albumlist_body.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- BEGIN albumrow -->
-	<!-- IF (albumrow.S_IS_CAT and not albumrow.S_FIRST_ROW) or albumrow.S_NO_CAT -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF albumrow.S_IS_CAT or albumrow.S_FIRST_ROW or albumrow.S_NO_CAT  -->
-		<div class="forabg">
-			<div class="inner"><span class="corners-top"><span></span></span>
-			<ul class="topiclist">
-				<li class="header">
-					<dl class="icon">
-						<dt><!-- IF albumrow.S_IS_CAT --><a href="{albumrow.U_VIEWALBUM}">{albumrow.ALBUM_NAME}</a><!-- ELSE -->{L_ALBUM}<!-- ENDIF --></dt>
-						<dd class="posts">{L_IMAGES}</dd>
-						<dd class="g_lastimage" style="padding-left: 5px;"><span>{L_LAST_IMAGE}</span></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist forums">
-	<!-- ENDIF -->
-
-	<!-- IF not albumrow.S_IS_CAT -->
-		<li class="row">
-			<dl class="icon" style="background-image: url({albumrow.ALBUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{albumrow.ALBUM_FOLDER_IMG_ALT}">
-					<!-- IF albumrow.ALBUM_IMAGE --><span class="forum-image"><img src="{T_IMAGES_PATH}{albumrow.ALBUM_IMAGE}" alt="{albumrow.ALBUM_NAME}" /></span><!-- ENDIF -->
-					<a href="{albumrow.U_VIEWALBUM}" class="forumtitle"<!-- IF S_PERSONAL_GALLERY and albumrow.ALBUM_COLOUR --> style="color: {albumrow.ALBUM_COLOUR};"<!-- ENDIF -->>{albumrow.ALBUM_NAME}</a><br />
-					{albumrow.ALBUM_DESC}
-					<!-- IF albumrow.MODERATORS --><br /><strong>{albumrow.L_MODERATOR_STR}:</strong> {albumrow.MODERATORS}<!-- ENDIF -->
-					<!-- IF albumrow.SUBALBUMS and albumrow.S_LIST_SUBALBUMS --><br /><strong>{albumrow.L_SUBALBUM_STR}</strong> {albumrow.SUBALBUMS}<!-- ENDIF -->
-				</dt>
-				<dd class="posts">{albumrow.IMAGES} <!-- IF albumrow.UNAPPROVED_IMAGES --> + <span class="reported-images-number">{albumrow.UNAPPROVED_IMAGES}</span><!-- ENDIF --> <dfn>{L_IMAGES}</dfn></dd>
-				<dd class="g_lastimage" style="padding-left: 5px;"><span>
-					<!-- IF albumrow.LAST_IMAGE_TIME -->
-					<!-- IF albumrow.UC_FAKE_THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{albumrow.UC_FAKE_THUMBNAIL}</span><!-- ENDIF -->
-					<dfn>{L_LAST_IMAGE}</dfn> {albumrow.UC_IMAGE_NAME}<br />
-					{L_POST_BY_AUTHOR} {albumrow.LAST_USER_FULL} {albumrow.UC_LASTIMAGE_ICON}<br />
-					{albumrow.LAST_IMAGE_TIME}<!-- ELSE -->{L_NO_IMAGES}<!-- ENDIF --></span>
-				</dd>
-			</dl>
-		</li>
-	<!-- ENDIF -->
-
-	<!-- IF albumrow.S_LAST_ROW -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-<!-- BEGINELSE -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<strong>{L_NO_ALBUMS}</strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- END albumrow -->
\ No newline at end of file
diff --git a/template/gallery/comment_body.html b/template/gallery/comment_body.html
deleted file mode 100644
index 7d94c5b..0000000
--- a/template/gallery/comment_body.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<h2><a href="{U_VIEW_IMAGE}">{IMAGE_NAME}</a></h2>
-
-<!-- IF U_IMAGE -->
-<div class="post bg2">
-	<div class="inner">
-		<span class="corners-top"><span></span></span>
-		<div style="text-align: center; padding: 20px;">
-			<a href="{U_IMAGE}"<!-- IF S_GP_HIGHSLIDE --> class="highslide" onclick="return hs.expand(this)"<!-- ELSEIF S_GP_LYTEBOX --> rel="lytebox" class="image-resize"<!-- ENDIF -->><img src="{U_IMAGE}" alt="{IMAGE_NAME}" title="{IMAGE_NAME}" style="max-height: {IMAGE_RSZ_HEIGHT}px; max-width: {IMAGE_RSZ_WIDTH}px;" /></a></div>
-		<span class="corners-bottom"><span></span></span>
-	</div>
-</div>
-<!-- ENDIF -->
-
-<form id="postform" action="{S_ALBUM_ACTION}" method="post" enctype="multipart/form-data">
-
-<div class="panel" id="postingbox">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3>{L_POST_COMMENT}</h3>
-		<fieldset class="fields1">
-			<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-
-			<!-- IF not S_USER_LOGGED_IN -->
-			<dl>
-				<dt><label for="username">{L_USERNAME}:</label></dt>
-				<dd id="username"><input class="inputbox autowidth" type="text" tabindex="1" name="username" value="{USERNAME}" size="60" maxlength="32" /></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF S_ALLOWED_TO_RATE -->
-				<dl>
-					<dt><label>{L_YOUR_RATING}:</label></dt>
-					<dd>
-					<!-- IF .rate_scale -->
-						<select name="rating">
-						<!-- BEGIN rate_scale -->
-							<!-- IF rate_scale.RATE_POINT == 1 --><option value="0">{L_DONT_RATE_IMAGE}</option><!-- ENDIF -->
-							<option value="{rate_scale.RATE_POINT}">{rate_scale.RATE_POINT}</option>
-						<!-- END rate_scale -->
-						</select>
-					<!-- ELSE -->
-						{CONTEST_RATING}
-					<!-- ENDIF -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- IF CAPTCHA_TEMPLATE -->
-				<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-			<!-- ENDIF -->
-
-			<dl>
-				<dt><label for="message">{L_YOUR_COMMENT}:</label></dt>
-			</dl>
-
-			<!-- INCLUDE posting_buttons.html -->
-
-			<div id="smiley-box">
-				<!-- IF S_SMILIES_ALLOWED and .smiley -->
-					<strong>{L_SMILIES}</strong><br />
-					<!-- BEGIN smiley -->
-						<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
-					<!-- END smiley -->
-				<!-- ENDIF -->
-				<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-					<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
-				<!-- ENDIF -->
-
-				<!-- IF BBCODE_STATUS -->
-					<!-- IF .smiley --><hr /><!-- ENDIF -->
-					{BBCODE_STATUS}<br />
-					<!-- IF S_BBCODE_ALLOWED -->
-						{IMG_STATUS}<br />
-						{FLASH_STATUS}<br />
-						{URL_STATUS}<br />
-						{SMILIES_STATUS}<hr />
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				{L_COMMENT_LENGTH}
-			</div>
-
-			<div id="message-box">
-				<textarea name="message" id="message" rows="7" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" class="inputbox">{MESSAGE}</textarea>
-			</div>
-
-			<div><label for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label></div>
-
-		</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}{S_CAPTCHA_HIDDEN_FIELDS}
-			<input type="reset" accesskey="r" tabindex="200" value="{L_RESET}" class="button2" />&nbsp;
-			<input type="submit" accesskey="s" tabindex="201" name="submit" value="{L_SUBMIT}" class="button1" />&nbsp;
-		</fieldset>
-		{S_FORM_TOKEN}
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/gallery_footer.html b/template/gallery/gallery_footer.html
deleted file mode 100644
index 175611c..0000000
--- a/template/gallery/gallery_footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-	I request you retain the full copyright notice below including the link to www.flying-bits.org.
-	This not only gives respect to the large amount of time given freely by the developer
-	but also helps build interest, traffic and use of phpBB Gallery. If you (honestly) cannot retain
-	the full copyright I ask you at least leave in place the "Powered by phpBB Gallery" line, with
-	"phpBB Gallery" linked to www.flying-bits.org. If you refuse to include even this then support on my
-	forums may be affected.
-
-	phpBB Gallery, nickvergessen : 2009
-//-->
-<!-- IF S_IN_GALLERY_POPUP -->
-
-	<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-	<!-- INCLUDE simple_footer.html -->
-
-<!-- ELSE -->
-	<div class="copyright">
-		Powered by <a href="http://www.flying-bits.org/">phpBB Gallery</a> &copy; 2007, 2009 <a href="http://www.flying-bits.org/">nickvergessen</a>
-		<!-- IF GALLERY_TRANSLATION_INFO --><br />{GALLERY_TRANSLATION_INFO}<!-- ENDIF -->
-	</div>
-
-	<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/template/gallery/gallery_header.html b/template/gallery/gallery_header.html
deleted file mode 100644
index 54c74da..0000000
--- a/template/gallery/gallery_header.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- IF S_IN_GALLERY_POPUP -->
-	<!-- INCLUDE simple_header.html -->
-
-	<div class="navbar">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<ul class="linklist">
-			<li>
-				<a href="{U_POPUP_OWN}">{L_OWN_IMAGES}</a> &bull;
-				<a href="{U_POPUP_RECENT}">{L_RECENT_IMAGES}</a>
-				<!-- IF U_POPUP_UPLOAD --> &bull; <a href="{U_POPUP_UPLOAD}">{L_UPLOAD_IMAGE}</a><!-- ENDIF -->
-			</li>
-		</ul>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<script type="text/javascript">
-	// <![CDATA[
-	function insert_image(image_id, field_id)
-	{
-		opener.document.forms['postform'].message.value += '[album]' + image_id +'[/album]';
-		document.getElementById('inserted_' + field_id).style.display = 'block';
-	}
-	// ]]>
-	</script>
-
-<!-- ELSE -->
-	<!-- INCLUDE overall_header.html -->
-
-	<!-- IF GALLERY_VERSION_CHECK and U_ACP --> 
-	<div id="gallery_version_check" class="rules">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			<strong>{L_INFORMATION}:</strong> {GALLERY_VERSION_CHECK}<!-- IF U_MVC_IGNORE --> [ <a href="{U_MVC_IGNORE}">{L_IGNORE_NOTUPTODATE_MESSAGE}</a> ]<!-- ENDIF -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/template/gallery/imageblock_body.html b/template/gallery/imageblock_body.html
deleted file mode 100644
index 3cd1717..0000000
--- a/template/gallery/imageblock_body.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- BEGIN imageblock -->
-<div class="forumbg">
-	<div class="inner">
-		<span class="corners-top"><span></span></span>
-		<ul class="topiclist">
-			<li class="header">
-				<dl class="icon">
-					<dt><!-- IF imageblock.U_BLOCK --><a href="{imageblock.U_BLOCK}">{imageblock.BLOCK_NAME}</a><!-- ELSE -->{imageblock.BLOCK_NAME}<!-- ENDIF --></dt>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist topics">
-			<li class="bg2">
-				<table width="100%" cellpadding="2" cellspacing="10" border="0" class="forumline">
-					<!-- BEGIN imagerow -->
-					<tr>
-						<!-- BEGIN image -->
-						<td class="bg2" valign="top" style="width: {imageblock.S_COL_WIDTH};">
-							<table width="100%" cellpadding="2" cellspacing="5" border="0" class="forumline">
-								<tr>
-									<td align="center" style="height: {S_THUMBNAIL_SIZE}px;" class="bg1<!-- IF imageblock.imagerow.image.S_UNAPPROVED --> g_unapproved<!-- ENDIF --><!-- IF imageblock.imagerow.image.S_LOCKED --> g_locked<!-- ENDIF --><!-- IF imageblock.imagerow.image.S_REPORTED --> g_reported<!-- ENDIF -->">
-										<span class="genmed">{imageblock.imagerow.image.UC_THUMBNAIL}</span>
-									</td>
-								</tr>
-								<tr>
-									<td class="bg2" valign="top">
-										<div class="gensmall" style="overflow: hidden;">
-											<!-- IF imageblock.imagerow.image.CONTEST_RANK -->{L_CONTEST_RESULT}: <strong>{imageblock.imagerow.image.CONTEST_RANK}</strong><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.UC_IMAGE_NAME -->{L_IMAGE_NAME}: {imageblock.imagerow.image.UC_IMAGE_NAME}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.U_ALBUM -->{L_ALBUM_NAME}: <a href="{imageblock.imagerow.image.U_ALBUM}" style="font-weight: bold;" title="{imageblock.imagerow.image.ALBUM_NAME_FULL}">{imageblock.imagerow.image.ALBUM_NAME}</a><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.POSTER -->{L_UPLOADED_BY_USER}: {imageblock.imagerow.image.POSTER}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.TIME -->{L_UPLOADED_ON_DATE}: {imageblock.imagerow.image.TIME}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.VIEW > -1 -->{L_GALLERY_VIEWS}: {imageblock.imagerow.image.VIEW}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.S_RATINGS -->{L_RATING}: <a href="{imageblock.imagerow.image.U_RATINGS}">{imageblock.imagerow.image.S_RATINGS}</a><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.S_COMMENTS -->{imageblock.imagerow.image.L_COMMENTS}: <a href="{imageblock.imagerow.image.U_COMMENTS}">{imageblock.imagerow.image.S_COMMENTS}</a><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.S_IP -->{L_IP}: {imageblock.imagerow.image.S_IP} &#187; <a href="{imageblock.imagerow.image.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.U_REPORT or imageblock.imagerow.image.U_STATUS or imageblock.imagerow.image.U_MOVE or  imageblock.imagerow.image.U_EDIT or imageblock.imagerow.image.U_DELETE -->
-											<a href="javascript: dE('moderate_imageblock_{imageblock.S_ROW_COUNT}_imagerow_{imageblock.imagerow.image.IMAGE_ID}');">{L_MODERATE}</a>
-											<div id="moderate_imageblock_{imageblock.S_ROW_COUNT}_imagerow_{imageblock.imagerow.image.IMAGE_ID}" style="display: none;">
-												<!-- IF imageblock.imagerow.image.U_REPORT -->&#187; <a href="{imageblock.imagerow.image.U_REPORT}" class="reported-images-number">{L_READ_REPORT}</a><br /><!-- ENDIF -->
-												<!-- IF imageblock.imagerow.image.U_STATUS -->&#187; <a href="{imageblock.imagerow.image.U_STATUS}">{imageblock.imagerow.image.L_STATUS}</a><br /><!-- ENDIF -->
-												<!-- IF imageblock.imagerow.image.U_MOVE -->&#187; <a href="{imageblock.imagerow.image.U_MOVE}">{L_MOVE}</a><br /><!-- ENDIF -->
-												<!-- IF imageblock.imagerow.image.U_EDIT -->&#187; <a href="{imageblock.imagerow.image.U_EDIT}">{L_EDIT_IMAGE}</a><br /><!-- ENDIF -->
-												<!-- IF imageblock.imagerow.image.U_DELETE -->&#187; <a href="{imageblock.imagerow.image.U_DELETE}">{L_DELETE_IMAGE}</a><br /><!-- ENDIF -->
-											</div>
-											<!-- ENDIF -->
-										</div>
-									</td>
-								</tr>
-							</table>
-						</td>
-						<!-- END image -->
-						<!-- BEGIN no_image --> 
-							<td class="bg2" valign="top" style="width: {imageblock.S_COL_WIDTH};">
-								<table width="100%" cellpadding="2" cellspacing="10" border="0" class="forumline"><tr>
-								<td style="height: {S_THUMBNAIL_SIZE}px;" class="bg1"></td>
-								</tr></table>
-							</td> 
-						<!-- END no_image -->
-					</tr>
-					<!-- END imagerow -->
-				</table>
-			</li>
-		</ul>
-		<span class="corners-bottom"><span></span></span>
-	</div>
-</div>
-<!-- END imageblock -->
\ No newline at end of file
diff --git a/template/gallery/imageblock_popup.html b/template/gallery/imageblock_popup.html
deleted file mode 100644
index 3854030..0000000
--- a/template/gallery/imageblock_popup.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- BEGIN imageblock -->
-<div class="forumbg">
-	<div class="inner">
-		<span class="corners-top"><span></span></span>
-		<ul class="topiclist">
-			<li class="header">
-				<dl class="icon">
-					<dt>{imageblock.BLOCK_NAME}</dt>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist topics">
-			<li class="bg2">
-				<table width="100%" cellpadding="2" cellspacing="10" border="0" class="forumline">
-					<!-- BEGIN imagerow -->
-					<tr>
-						<!-- BEGIN image -->
-						<td class="bg2" valign="top" style="width: {imageblock.S_COL_WIDTH};">
-							<table width="100%" cellpadding="2" cellspacing="5" border="0" class="forumline">
-								<tr>
-									<td align="center" style="height: {S_THUMBNAIL_SIZE}px;" class="bg1">
-										<span class="genmed">{imageblock.imagerow.image.UC_THUMBNAIL}</span>
-									</td>
-								</tr>
-								<tr>
-									<td class="bg2" valign="top">
-										<div class="gensmall" style="overflow: hidden;">
-											<!-- IF imageblock.imagerow.image.UC_IMAGE_NAME -->{L_IMAGE_NAME}: {imageblock.imagerow.image.UC_IMAGE_NAME}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.U_ALBUM -->{L_ALBUM_NAME}: <a href="{imageblock.imagerow.image.U_ALBUM}" style="font-weight: bold;" title="{imageblock.imagerow.image.ALBUM_NAME_FULL}">{imageblock.imagerow.image.ALBUM_NAME}</a><br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.POSTER -->{L_UPLOADED_BY_USER}: {imageblock.imagerow.image.POSTER}<br /><!-- ENDIF -->
-											<!-- IF imageblock.imagerow.image.TIME -->{L_UPLOADED_ON_DATE}: {imageblock.imagerow.image.TIME}<br /><!-- ENDIF -->
-											<span style="display: none;" id="inserted_{imageblock.S_ROW_COUNT}_{imageblock.imagerow.S_ROW_COUNT}_{imageblock.imagerow.image.S_ROW_COUNT}">[ {L_IMAGE_INSERTED} ]<br /></span>
-											<input type="button" class="button2" name="gallery_button" value="{L_INSERT_IMAGE_POST}" onclick="insert_image({imageblock.imagerow.image.IMAGE_ID}, '{imageblock.S_ROW_COUNT}_{imageblock.imagerow.S_ROW_COUNT}_{imageblock.imagerow.image.S_ROW_COUNT}');" title="{L_INSERT_IMAGE_POST}" />
-										</div>
-									</td>
-								</tr>
-							</table>
-						</td>
-						<!-- END image -->
-						<!-- BEGIN no_image --> 
-							<td class="bg2" valign="top" style="width: {imageblock.S_COL_WIDTH};">
-								<table width="100%" cellpadding="2" cellspacing="10" border="0" class="forumline"><tr>
-								<td style="height: {S_THUMBNAIL_SIZE}px;" class="bg1"></td>
-								</tr></table>
-							</td> 
-						<!-- END no_image -->
-					</tr>
-					<!-- END imagerow -->
-				</table>
-			</li>
-		</ul>
-		<span class="corners-bottom"><span></span></span>
-	</div>
-</div>
-<!-- END imageblock -->
\ No newline at end of file
diff --git a/template/gallery/index.htm b/template/gallery/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/template/gallery/index_body.html b/template/gallery/index_body.html
deleted file mode 100644
index 28eca01..0000000
--- a/template/gallery/index_body.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<p class="{S_CONTENT_FLOW_END}<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP --><p>{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p>{CURRENT_TIME}</p><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
-<ul class="linklist">
-	<!-- IF S_DISPLAY_SEARCH -->
-		<li><a href="{U_G_SEARCH_RECENT}">{L_VIEW_SEARCH_RECENT}</a> &bull; <a href="{U_G_SEARCH_RANDOM}">{L_VIEW_SEARCH_RANDOM}</a><!-- IF U_G_SEARCH_COMMENTED --> &bull; <a href="{U_G_SEARCH_COMMENTED}">{L_VIEW_SEARCH_COMMENTED}</a><!-- ENDIF --><!-- IF U_G_SEARCH_TOPRATED --> &bull; <a href="{U_G_SEARCH_TOPRATED}">{L_VIEW_SEARCH_TOPRATED}</a><!-- ENDIF --><!-- IF U_G_SEARCH_CONTESTS --> &bull; <a href="{U_G_SEARCH_CONTESTS}">{L_VIEW_SEARCH_CONTESTS}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_G_SEARCH_SELF}">{L_VIEW_SEARCH_SELF}</a><!-- ENDIF --></li>
-		<li class="rightside"><a href="{U_GALLERY_SEARCH}">{L_SEARCH}</a></li>
-	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_ALBUMS --><li class="rightside"><a href="{U_MARK_ALBUMS}" accesskey="m">{L_MARK_ALBUMS_READ}</a><!-- IF S_DISPLAY_SEARCH --> &bull; <!-- ENDIF --></li><!-- ENDIF -->
-</ul>
-<!-- ENDIF -->
-
-<!-- IF S_PERSONAL_GALLERY and U_USERS_PERSONAL_GALLERIES -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<ul class="linklist">
-			<li>
-				<strong style="font-size: 0.95em;">
-				<!-- IF U_YOUR_PERSONAL_GALLERY --><a href="{U_YOUR_PERSONAL_GALLERY}">{L_YOUR_PERSONAL_ALBUM}</a>&nbsp;&laquo;&nbsp;<!-- ENDIF -->
-				<a href="{U_USERS_PERSONAL_GALLERIES}">{L_ALL}</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=a">A</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=b">B</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=c">C</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=d">D</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=e">E</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=f">F</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=g">G</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=h">H</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=i">I</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=j">J</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=k">K</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=l">L</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=m">M</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=n">N</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=o">O</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=p">P</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=q">Q</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=r">R</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=s">S</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=t">T</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=u">U</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=v">V</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=w">W</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=x">X</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=y">Y</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=z">Z</a>&nbsp;
-				<a href="{U_USERS_PERSONAL_GALLERIES}&amp;first_char=other">#</a></strong>
-			</li>
-		</ul>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/albumlist_body.html -->
-
-<!-- IF S_PERSONAL_GALLERY -->
-	<div class="topic-actions">
-		<div class="pagination">{TOTAL_PGALLERIES_SHORT}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ENDIF --></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_USERS_PERSONAL_GALLERIES --><h4><!-- IF S_PERSONAL_GALLERY --><a href="{U_GALLERY_MOD}">{L_GALLERY}</a>&nbsp;&lsaquo;&nbsp;{L_USERS_PERSONAL_ALBUMS}<!-- ELSE -->{L_GALLERY}&nbsp;&lsaquo;&nbsp;<a href="{U_USERS_PERSONAL_GALLERIES}">{L_USERS_PERSONAL_ALBUMS}</a><!-- ENDIF --><!-- IF U_YOUR_PERSONAL_GALLERY -->&nbsp;&raquo;&nbsp;<a href="{U_YOUR_PERSONAL_GALLERY}">{L_YOUR_PERSONAL_ALBUM}</a><!-- ENDIF --></h4><br /><!-- ENDIF -->
-
-<!-- INCLUDE gallery/recent_body.html -->
-
-<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT and S_DISP_LOGIN -->
-	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
-	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
-		<fieldset class="quick-login">
-			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />
-			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
-			<!-- IF S_AUTOLOGIN_ENABLED -->
-				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
-			<!-- ENDIF -->
-			<input type="submit" name="login" value="{L_LOGIN}" class="button2" />
-		</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST and S_DISP_WHOISONLINE -->
-	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
-	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
-	<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST -->
-	<h3>{L_BIRTHDAYS}</h3>
-	<p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>
-<!-- ENDIF -->
-
-<!-- IF TOTAL_IMAGES -->
-	<h3>{L_STATISTICS}</h3>
-	<p>{TOTAL_IMAGES}<!-- IF TOTAL_COMMENTS --> &bull; {TOTAL_COMMENTS}<!-- ENDIF --><!-- IF TOTAL_PGALLERIES --> &bull; {TOTAL_PGALLERIES}<!-- IF NEWEST_PGALLERIES --> &bull; {NEWEST_PGALLERIES}<!-- ENDIF --><!-- ENDIF --></p>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/mcp_body.html b/template/gallery/mcp_body.html
deleted file mode 100644
index edf272d..0000000
--- a/template/gallery/mcp_body.html
+++ /dev/null
@@ -1,331 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<h2>{L_MCP}</h2>
-
-<!-- IF not S_MOVING_IMAGES and not S_MODE_OVERVIEW -->
-<p class="linkmcp">
-	[ <a href="{U_VIEW_ALBUM}">{ALBUM_NAME}</a> | <a href="{U_MOD_ALBUM}">{L_MODERATE_ALBUM}</a> | <a href="{U_MCP_OVERVIEW}">{L_GALLERY_MCP_OVERVIEW}</a> ]
-</p>
-
-<div id="tabs">
-	<ul>
-		<!-- BEGIN tabs -->
-			<li <!-- IF tabs.TAB_ACTIVE --> class="activetab"<!-- ENDIF -->><a href="{tabs.U_TAB}"><span>{tabs.TAB_NAME}</span></a></li>
-		<!-- END tabs -->
-	</ul>
-</div>
-
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div style="width: 100%;">
-	<div id="cp-menu">
-		<div id="navigation">
-			<ul>
-				<!-- BEGIN tabs -->
-					<!-- BEGIN modes -->
-						<li <!-- IF tabs.modes.MODE_ACTIVE --> id="active-subsection"<!-- ENDIF -->><a href="{tabs.modes.U_MODE}"><span>{tabs.modes.MODE_NAME}</span></a></li>
-					<!-- END modes -->
-				<!-- END tabs -->
-			</ul>
-		</div>
-	</div>
-
-	<div id="cp-main" class="mcp-main">
-	<h2>{SUBSECTION} - <a href="{U_VIEW_ALBUM}">{L_ALBUM}: {ALBUM_NAME}</a></h2>
-
-	<!-- IF S_GALLERY_MCP_VIEWALBUM or S_QUEUE_LIST or S_REPORT_LIST -->
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<!-- IF TITLE --><h3>{TITLE}</h3><!-- ENDIF -->
-			<!-- IF DESCRIPTION --><p>{DESCRIPTION}</p><!-- ENDIF -->
-
-			<form method="post" id="mcp" action="{S_MCP_ACTION}">
-			<!-- IF .image_row -->
-				<ul class="topiclist">
-					<li class="header">
-						<dl>
-							<dt>{L_IMAGES}</dt>
-							<!-- IF S_COMMENTS --><dd class="g_comments">{L_COMMENTS}</dd><!-- ENDIF -->
-							<!-- IF S_RATINGS --><dd class="g_rating">{L_RATING}</dd><!-- ENDIF -->
-							<!-- IF S_REPORTER --><dd class="moderation"><span>{L_REPORTER_AND_ALBUM}</span></dd><!-- ENDIF -->
-							<!-- IF S_STATUS --><dd class="g_status">{L_STATUS}</dd><!-- ENDIF -->
-							<!-- IF S_MARK --><dd class="mark">{L_MARK}</dd><!-- ENDIF -->
-						</dl>
-					</li>
-				</ul>
-
-				<ul class="topiclist cplist">
-				<!-- BEGIN image_row -->
-					<li class="row<!-- IF image_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF image_row.S_REPORTED --> reported<!-- ENDIF -->">
-						<dl>
-							<dt>
-								<!-- IF DISP_FAKE_THUMB and image_row.THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{image_row.THUMBNAIL}</span><!-- ENDIF -->
-								<a href="<!-- IF not S_REPORT -->{image_row.U_IMAGE_PAGE}<!-- ELSE -->{image_row.U_REPORT}<!-- ENDIF -->" class="topictitle">{image_row.IMAGE_NAME}</a><!-- IF image_row.S_REPORTED --> <a href="{image_row.U_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><!-- IF image_row.S_UNAPPROVED --> <a href="{image_row.U_QUEUE}">{UNAPPROVED_IMG}</a><!-- ENDIF --><br />
-								<span>{L_POST_BY_AUTHOR} {image_row.UPLOADER}<br />
-								&raquo; {image_row.IMAGE_TIME}
-								<!-- IF image_row.REPORT_MOD --><br />{L_REPORT_MOD} {image_row.REPORT_MOD}<!-- ENDIF --></span>
-							</dt>
-							<!-- IF S_COMMENTS --><dd class="g_comments">{image_row.COMMENTS}</dd><!-- ENDIF -->
-							<!-- IF S_RATINGS --><dd class="g_rating">{image_row.RATING}</dd><!-- ENDIF -->
-							<!-- IF S_REPORTER -->
-								<dd class="moderation">
-									<span>{L_REPORT_BY} {image_row.REPORTER}<br />
-									{image_row.REPORT_TIME}<br />
-									{L_ALBUM}: <a href="{U_VIEW_ALBUM}" style="font-weight: bold;">{ALBUM_NAME}</a></span>
-								</dd>
-							<!-- ENDIF -->
-							<!-- IF S_STATUS --><dd class="g_status">{image_row.STATUS}<!-- IF image_row.S_REPORTED --><br />{L_IMAGE_REPORTED}<!-- ENDIF --></dd><!-- ENDIF -->
-							<!-- IF S_MARK --><dd class="mark"><input type="checkbox" name="image_id_ary[]" value="<!-- IF not S_REPORT_LIST -->{image_row.IMAGE_ID}<!-- ELSE -->{image_row.REPORT_ID}<!-- ENDIF -->" /></dd><!-- ENDIF -->
-						</dl>
-					</li>
-				<!-- END image_row -->
-				</ul>
-
-				<fieldset class="display-options">
-					<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-					<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-					<label>{L_SORT_BY} 
-						<select name="sk">
-							<option<!-- IF S_SORT_KEY == 'image_time' --> selected="selected"<!-- ENDIF --> value='image_time'>{L_TIME}</option>
-							<option<!-- IF S_SORT_KEY == 'image_name' --> selected="selected"<!-- ENDIF --> value='image_name'>{L_IMAGE_NAME}</option>
-							<option<!-- IF S_SORT_KEY == 'image_username' --> selected="selected"<!-- ENDIF --> value='image_username'>{L_SORT_USERNAME}</option>
-							<!-- IF not S_REPORT_LIST or S_QUEUE_LIST -->
-								<option<!-- IF S_SORT_KEY == 'image_view_count' --> selected="selected"<!-- ENDIF --> value='image_view_count'>{L_GALLERY_VIEWS}</option>
-							<!-- ENDIF -->
-							<!-- IF S_REPORT_LIST -->
-								<option<!-- IF S_SORT_KEY == 'reporter_name' --> selected="selected"<!-- ENDIF --> value='reporter_name'>{L_REPORTER}</option>
-								<option<!-- IF S_SORT_KEY == 'mod_username' --> selected="selected"<!-- ENDIF --> value='mod_username'>{L_MODERATOR}</option>
-							<!-- ENDIF -->
-							<!-- IF S_RATINGS -->
-								<option<!-- IF S_SORT_KEY == 'image_rate_avg' --> selected="selected"<!-- ENDIF --> value='image_rate_avg'>{L_RATING}</option>
-							<!-- ENDIF -->
-							<!-- IF S_COMMENTS -->
-								<option<!-- IF S_SORT_KEY == 'image_comments' --> selected="selected"<!-- ENDIF --> value='image_comments'>{L_COMMENTS}</option>
-								<option<!-- IF S_SORT_KEY == 'image_last_comment' --> selected="selected"<!-- ENDIF --> value='image_last_comment'>{L_LAST_COMMENT}</option>
-							<!-- ENDIF -->
-						</select>
-					</label> 
-					<label>
-						<select name="sd">
-							<option<!-- IF S_SORT_DESC --> selected="selected"<!-- ENDIF --> value='DESC'>{L_SORT_DESCENDING}</option>
-							<option<!-- IF not S_SORT_DESC --> selected="selected"<!-- ENDIF --> value='ASC'>{L_SORT_ASCENDING}</option>
-						</select>
-					<input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-				</fieldset>
-			<!-- ELSE -->
-				<!-- IF NO_IMAGES_NOTE -->
-				<ul class="topiclist">
-					<li><p class="notopics">{NO_IMAGES_NOTE}</p></li>
-				</ul>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF PAGINATION or TOTAL_IMAGES -->
-				<hr />
-				<ul class="linklist">
-					<li class="rightside pagination">
-						<!-- IF TOTAL_IMAGES --> {TOTAL_IMAGES}<!-- ENDIF -->
-						<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-					</li>
-				</ul>
-			<!-- ENDIF -->
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-		<fieldset class="display-actions">
-			<select name="action">
-				<option value="" selected="selected">{L_CHOOSE_ACTION}</option>
-				<!-- IF S_ALLOWED_MOVE and not S_REPORT_LIST and not S_QUEUE_LIST -->
-					<option value="images_move">{L_QUEUES_A_MOVE}</option>
-				<!-- ENDIF -->
-				<!-- IF S_ALLOWED_STATUS and not S_REPORT_LIST -->
-					<option value="images_unapprove">{L_QUEUE_A_UNAPPROVE}</option>
-					<option value="images_approve">{L_QUEUE_A_APPROVE}</option>
-					<option value="images_lock">{L_QUEUE_A_LOCK}</option>
-				<!-- ENDIF -->
-				<!-- IF S_ALLOWED_DELETE and not S_REPORT_LIST -->
-					<option value="images_delete">{L_QUEUE_A_DELETE}</option>
-				<!-- ENDIF -->
-				<!-- IF S_ALLOWED_REPORT and S_REPORT_LIST -->
-					<option value="reports_close">{L_REPORT_A_CLOSE}</option>
-					<option value="reports_open">{L_REPORT_A_OPEN}</option>
-					<option value="reports_delete">{L_REPORT_A_DELETE}</option>
-				<!-- ENDIF -->
-			</select>
-			<input class="button2" type="submit" value="{L_SUBMIT}" />
-			<div><a href="#" onclick="marklist('mcp', 'image_id_ary', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'image_id_ary', false); return false;">{L_UNMARK_ALL}</a></div>
-		</fieldset>
-		</form>
-
-	<!-- ENDIF -->
-
-	<!-- IF S_GALLERY_MCP_REPO_DETAIL or S_GALLERY_MCP_QUEUE_DETAIL -->
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="postbody">
-				<ul class="profile-icons">
-					<li class="edit-icon"><a href="{U_EDIT_IMAGE}" title="{L_EDIT_IMAGE}"><span>{L_EDIT_IMAGE}</span></a></li>
-					<li class="delete-icon"><a href="{U_DELETE_IMAGE}" title="{L_DELETE_IMAGE}"><span>{L_DELETE_IMAGE}</span></a></li>
-				</ul>
-				<h3>{IMAGE_NAME}</h3>
-				<p class="author">
-					{L_POST_BY_AUTHOR} {UPLOADER}<br />
-					{IMAGE_TIME}<br />
-					{L_ALBUM}: <a href="{U_VIEW_ALBUM}" style="font-weight: bold;">{ALBUM_NAME}</a><!-- IF U_MOVE_IMAGE --> &raquo; <a href="{U_MOVE_IMAGE}" style="font-weight: bold;">{L_MOVE}</a><!-- ENDIF --><br />
-					{L_STATUS}: <span style="font-weight: bold;">{STATUS}</span>
-				</p>
-
-				<div class="content">
-					<div style="text-align: center; padding: 20px;">{UC_IMAGE}</div>
-					<!-- IF IMAGE_DESC -->
-						<hr />
-						<span style="font-weight: bold;">{L_IMAGE_DESC}:</span><br />
-						{IMAGE_DESC}
-					<!-- ENDIF -->
-				</div>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-
-		<!-- IF S_GALLERY_MCP_REPO_DETAIL -->
-			<div id="report" class="panel">
-				<div class="inner"><span class="corners-top"><span></span></span>
-
-				<div class="postbody">
-					<p class="author">{L_REPORT_BY} {REPORTER} &raquo; {REPORT_TIME}</p>
-					<div class="content">{REPORT_NOTE}</div>
-				</div>
-
-				<span class="corners-bottom"><span></span></span></div>
-			</div>
-		<!-- ENDIF -->
-
-		<form method="post" action="{S_MCP_ACTION}">
-			<fieldset class="submit-buttons">
-				<select name="action">
-					<option value="" selected="selected">{L_CHOOSE_ACTION}</option>
-					<!-- IF S_GALLERY_MCP_QUEUE_DETAIL -->
-						<!-- IF IMAGE_STATUS == 0 -->
-							<option value="images_approve">{L_QUEUE_A_APPROVE}</option>
-							<option value="images_lock">{L_QUEUE_A_LOCK}</option>
-						<!-- ELSEIF IMAGE_STATUS == 1 -->
-							<option value="images_unapprove">{L_QUEUE_A_UNAPPROVE}</option>
-							<option value="images_lock">{L_QUEUE_A_LOCK}</option>
-						<!-- ELSE -->
-							<option value="images_unapprove">{L_QUEUE_A_UNAPPROVE}</option>
-							<option value="images_approve">{L_QUEUE_A_APPROVE}</option>
-						<!-- ENDIF -->
-						<option value="images_delete">{L_QUEUE_A_DELETE}</option>
-					<!-- ELSE -->
-						<!-- IF REPORT_STATUS -->
-							<option value="reports_close">{L_REPORT_A_CLOSE}</option>
-						<!-- ELSE -->
-							<option value="reports_open">{L_REPORT_A_OPEN}</option>
-						<!-- ENDIF -->
-						<option value="reports_delete">{L_REPORT_A_DELETE}</option>
-					<!-- ENDIF -->
-				</select>
-				<input class="button2" type="submit" value="{L_SUBMIT}" />
-				<input type="hidden" value="{REPORT_ID}" name="image_id_ary[{REPORT_ID}]" />
-			</fieldset>
-		</form>
-	<!-- ENDIF -->
-	</div>
-	<div class="clear"></div>
-
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ELSEIF S_MODE_OVERVIEW -->
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div style="width: 100%;">
-	<div id="cp-menu">&nbsp;</div>
-
-	<div id="cp-main" class="mcp-main">
-	<h2>{SUBSECTION}</h2>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_LATEST_IMAGES_UNAPPROVED}</h3>
-
-		<!-- IF .queue_row -->
-		<ul class="topiclist cplist">
-			<!-- BEGIN queue_row -->
-			<li class="row<!-- IF queue_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						<!-- IF DISP_FAKE_THUMB and queue_row.THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{queue_row.THUMBNAIL}</span><!-- ENDIF -->
-						<a href="{queue_row.U_IMAGE_PAGE}" class="topictitle">{queue_row.IMAGE_NAME} {UNAPPROVED_IMG}</a><br />
-						<span>{L_POST_BY_AUTHOR} {queue_row.UPLOADER}<br />
-						&raquo; {queue_row.IMAGE_TIME}</span>
-					</dt>
-				</dl>
-			</li>
-			<!-- END queue_row -->
-		</ul>
-		<!-- ELSE -->
-			<strong>{NO_UNAPPROVED_IMAGE}</strong>
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_LATEST_IMAGES_REPORTED}</h3>
-
-		<!-- IF .report_row -->
-		<ul class="topiclist cplist">
-			<!-- BEGIN report_row -->
-			<li class="row<!-- IF report_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt>
-					<!-- IF DISP_FAKE_THUMB and report_row.THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{report_row.THUMBNAIL}</span><!-- ENDIF -->
-					<a href="<!-- IF not S_REPORT -->{report_row.U_IMAGE_PAGE}<!-- ELSE -->{report_row.U_REPORT}<!-- ENDIF -->" class="topictitle">{report_row.IMAGE_NAME}</a><!-- IF report_row.S_REPORTED --> <a href="{report_row.U_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><!-- IF report_row.S_UNAPPROVED --> <a href="{report_row.U_QUEUE}">{UNAPPROVED_IMG}</a><!-- ENDIF --><br />
-					<span>{L_POST_BY_AUTHOR} {report_row.UPLOADER}<br />
-					&raquo; {report_row.IMAGE_TIME}
-					<!-- IF report_row.REPORT_MOD --><br />{L_REPORT_MOD} {report_row.REPORT_MOD}<!-- ENDIF --></span>
-				</dt>
-				<dd class="moderation">
-					<span>{L_REPORT_BY} {report_row.REPORTER}<br />
-					{report_row.REPORT_TIME}
-				</dd>
-			</dl>
-			</li>
-			<!-- END report_row -->
-		</ul>
-		<!-- ELSE -->
-			<strong>{NO_REPORTED_IMAGE}</strong>
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	</div>
-	<div class="clear"></div>
-
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ELSE -->
-<form method="post" id="mcp" action="{S_MCP_ACTION}">
-<div class="panel" id="message">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h2>{L_MOVE}</h2>
-		<p>
-			{L_MOVE_TO_ALBUM} &nbsp; {S_ALBUM_SELECT} &nbsp;
-			<input class="button2" type="submit" name="move" value="{L_MOVE}" />
-			{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-		</p>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/plugins_header.html b/template/gallery/plugins_header.html
deleted file mode 100644
index 2f3c374..0000000
--- a/template/gallery/plugins_header.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- IF S_GALLERY_FEEDS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_GALLERY}" href="{U_GALLERY_FEED}" /><!-- ENDIF -->
-<!-- IF S_GALLERY_FEEDS and S_ENABLE_FEEDS_ALBUM and ALBUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALBUM} - {ALBUM_NAME}" href="{U_GALLERY_FEED}?album_id={ALBUM_ID}" /><!-- ENDIF -->
-
-<!-- IF S_GP_HIGHSLIDE -->
-	<script type="text/javascript" src="{S_GP_HIGHSLIDE}highslide-full.js"></script>
-	<link rel="stylesheet" type="text/css" href="{S_GP_HIGHSLIDE}highslide.css" />
-	<script type="text/javascript">
-		hs.graphicsDir = '{S_GP_HIGHSLIDE}graphics/';
-		hs.align = 'center';
-		hs.transitions = ['expand', 'crossfade'];
-		hs.fadeInOut = true;
-		hs.dimmingOpacity = 0.8;
-		hs.outlineType = 'rounded-white';
-		hs.captionEval = 'this.thumb.title';
-		// This value needs to be set to false, to solve the issue with the highly increasing view counts.
-		hs.continuePreloading = false;
-
-		// Add the slideshow providing the controlbar and the thumbstrip
-		hs.addSlideshow({
-			interval: 5000,
-			repeat: false,
-			useControls: true,
-			fixedControls: 'fit',
-			overlayOptions: {
-				opacity: .75,
-				position: 'top center',
-				hideOnMouseOut: true
-			}
-		});
-	</script>
-<!-- ENDIF -->
-<!-- IF S_GP_LYTEBOX -->
-	<script type="text/javascript" src="{S_GP_LYTEBOX}lytebox.js"></script>
-	<link rel="stylesheet" type="text/css" href="{S_GP_LYTEBOX}lytebox.css" />
-	<script type="text/javascript">
-		if (window.addEventListener) {
-			window.addEventListener("load",initLytebox,false);
-		} else if (window.attachEvent) {
-			window.attachEvent("onload",initLytebox);
-		} else {
-			window.onload = function() {initLytebox();}
-		}
-		function initLytebox() {
-			var imgMaxWidth = 1280;
-			var imgWarning = '';
-			myLytebox = new LyteBox(imgMaxWidth, imgWarning);
-		}
-	</script>
-<!-- ENDIF -->
-<!-- IF S_GP_SHADOWBOX -->
-	<script type="text/javascript" src="{S_GP_SHADOWBOX}shadowbox.js"></script>
-	<link rel="stylesheet" type="text/css" href="{S_GP_SHADOWBOX}shadowbox.css" />
-	<script type="text/javascript">
-		Shadowbox.init();
-	</script>
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/template/gallery/posting_body.html b/template/gallery/posting_body.html
deleted file mode 100644
index fc28645..0000000
--- a/template/gallery/posting_body.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<!-- IF S_ALBUM_SELECT -->
-<br />
-<form method="post" id="mcp" action="{S_ALBUM_ACTION}">
-<div class="panel" id="message">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3>{L_UPLOAD_IMAGE}</h3>
-
-		<p>
-			{L_SELECT_ALBUM}: <select name="album_id">{S_ALBUM_SELECT}</select>
-			<input class="button2" type="submit" name="move" value="{L_SUBMIT}" />
-			{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
-		</p>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-<!-- ELSEIF S_UPLOAD -->
-<script type="text/javascript">
-//<![CDATA[
-	var num_displayed_fields = 1;
-	var limit_fields = {S_UPLOAD_LIMIT};
-	function add_field()
-	{
-		if (num_displayed_fields < limit_fields)
-		{
-			dE('upload_field_' + num_displayed_fields);
-			num_displayed_fields++;
-			if (num_displayed_fields == limit_fields)
-			{
-				dE('add_field_link', -1);
-			}
-		}
-	}
-//]]>
-</script>
-
-<h2><a href="{U_VIEW_ALBUM}">{ALBUM_NAME}</a></h2>
-
-<form id="postform" action="{S_ALBUM_ACTION}" method="post" enctype="multipart/form-data">
-
-<div class="panel" id="postingbox">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3>{L_UPLOAD_IMAGE}</h3>
-		<fieldset class="fields1">
-			<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-
-			<!-- IF CAPTCHA_TEMPLATE -->
-				<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_USER_LOGGED_IN -->
-			<dl>
-				<dt><label for="username">{L_USERNAME}:</label></dt>
-				<dd id="username"><input class="inputbox autowidth" type="text" tabindex="1" name="username" value="{USERNAME}" size="60" maxlength="32" /></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF S_COMMENTS_ENABLED -->
-				<dl>
-					<dt><label for="allow_comments">{L_COMMENTS}:</label></dt>
-					<dd><input type="checkbox" class="checkbox" name="allow_comments" id="allow_comments"<!-- IF S_ALLOW_COMMENTS --> checked="checked"<!-- ENDIF --> value="1" /> <label for="allow_comments">{L_ALLOW_COMMENTS}</label></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF CAPTCHA_TEMPLATE or not S_USER_LOGGED_IN or S_COMMENTS_ENABLED --><hr /><!-- ENDIF -->
-			<dl>
-				<dt><label>{L_MAX_DIMENSIONS}:</label></dt>
-				<dd>{L_FILE_SIZE}: {S_MAX_FILESIZE}</dd>
-				<dd>{L_IMAGE_WIDTH}: {S_MAX_WIDTH}</dd>
-				<dd>{L_IMAGE_HEIGHT}: {S_MAX_HEIGHT}</dd>
-			</dl>
-			<dl>
-				<dt><label>{L_ALLOWED_FILETYPES}:</label></dt>
-				<dd>{S_ALLOWED_FILETYPES}</dd>
-			</dl>
-			<hr />
-			<!-- BEGIN upload_image -->
-				<dl id="upload_field_{upload_image.S_ROW_COUNT}">
-					<dt><label for="image_file_{upload_image.S_ROW_COUNT}">{L_FILE}:</label></dt>
-					<dd><input class="inputbox autowidth" type="file" onchange="javascript: add_field();" tabindex="1{upload_image.S_ROW_COUNT}" id="image_file_{upload_image.S_ROW_COUNT}" name="image_file_{upload_image.S_ROW_COUNT}" size="52" /></dd>
-					<!-- IF S_ALLOW_ROTATE -->
-						<dd><input type="radio" name="rotate[{upload_image.S_ROW_COUNT}]" id="rotate_{upload_image.S_ROW_COUNT}_0" value="0" checked="checked" /> <label for="rotate_{upload_image.S_ROW_COUNT}_0">{L_ROTATE_NONE}</label> &nbsp;
-							<input type="radio" name="rotate[{upload_image.S_ROW_COUNT}]" id="rotate_{upload_image.S_ROW_COUNT}_270" value="270" /> <label for="rotate_{upload_image.S_ROW_COUNT}_270">{L_ROTATE_RIGHT}</label> &nbsp;
-						<input type="radio" name="rotate[{upload_image.S_ROW_COUNT}]" id="rotate_{upload_image.S_ROW_COUNT}_180" value="180" /> <label for="rotate_{upload_image.S_ROW_COUNT}_180">{L_ROTATE_UPSIDEDOWN}</label> &nbsp;
-							<input type="radio" name="rotate[{upload_image.S_ROW_COUNT}]" id="rotate_{upload_image.S_ROW_COUNT}_90" value="90" /> <label for="rotate_{upload_image.S_ROW_COUNT}_90">{L_ROTATE_LEFT}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-			<!-- END upload_image -->
-
-			<a id="add_field_link" style="display: none;" href="javascript: add_field();">{L_ADD_UPLOAD_FIELD}</a>
-			<script type="text/javascript">
-			//<![CDATA[
-				for (i = 1; i < limit_fields; i++)
-				{
-					dE('upload_field_' + i);
-				}
-				if (limit_fields > 1)
-				{
-					dE('add_field_link');
-				}
-			//]]>
-			</script>
-		</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}{S_CAPTCHA_HIDDEN_FIELDS}
-			<input type="reset" accesskey="r" tabindex="200" value="{L_RESET}" class="button2" />&nbsp;
-			<input type="submit" accesskey="s" tabindex="201" name="submit" value="{L_CONTINUE}" class="button1" />&nbsp;
-		</fieldset>
-		{S_FORM_TOKEN}
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-<!-- ELSE -->
-
-<!-- INCLUDE gallery/posting_javascript.html -->
-
-<h2><!-- IF U_VIEW_IMAGE --><a href="{U_VIEW_IMAGE}">{IMAGE_NAME}</a><!-- ELSE --><a href="{U_VIEW_ALBUM}">{ALBUM_NAME}</a><!-- ENDIF --></h2>
-
-<form id="postform" action="{S_ALBUM_ACTION}" method="post">
-
-<div class="panel" id="postingbox">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3><!-- IF S_UPLOAD_EDIT -->{L_UPLOAD_IMAGE}<!-- ELSEIF S_EDIT -->{L_EDIT_IMAGE}<!-- ELSEIF S_REPORT -->{L_REPORT_IMAGE}<!-- ENDIF --></h3>
-		<fieldset class="fields1 gallery">
-			<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-
-			<!-- IF not S_USER_LOGGED_IN -->
-				<dl>
-					<dt><label for="username">{L_USERNAME}:</label></dt>
-					<dd id="username"><input class="inputbox autowidth" type="text" tabindex="1" name="username" value="{S_USERNAME}" size="60" maxlength="32" /></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF BBCODE_STATUS -->
-			<dl>
-				<dt><label>{L_BBCODES}:</label></dt>
-				<!-- IF S_BBCODE_ALLOWED --><dd><!-- INCLUDE posting_buttons.html --></dd><!-- ENDIF -->
-				<dd>{BBCODE_STATUS}<!-- IF S_BBCODE_ALLOWED -->; {IMG_STATUS} {FLASH_STATUS}; {URL_STATUS}; {SMILIES_STATUS}<!-- ENDIF --></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF S_SMILIES_ALLOWED and .smiley -->
-				<dl>
-					<dt><label>{L_SMILIES}:</label></dt>
-					<dd><!-- BEGIN smiley --><a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> <!-- END smiley --></dd>
-					<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED--><dd><a href="{U_MORE_SMILIES}" onclick="gallery_popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></dd><!-- ENDIF -->
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- BEGIN image -->
-				<hr />
-				<dl>
-					<dt class="simulate-dt<!-- IF image.S_FIRST_ROW and (NUM_IMAGES > 1) --> first<!-- ENDIF -->">{image.U_IMAGE}</dt>
-					<dd class="simulate-dt"><label for="image_name_{image.S_ROW_COUNT}">{L_IMAGE_NAME}:</label></dd>
-					<!-- IF image.S_FIRST_ROW and (NUM_IMAGES > 1) -->
-						<dd class="simulate-dd"><input type="checkbox" name="same_name" id="same_name" value="1" onchange="change_read_write();" /> <label for="same_name">{L_USE_SAME_NAME}</label></dd>
-						<dd class="simulate-dd">{L_USE_NUM} <input class="inputbox autowidth" type="text" id="image_num" name="image_num" size="5" onchange="update_all('image_name'); update_all('message');" onkeyup="update_all('image_name'); update_all('message');" value="1" /></dd>
-					<!-- ENDIF -->
-					<dd class="simulate-dd"><input class="inputbox autowidth" type="text" tabindex="1{image.S_ROW_COUNT}" id="image_name_{image.S_ROW_COUNT}" name="image_name[{image.S_ROW_COUNT}]" value="{image.IMAGE_NAME}"<!-- IF image.S_FIRST_ROW --> onchange="update_all('image_name');" onselect="update_all('image_name');" onclick="update_all('image_name');" onkeyup="update_all('image_name');"<!-- ENDIF --> size="60" maxlength="128" /></dd>
-					<dd class="simulate-dt"><label for="message_{image.S_ROW_COUNT}">{L_IMAGE_DESC}:</label></dd>
-					<dd class="simulate-dd" id="desc_length_{image.S_ROW_COUNT}">{L_DESCRIPTION_LENGTH}</dd>
-					<dd class="simulate-dd"><textarea name="message[{image.S_ROW_COUNT}]" id="message_{image.S_ROW_COUNT}" rows="4" cols="76" tabindex="3" onchange="set_text_field({image.S_ROW_COUNT});<!-- IF image.S_FIRST_ROW --> update_all('message');<!-- ENDIF -->" onselect="set_text_field({image.S_ROW_COUNT});<!-- IF image.S_FIRST_ROW --> update_all('message');<!-- ENDIF --> storeCaret(this);" onclick="set_text_field({image.S_ROW_COUNT});<!-- IF image.S_FIRST_ROW --> update_all('message');<!-- ENDIF --> storeCaret(this);" onkeyup="set_text_field({image.S_ROW_COUNT});<!-- IF image.S_FIRST_ROW --> update_all('message');<!-- ENDIF --> storeCaret(this);" class="inputbox">{image.IMAGE_DESC}</textarea></dd>
-					<!-- IF S_ALLOW_ROTATE -->
-					<dd class="simulate-dt"><label for="rotate_{image.S_ROW_COUNT}_0">{L_ROTATE_IMAGE}:</label></dd>
-					<dd class="simulate-dd"><input type="radio" name="rotate[{image.S_ROW_COUNT}]" id="rotate_{image.S_ROW_COUNT}_0" value="0" checked="checked" /> <label for="rotate_{image.S_ROW_COUNT}_0">{L_ROTATE_NONE}</label> &nbsp;
-						<input type="radio" name="rotate[{image.S_ROW_COUNT}]" id="rotate_{image.S_ROW_COUNT}_270" value="270" /> <label for="rotate_{image.S_ROW_COUNT}_270">{L_ROTATE_RIGHT}</label> &nbsp;
-						<input type="radio" name="rotate[{image.S_ROW_COUNT}]" id="rotate_{image.S_ROW_COUNT}_180" value="180" /> <label for="rotate_{image.S_ROW_COUNT}_180">{L_ROTATE_UPSIDEDOWN}</label> &nbsp;
-						<input type="radio" name="rotate[{image.S_ROW_COUNT}]" id="rotate_{image.S_ROW_COUNT}_90" value="90" /> <label for="rotate_{image.S_ROW_COUNT}_90">{L_ROTATE_LEFT}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-			<!-- END image -->
-
-			<!-- IF S_REPORT -->
-				<div><textarea name="message" id="message" rows="4" cols="76" tabindex="3" class="inputbox"></textarea></dd></div>
-			<!-- ENDIF -->
-		</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_MOVE_PERSONAL or S_COMMENTS_ENABLED or S_CHANGE_AUTHOR -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="fields1">
-			<!-- IF S_MOVE_PERSONAL -->
-				<dl>
-					<dt><label for="move_to_personal">{L_MOVE_TO_PERSONAL}:</label></dt>
-					<dd><input type="checkbox" class="checkbox" name="move_to_personal" id="move_to_personal" value="1" /> <!-- IF S_MOVE_MODERATOR -->{L_MOVE_TO_PERSONAL_MOD}<!-- ELSE -->{L_MOVE_TO_PERSONAL_EXPLAIN}<!-- ENDIF --></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF S_COMMENTS_ENABLED -->
-				<dl>
-					<dt><label for="allow_comments">{L_COMMENTS}:</label></dt>
-					<dd><input type="checkbox" class="checkbox" name="allow_comments" id="allow_comments"<!-- IF S_ALLOW_COMMENTS --> checked="checked"<!-- ENDIF --> value="1" /> <label for="allow_comments">{L_ALLOW_COMMENTS}</label></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF S_CHANGE_AUTHOR and U_FIND_USERNAME -->
-				<dl>
-					<dt><label for="change_author">{L_CHANGE_AUTHOR}:</label></dt>
-					<dd><input type="text" class="inputbox autowidth" name="change_author" id="change_author" value="" size="32" /> [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-				</dl>
-			<!-- ENDIF -->
-		</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<script type="text/javascript">
-//<![CDATA[
-	set_text_field(0);
-//]]>
-</script>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}
-			<input type="reset" accesskey="r" tabindex="200" value="{L_RESET}" class="button2" />&nbsp;
-			<input type="submit" accesskey="s" tabindex="201" name="submit" value="{L_SUBMIT}" class="button1" />&nbsp;
-		</fieldset>
-		{S_FORM_TOKEN}
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/posting_javascript.html b/template/gallery/posting_javascript.html
deleted file mode 100644
index 9ecd0c9..0000000
--- a/template/gallery/posting_javascript.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<script type="text/javascript">
-//<![CDATA[
-var gallery_popup_window = false;
-var current_active_message = 0;
-
-function set_text_field(id)
-{
-	current_active_message = id
-	text_name = 'message_' + id;
-
-	if (gallery_popup_window)
-	{
-		gallery_popup_window.text_name = 'message_' + id;
-	}
-}
-
-var same_name = false;
-
-function change_read_write()
-{
-	same_name = document.getElementById('same_name').checked;
-	if (!same_name)
-	{
-		<!-- BEGIN image -->
-			<!-- IF not image.S_FIRST_ROW -->
-		make_writable('{image.S_ROW_COUNT}')
-			<!-- ENDIF -->
-		<!-- END image -->
-	}
-	else
-	{
-		update_all('message');
-		update_all('image_name');
-		<!-- BEGIN image -->
-			<!-- IF not image.S_FIRST_ROW -->
-		make_readonly('{image.S_ROW_COUNT}');
-			<!-- ENDIF -->
-		<!-- END image -->
-		set_text_field(0);
-	}
-}
-
-function make_readonly(image) {
-	var element;
-
-	// Message field
-	element = document.getElementById('message_' + image);
-	element.readOnly = true;
-	add_class(element, 'readonly');
-
-	// Image name
-	element = document.getElementById('image_name_' + image);
-	element.readOnly = true;
-	add_class(element, 'readonly');
-
-	// Description length note
-	element = document.getElementById('desc_length_' + image);
-	element.style.display = 'none';
-}
-
-function make_writable(image) {
-	var element;
-
-	// Message field
-	element = document.getElementById('message_' + image);
-	element.readOnly = false;
-	remove_class(element, 'readonly');
-
-	// Image name
-	element = document.getElementById('image_name_' + image);
-	element.readOnly = false;
-	remove_class(element, 'readonly');
-
-	// Description length note
-	element = document.getElementById('desc_length_' + image);
-	element.style.display = 'block';
-}
-
-function update_all(what)
-{
-	if (same_name)
-	{
-		var content = document.getElementById(what + '_0').value;
-		var count = 0;
-		if (parseInt(document.getElementById('image_num').value))
-		{
-			count = parseInt(document.getElementById('image_num').value);
-		}
-		<!-- BEGIN image -->
-			<!-- IF not image.S_FIRST_ROW -->
-		document.getElementById(what + '_{image.S_ROW_COUNT}').value = content.split('{' + 'NUM' + '}').join(({image.S_ROW_COUNT} + count));
-			<!-- ENDIF -->
-		<!-- END image -->
-	}
-}
-
-function has_class(ele, cls) {
-	return ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'));
-}
-
-function add_class(ele, cls) {
-	if (!this.has_class(ele, cls))
-	{
-		ele.className += " " + cls;
-	}
-}
-
-function remove_class(ele, cls)
-{
-	if (has_class(ele, cls))
-	{
-		var reg = new RegExp('(\\s|^)' + cls + '(\\s|$)');
-		ele.className = ele.className.replace(reg,' ');
-	}
-}
-
-/**
-* Window popup
-* Based on the function of phpBB.
-* Just storing the return of window.open(),
-* so we can set the text_name in the popup aswell.
-*/
-function gallery_popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	gallery_popup_window = window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-
-	/**
-	* Update the value of text_name when the window got opened...
-	* We use a 0.5 second timeout here, so the browser got the popup open, before we try to set the field.
-	* Hopefully users on super-fast computers, are not too fast in selecting the smilies.
-	*/
-	setTimeout("set_text_field(current_active_message)", 500);
-
-	return false;
-}
-//]]>
-</script>
\ No newline at end of file
diff --git a/template/gallery/recent_body.html b/template/gallery/recent_body.html
deleted file mode 100644
index 51447f7..0000000
--- a/template/gallery/recent_body.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- INCLUDE gallery/imageblock_body.html -->
-
-<!-- IF .commentrow -->
-	<h4><!-- IF not COLLAPSE_COMMENTS --><!-- IF U_G_SEARCH_COMMENTED --><a href="{U_G_SEARCH_COMMENTED}">{L_RECENT_COMMENTS}</a><!-- ELSE -->{L_RECENT_COMMENTS}<!-- ENDIF --><!-- ELSE --><a href="javascript: dE('recent-comments');">{L_RECENT_COMMENTS}</a><!-- ENDIF --></h4>
-	<div id="recent-comments"<!-- IF COLLAPSE_COMMENTS --> style="display: none;"<!-- ENDIF -->>
-	<!-- BEGIN commentrow -->
-	<a id="comment_{commentrow.COMMENT_ID}"></a>
-	<div class="post <!-- IF commentrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner">
-			<span class="corners-top"><span></span></span>
-			<div class="postbody">
-				<!-- IF commentrow.U_DELETE or commentrow.U_EDIT or commentrow.U_INFO or commentrow.U_QUOTE -->
-					<ul class="profile-icons">
-						<!-- IF commentrow.U_EDIT --><li class="edit-icon"><a href="{commentrow.U_EDIT}" title="{L_EDIT_COMMENT}"><span>{L_EDIT_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_DELETE --><li class="delete-icon"><a href="{commentrow.U_DELETE}" title="{L_DELETE_COMMENT}"><span>{L_DELETE_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_INFO --><li class="info-icon"><a href="{commentrow.U_INFO}" title="{L_IP}" onclick="popup(this.href, 750, 500); return false;"><span>{L_IP}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_QUOTE --><li class="quote-icon"><a href="{commentrow.U_QUOTE}" title="{L_QUOTE_COMMENT}"><span>{L_QUOTE_COMMENT}</span></a></li><!-- ENDIF -->
-					</ul>
-				<!-- ENDIF -->
-				<p class="author"><a href="{commentrow.U_COMMENT}">{MINI_POST_IMG}</a>&nbsp;{L_POST_BY_AUTHOR} <strong>{commentrow.POST_AUTHOR_FULL}</strong> &raquo; {commentrow.TIME} </p>
-				<div class="content">{commentrow.TEXT}</div>
-			</div>
-			<dl class="postprofile" id="profile{commentrow.COMMENT_ID}">
-				<dd>{L_COMMENT_ON}:</dd>
-				<dd>{commentrow.UC_IMAGE_NAME}</dd>
-				<dt>{commentrow.UC_THUMBNAIL}</dt>
-				<dd>&nbsp;</dd>
-
-				<dd>{L_UPLOADED_BY_USER} {commentrow.IMAGE_AUTHOR}</dd>
-				<dd>{commentrow.IMAGE_TIME}</dd>
-			</dl>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-	</div>
-	<!-- END commentrow -->
-	</div>
-<!-- ENDIF -->
-
-<!-- IF (.recent or .random or .contest or .commentrow) and not S_IN_GALLERY -->
-<!--
-	I request you retain the full copyright notice below including the link to www.flying-bits.org.
-	This not only gives respect to the large amount of time given freely by the developer
-	but also helps build interest, traffic and use of phpBB Gallery. If you (honestly) cannot retain
-	the full copyright I ask you at least leave in place the "Powered by phpBB Gallery" line, with
-	"phpBB Gallery" linked to www.flying-bits.org. If you refuse to include even this then support on my
-	forums may be affected.
-
-	phpBB Gallery, nickvergessen : 2009
-//-->
-<div class="copyright">
-	Powered by <a href="http://www.flying-bits.org/">phpBB Gallery</a> &copy; 2007, 2009 <a href="http://www.flying-bits.org/">nickvergessen</a>
-	<!-- IF GALLERY_TRANSLATION_INFO --><br />{GALLERY_TRANSLATION_INFO}<!-- ENDIF -->
-</div>
-<br />
-<!-- ENDIF -->
\ No newline at end of file
diff --git a/template/gallery/search_body.html b/template/gallery/search_body.html
deleted file mode 100644
index c51b30d..0000000
--- a/template/gallery/search_body.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<h2 class="solo">{L_SEARCH}</h2>
-
-<form method="get" action="{S_SEARCH_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<h3>{L_SEARCH_QUERY}</h3>
-
-	<fieldset>
-	<dl>
-		<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><!-- IF S_IMPLEMENTED --><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span><!-- ENDIF --></dt>
-		<dd><input type="text" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
-		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>
-		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="username">{L_SEARCH_AUTHOR}:</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
-		<dd><input type="text" class="inputbox" name="username" id="username" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_SEARCH_OPTIONS}</h3>
-
-	<fieldset>
-	<dl>
-		<dt><label for="search_album">{L_SEARCH_ALBUMS}:</label><!-- IF S_IMPLEMENTED --><br /><span>{L_SEARCH_ALBUMS_EXPLAIN}</span><!-- ENDIF --></dt>
-		<dd><select name="aid[]" id="search_album" multiple="multiple" size="8" title="{L_SEARCH_ALBUMS}">{S_ALBUM_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_IMPLEMENTED -->
-	<dl>
-		<dt><label for="search_child1">{L_SEARCH_SUBALBUMS}:</label></dt>
-		<dd>
-			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label> 
-			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
-		</dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- IF S_IMPLEMENTED -->
-	<dl>
-		<dt><label for="sf1">{L_SEARCH_WITHIN}:</label></dt>
-		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_IMAGE_COMMENTS}</label></dd>
-		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_IMAGE_VALUES}</label></dd>
-		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_IMAGENAME}</label></dd>
-		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_COMMENTS}</label></dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<hr class="dashed" />
-
-	<dl>
-		<dt><label for="sd">{L_RESULT_SORT}:</label></dt>
-		<dd>{S_SELECT_SORT_KEY}&nbsp;
-			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label> 
-			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
-		</dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-</form>
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/search_results.html b/template/gallery/search_results.html
deleted file mode 100644
index ad299d6..0000000
--- a/template/gallery/search_results.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-<script type="text/javascript">
-function getElement(iElementId)
-{
-	if (document.all) 
-	{
-		return document.all[iElementId];
-	}
-	if (document.getElementById)
-	{
-		return document.getElementById(iElementId);
-	}
-}
-
-function toggleElement(oElement)
-{
-	if (oElement.style.display == "none")
-	{
-		oElement.style.display = "";
-	}
-	else
-	{
-		oElement.style.display = "none";
-	}
-}
-</script>
-<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
-<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
-
-<!-- IF U_GALLERY_SEARCH --><p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_GALLERY_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
-
-<!-- IF PAGINATION or SEARCH_MATCHES or PAGE_NUMBER -->
-	<form method="post" action="{S_SEARCH_ACTION}">
-	<div class="topic-actions">
-
-	<!-- IF SEARCH_MATCHES -->
-		<div class="search-box">
-			<!-- IF SEARCH_IN_RESULTS -->
-				<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
-				<input type="hidden" name="show_results" value="posts" />
-				<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
-			<!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-
-		<div class="pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</div>
-
-	</div>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF SEARCH_IMAGES and .imageblock -->
-	<!-- IF S_IN_GALLERY_POPUP -->
-		<!-- INCLUDE gallery/imageblock_popup.html -->
-	<!-- ELSE -->
-		<!-- INCLUDE gallery/imageblock_body.html -->
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- IF .commentrow -->
-<div id="recent-comments">
-	<!-- BEGIN commentrow -->
-	<a id="{commentrow.COMMENT_ID}"></a>
-	<div class="post <!-- IF commentrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner">
-			<span class="corners-top"><span></span></span>
-			<div class="postbody">
-				<!-- IF commentrow.U_DELETE or commentrow.U_EDIT or commentrow.U_INFO or commentrow.U_QUOTE -->
-					<ul class="profile-icons">
-						<!-- IF commentrow.U_EDIT --><li class="edit-icon"><a href="{commentrow.U_EDIT}" title="{L_EDIT_COMMENT}"><span>{L_EDIT_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_DELETE --><li class="delete-icon"><a href="{commentrow.U_DELETE}" title="{L_DELETE_COMMENT}"><span>{L_DELETE_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_INFO --><li class="info-icon"><a href="{commentrow.U_INFO}" title="{L_IP}" onclick="popup(this.href, 750, 500); return false;"><span>{L_IP}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_QUOTE --><li class="quote-icon"><a href="{commentrow.U_QUOTE}" title="{L_QUOTE_COMMENT}"><span>{L_QUOTE_COMMENT}</span></a></li><!-- ENDIF -->
-					</ul>
-				<!-- ENDIF -->
-				<p class="author"><a href="{commentrow.U_COMMENT}">{MINI_POST_IMG}</a>&nbsp;{L_POST_BY_AUTHOR} <strong>{commentrow.POST_AUTHOR_FULL}</strong> &raquo; {commentrow.TIME} </p>
-				<div class="content">{commentrow.TEXT}</div>
-			</div>
-			<dl class="postprofile" id="profile{commentrow.COMMENT_ID}">
-				<dd>{L_COMMENT_ON}:</dd>
-				<dd>{commentrow.UC_IMAGE_NAME}</dd>
-				<dt>{commentrow.UC_THUMBNAIL}</dt><br />
-
-				<dd>{L_UPLOADED_BY_USER} {commentrow.IMAGE_AUTHOR}</dd>
-				<dd>{commentrow.IMAGE_TIME}</dd>
-			</dl>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-	</div>
-	<!-- END commentrow -->
-</div>
-<!-- ENDIF -->
-
-<!-- IF PAGINATION or .imagerow or ((S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS) and SEARCH_IN_RESULTS) -->
-	<form method="post" action="{S_SEARCH_ACTION}">
-
-	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF S_SELECT_SORT_KEY and SEARCH_IN_RESULTS -->
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-		<!-- ENDIF -->
-	</fieldset>
-
-	</form>
-
-	<hr />
-<!-- ENDIF -->
-
-<!-- IF PAGINATION or .imagerow or PAGE_NUMBER -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</li>
-	</ul>
-<!-- ENDIF -->
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/ucp_gallery.html b/template/gallery/ucp_gallery.html
deleted file mode 100644
index 1a9691d..0000000
--- a/template/gallery/ucp_gallery.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-<!-- IF S_PERSONAL_SETTINGS -->
-<form id="ucp_gallery" method="post" action="{S_UCP_ACTION}">
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<p>{L_TITLE_EXPLAIN}</p>
-		<fieldset>
-		<dl>
-			<dt><label for="watch_own1">{L_WATCH_OWN}:</label></dt>
-			<dd>
-				<label for="watch_own1"><input type="radio" name="watch_own" id="watch_own1" value="1"<!-- IF S_WATCH_OWN --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="watch_own0"><input type="radio" name="watch_own" id="watch_own0" value="0"<!-- IF not S_WATCH_OWN --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="watch_com1">{L_WATCH_COM}:</label></dt>
-			<dd>
-				<label for="watch_com1"><input type="radio" name="watch_com" id="watch_com1" value="1"<!-- IF S_WATCH_COM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="watch_com0"><input type="radio" name="watch_com" id="watch_com0" value="0"<!-- IF not S_WATCH_COM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="watch_favo1">{L_WATCH_FAVO}:</label></dt>
-			<dd>
-				<label for="watch_favo1"><input type="radio" name="watch_favo" id="watch_favo1" value="1"<!-- IF S_WATCH_FAVO --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="watch_favo0"><input type="radio" name="watch_favo" id="watch_favo0" value="0"<!-- IF not S_WATCH_FAVO --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<hr />
-		<dl>
-			<dt><label for="viewexifs1">{L_VIEWEXIFS_DEFAULT}:</label></dt>
-			<dd>
-				<label for="viewexifs1"><input type="radio" name="viewexifs" id="viewexifs1" value="1"<!-- IF S_VIEWEXIFS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="viewexifs0"><input type="radio" name="viewexifs" id="viewexifs0" value="0"<!-- IF not S_VIEWEXIFS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<!-- IF S_COMMENTS_ENABLED -->
-		<dl>
-			<dt><label for="allow_comments1">{L_USER_ALLOW_COMMENTS}:</label></dt>
-			<dd>
-				<label for="allow_comments1"><input type="radio" name="allow_comments" id="allow_comments1" value="1"<!-- IF S_ALLOW_COMMENTS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="allow_comments0"><input type="radio" name="allow_comments" id="allow_comments0" value="0"<!-- IF not S_ALLOW_COMMENTS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<!-- ENDIF -->
-		</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-	<fieldset class="submit-buttons">
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-</form>
-<!-- ENDIF -->
-
-<!-- IF S_INFO_CREATE -->
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<p>{L_TITLE_EXPLAIN}</p>
-	<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}
-			<input type="submit" name="submit" value="{L_CREATE_PERSONAL_ALBUM}" class="button1" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<!-- IF S_CREATE_SUBALBUM || S_EDIT_SUBALBUM -->
-<form id="acp_gallery" method="post" action="{U_ACTION}">
-	<h2>{L_TITLE}</h2>
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			<p>{L_TITLE_EXPLAIN}</p>
-			<fieldset>
-			<!-- IF not S_PERSONAL_ALBUM -->
-				<dl>
-					<dt><label for="parent_id">{L_ALBUM_PARENT}:</label></dt>
-					<dd><select id="parent_id" name="parent_id">{S_PARENT_OPTIONS}</select></dd>
-				</dl>
-				<dl>
-					<dt><label for="album_name">{L_ALBUM_NAME}:</label></dt>
-					<dd><input class="inputbox" type="text" id="album_name" name="album_name" value="{ALBUM_NAME}" maxlength="255" /></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF S_AUTH_ACCESS_OPTIONS -->
-				<dl>
-					<dt><label for="album_auth_access">{L_ALBUM_ACCESS}:</label><br /><span>{L_ALBUM_ACCESS_EXPLAIN}</span></dt>
-					<dd><select id="album_auth_access" name="album_auth_access">{S_AUTH_ACCESS_OPTIONS}</select></dd>
-				</dl>
-			<!-- ENDIF -->
-			<dl>
-				<dt><label for="album_desc">{L_ALBUM_DESC}:</label></dt>
-				<dd><textarea class="inputbox" id="album_desc" name="album_desc" rows="5" cols="45">{ALBUM_DESC}</textarea></dd>
-				<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-					<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-					<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-			</dl>
-			</fieldset>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<fieldset class="submit-buttons">
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-</form>
-<!-- ENDIF -->
-
-<!-- IF S_MANAGE_SUBALBUMS -->
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<p><strong>{NAVIGATION}<!-- IF S_ALBUM --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <a href="{U_GOTO}">{L_GOTO}</a> | <a href="{U_UPLOAD}">{L_UPLOAD_IMAGE}</a>]<!-- ENDIF --></strong></p>
-	<ul class="topiclist">
-		<li class="header">
-			<dl class="icon">
-				<dt><!-- IF .album_row -->{L_ATTACHED_SUBALBUMS}<!-- ELSEIF U_CREATE_SUBALBUM -->{L_NO_SUBALBUMS}<!-- ENDIF --></dt>
-			</dl>
-		</li>
-	</ul>
-	<!-- IF .album_row -->
-	<ul class="topiclist cplist">
-		<!-- BEGIN album_row -->
-		<li class="row<!-- IF album_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({album_row.FOLDER_IMAGE}); background-repeat: no-repeat;">
-				<dt title="{album_row.ALBUM_NAME}">
-					<!-- IF album_row.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{album_row.FORUM_IMAGE}</div><!-- ENDIF -->
-					<a href="{album_row.U_ALBUM}" class="topictitle">{album_row.ALBUM_NAME}</a>
-					<!-- IF album_row.ALBUM_DESCRIPTION --><br />{album_row.ALBUM_DESCRIPTION}<!-- ENDIF -->
-				</dt>
-				<dd class="mark" style="width: 120px;">
-					<!-- IF album_row.S_FIRST_ROW && not album_row.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{album_row.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not album_row.S_FIRST_ROW && not album_row.S_LAST_ROW-->
-						<a href="{album_row.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						<a href="{album_row.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF album_row.S_LAST_ROW && not album_row.S_FIRST_ROW -->
-						<a href="{album_row.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{album_row.U_EDIT}">{ICON_EDIT}</a>
-					<a href="{album_row.U_DELETE}">{ICON_DELETE}</a>
-				</dd>
-			</dl>
-		</li>
-		<!-- END album_row -->
-	</ul>
-	<!-- ENDIF -->
-	<!-- IF U_CREATE_SUBALBUM -->
-		<form id="albums" method="post" action="{U_CREATE_SUBALBUM}">
-
-			<fieldset class="quick">
-				<!--input type="hidden" name="action" value="add" /-->
-				<input class="button2" name="addforum" type="submit" value="{L_CREATE_SUBALBUM}" />
-				{S_FORM_TOKEN}
-			</fieldset>
-		</form>
-	<!-- ENDIF -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<!-- IF S_MANAGE_FAVORITES or S_MANAGE_SUBSCRIPTIONS -->
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<p>{L_TITLE_EXPLAIN}</p>
-	<form id="ucp_gallery" method="post" action="{S_UCP_ACTION}">
-			<!-- IF S_MANAGE_SUBSCRIPTIONS -->
-				<!-- IF .album_row -->
-					<ul class="topiclist">
-						<li class="header">
-							<dl>
-								<dt>{L_ALBUMS}</dt>
-								<dd class="moderation">{L_LAST_IMAGE}</dd>
-								<dd class="mark">{L_MARK}</dd>
-							</dl>
-						</li>
-					</ul>
-
-					<ul class="topiclist cplist">
-					<!-- BEGIN album_row -->
-						<li class="row<!-- IF album_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF album_row.S_REPORTED --> reported<!-- ENDIF -->">
-							<dl>
-								<dt>
-									<a href="{album_row.U_VIEW_ALBUM}" class="topictitle">{album_row.ALBUM_NAME}</a><br />
-									<span>{album_row.ALBUM_DESC}</span>
-								</dt>
-								<!-- IF album_row.LAST_IMAGE -->
-									<dd class="g_moderation moderation">
-										<!-- IF album_row.UC_FAKE_THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{album_row.UC_FAKE_THUMBNAIL}</span><!-- ENDIF -->
-										<dfn>{L_LAST_IMAGE}</dfn> {album_row.UC_IMAGE_NAME}
-										{L_POST_BY_AUTHOR} {album_row.UPLOADER}<br />
-										{album_row.LAST_IMAGE_TIME}
-									</dd>
-								<!-- ENDIF -->
-								<dd class="mark"><input type="checkbox" name="album_id_ary[]" value="{album_row.ALBUM_ID}" /></dd>
-							</dl>
-						</li>
-					<!-- END album_row -->
-					</ul>
-					<div><a href="#" onclick="marklist('ucp_gallery', 'album_id_ary', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp_gallery', 'album_id_ary', false); return false;">{L_UNMARK_ALL}</a><br /></div>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF .image_row -->
-				<ul class="topiclist">
-					<li class="header">
-						<dl>
-							<dt>{L_IMAGES}</dt>
-							<!-- IF not S_MANAGE_FAVORITES --><dd class="moderation">{L_LAST_COMMENT}</dd><!-- ENDIF -->
-							<dd class="mark">{L_MARK}</dd>
-						</dl>
-					</li>
-				</ul>
-
-				<ul class="topiclist cplist">
-				<!-- BEGIN image_row -->
-					<li class="row<!-- IF image_row.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF image_row.S_REPORTED --> reported<!-- ENDIF -->">
-						<dl>
-							<dt>
-								<!-- IF image_row.UC_FAKE_THUMBNAIL --><span style="float: left; text-align: center; width: {FAKE_THUMB_SIZE}px; padding-right: 5px;">{image_row.UC_FAKE_THUMBNAIL}</span><!-- ENDIF -->
-								<dfn>{L_LAST_IMAGE}</dfn> {image_row.UC_IMAGE_NAME}<br />
-								{L_UPLOADED_BY_USER} {image_row.UPLOADER}<br />
-								{image_row.IMAGE_TIME}<br />
-								{L_ALBUM}: <a href="{image_row.U_VIEW_ALBUM}" style="font-weight: bold;">{image_row.ALBUM_NAME}</a>
-							</dt>
-							<!-- IF not S_MANAGE_FAVORITES and image_row.COMMENT -->
-								<dd class="moderation">
-									<span>{L_POST_BY_AUTHOR} {image_row.LAST_COMMENT_BY}<br />
-									{image_row.LAST_COMMENT_TIME}</span>
-								</dd>
-							<!-- ENDIF -->
-							<dd class="mark"><input type="checkbox" name="image_id_ary[]" value="{image_row.IMAGE_ID}" /></dd>
-						</dl>
-					</li>
-				<!-- END image_row -->
-				</ul>
-				<div><a href="#" onclick="marklist('ucp_gallery', 'image_id_ary', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp_gallery', 'image_id_ary', false); return false;">{L_UNMARK_ALL}</a></div>
-			<!-- ELSE -->
-				<ul class="topiclist">
-					<li><p class="notopics"><!-- IF S_MANAGE_FAVORITES -->{L_NO_FAVORITES}<!-- ELSE -->{L_NO_SUBSCRIPTIONS}<!-- ENDIF --></p></li>
-				</ul>
-			<!-- ENDIF -->
-
-			<!-- IF PAGINATION or TOTAL_IMAGES -->
-				<ul class="linklist">
-					<li class="rightside pagination">
-						<!-- IF TOTAL_IMAGES --> {TOTAL_IMAGES}<!-- ENDIF -->
-						<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-					</li>
-				</ul>
-			<!-- ENDIF -->
-
-		<fieldset class="display-actions">
-			<select name="action">
-				<option value="" selected="selected">{L_CHOOSE_ACTION}</option>
-				<!-- IF S_MANAGE_FAVORITES -->
-					<option value="remove_favorite">{L_REMOVE_FROM_FAVORITES}</option>
-				<!-- ELSE -->
-					<option value="unsubscribe">{L_UNSUBSCRIBE}</option>
-				<!-- ENDIF -->
-			</select>
-			<input class="button2" type="submit" value="{L_SUBMIT}" />
-		</fieldset>
-	</form>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<!--
-	I request you retain the full copyright notice below including the link to www.flying-bits.org.
-	This not only gives respect to the large amount of time given freely by the developer
-	but also helps build interest, traffic and use of phpBB Gallery. If you (honestly) cannot retain
-	the full copyright I ask you at least leave in place the "Powered by phpBB Gallery" line, with
-	"phpBB Gallery" linked to www.flying-bits.org. If you refuse to include even this then support on my
-	forums may be affected.
-
-	phpBB Gallery, nickvergessen : 2009
-//-->
-<div class="copyright">
-	Powered by <a href="http://www.flying-bits.org/">phpBB Gallery</a> &copy; 2007, 2009 <a href="http://www.flying-bits.org/">nickvergessen</a>
-	<!-- IF GALLERY_TRANSLATION_INFO --><br />{GALLERY_TRANSLATION_INFO}<!-- ENDIF -->
-</div>
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
diff --git a/template/gallery/viewimage_body.html b/template/gallery/viewimage_body.html
deleted file mode 100644
index 65bda73..0000000
--- a/template/gallery/viewimage_body.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!-- INCLUDE gallery/gallery_header.html -->
-
-<h2><a href="{S_ALBUM_ACTION}">{IMAGE_NAME}</a></h2>
-
-<div class="post bg2<!-- IF S_IMAGE_REPORTED --> reported<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<!-- IF UC_PREVIOUS --><p style="float: left; text-align: left;">{UC_PREVIOUS_IMAGE}<br />{UC_PREVIOUS}</p><!-- ENDIF -->
-		<!-- IF UC_NEXT --><p style="float: right; text-align: right;">{UC_NEXT_IMAGE}<br />{UC_NEXT}</p><!-- ENDIF -->
-		<div style="text-align: center; padding: 20px;">{UC_IMAGE}
-			<!-- IF S_IMAGE_REPORTED --><br /><br /><a href="{U_IMAGE_REPORTED}"><span class="error">{L_IMAGE_REPORTED}</span></a><!-- ENDIF -->
-		</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div id="details" class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<div class="postbody">
-			<!-- IF U_EDIT or U_DELETE or U_REPORT -->
-			<ul class="profile-icons">
-					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
-				<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_IMAGE}"><span>{L_EDIT_IMAGE}</span></a></li><!-- ENDIF -->
-				<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_IMAGE}"><span>{L_DELETE_IMAGE}</span></a></li><!-- ENDIF -->
-				<!-- IF U_REPORT --><li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_IMAGE}"><span>{L_REPORT_IMAGE}</span></a></li><!-- ENDIF -->
-			</ul>
-			<!-- ENDIF -->
-			<h3>{IMAGE_NAME}</h3>
-			<hr />
-
-			<fieldset class="fields1 anti-postbody">
-				<!-- IF CONTEST_RANK -->
-				<dl class="column1">
-					<dt><label>{L_CONTEST_RESULT}:</label></dt>
-					<dd>{CONTEST_RANK}</dd>
-				</dl>
-				<!-- ENDIF -->
-				<dl class="column2">
-					<dt><label>{L_UPLOADED_ON_DATE}:</label></dt>
-					<dd>{IMAGE_TIME}</dd>
-				</dl>
-				<!-- IF IMAGE_URL -->
-				<dl class="column1">
-					<dt><label>{L_IMAGE_URL}:</label></dt>
-					<dd><input type="text" size="28" value="{IMAGE_URL}" class="inputbox autowidth-gallery" onclick="this.focus();this.select();" /></dd>
-				</dl>
-				<!-- ENDIF -->
-				<dl class="column2">
-					<dt><label>{L_GALLERY_VIEWS}:</label></dt>
-					<dd>{IMAGE_VIEW}</dd>
-				</dl>
-				<!-- IF IMAGE_BBCODE -->
-				<dl class="column1">
-					<dt><label>{L_IMAGE_BBCODE}:</label></dt>
-					<dd><input type="text" size="28" value="{IMAGE_BBCODE}" class="inputbox autowidth-gallery" onclick="this.focus();this.select();" /></dd>
-					<!-- IF IMAGE_IMGURL_BBCODE -->
-						<dd><input type="text" size="28" value="{IMAGE_IMGURL_BBCODE}" class="inputbox autowidth-gallery" onclick="this.focus();this.select();" /></dd>
-					<!-- ENDIF -->
-				</dl>
-				<!-- ENDIF -->
-				<!-- IF S_VIEW_RATE -->
-				<dl class="column2">
-					<dt><label>{L_RATING}:</label></dt>
-					<dd><!-- IF CONTEST_RESULT_HIDDEN -->{CONTEST_RESULT_HIDDEN}<!-- ELSE -->{IMAGE_RATING}<!-- ENDIF --><!-- IF S_YOUR_RATING --> ({L_YOUR_RATING}: {S_YOUR_RATING})<!-- ENDIF --></dd>
-				</dl>
-				<!-- ENDIF -->
-			</fieldset>
-
-			<!-- IF .exif_value -->
-			<h3 class="anti-postbody">{L_EXIF-DATA}<!-- IF not S_VIEWEXIF --> - <a href="javascript: dE('exif_data_fieldset');">{L_SHOW_EXIF}</a><!-- ENDIF --></h3>
-			<fieldset class="fields1 anti-postbody" id="exif_data_fieldset"<!-- IF not S_VIEWEXIF --> style="display: none;"<!-- ENDIF -->>
-				<!-- BEGIN exif_value -->
-					<dl class="<!-- IF exif_value.S_ROW_COUNT is even -->column1<!-- ELSE -->column2<!-- ENDIF -->">
-						<dt><label>{exif_value.EXIF_NAME}:</label></dt>
-						<dd>{exif_value.EXIF_VALUE}</dd>
-					</dl>
-				<!-- END exif_value -->
-			</fieldset>
-			<!-- ENDIF -->
-		</div>
-
-		<dl class="postprofile" id="profile_poster">
-			<dt>
-				<!-- IF POSTER_AVATAR -->
-					<!-- IF U_POSTER --><a href="{U_POSTER}">{POSTER_AVATAR}</a><!-- ELSE -->{POSTER_AVATAR}<!-- ENDIF --><br />
-				<!-- ENDIF -->
-				<!-- IF not U_POSTER --><strong>{POSTER_FULL}</strong><!-- ELSE -->{POSTER_FULL}<!-- ENDIF -->
-			</dt>
-
-			<!-- IF POSTER_RANK_TITLE or POSTER_RANK_IMG --><dd>{POSTER_RANK_TITLE}<!-- IF POSTER_RANK_TITLE and POSTER_RANK_IMG --><br /><!-- ENDIF -->{POSTER_RANK_IMG}</dd><!-- ENDIF -->
-
-			<dd>&nbsp;</dd>
-
-			<!-- IF POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {POSTER_POSTS}</dd><!-- ENDIF -->
-			<!-- IF POSTER_GALLERY_IMAGES != '' --><dd><strong>{L_IMAGES}:</strong> <!-- IF U_POSTER_GALLERY_SEARCH --><a href="{U_POSTER_GALLERY_SEARCH}">{POSTER_GALLERY_IMAGES}</a><!-- ELSE -->{POSTER_GALLERY_IMAGES}<!-- ENDIF --></dd><!-- ENDIF -->
-			<!-- IF POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {POSTER_JOINED}</dd><!-- ENDIF -->
-			<!-- IF POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {POSTER_FROM}</dd><!-- ENDIF -->
-			<!-- IF POSTER_IP --><dd><strong>{L_IP}:</strong> {POSTER_IP} [ <a href="{U_POSTER_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a> ]</dd><!-- ENDIF -->
-
-			<!-- IF S_PROFILE_FIELD1 -->
-				<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-				<dd><strong>{PROFILE_FIELD1_NAME}:</strong> {PROFILE_FIELD1_VALUE}</dd>
-			<!-- ENDIF -->
-
-			<!-- BEGIN custom_fields -->
-				<dd><strong>{custom_fields.PROFILE_FIELD_NAME}:</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd>
-			<!-- END custom_fields -->
-
-			<!-- IF not S_IS_BOT -->
-			<!-- IF U_POSTER_PM or U_POSTER_EMAIL or U_POSTER_WWW or U_POSTER_MSN or U_POSTER_ICQ or U_POSTER_YIM or U_POSTER_AIM or U_POSTER_JABBER -->
-				<dd>
-					<ul class="profile-icons">
-						<!-- IF U_POSTER_PM --><li class="pm-icon"><a href="{U_POSTER_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_EMAIL --><li class="email-icon"><a href="{U_POSTER_EMAIL}" title="{L_SEND_EMAIL_USER} {POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {POST_AUTHOR}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_WWW --><li class="web-icon"><a href="{U_POSTER_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_MSN --><li class="msnm-icon"><a href="{U_POSTER_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_ICQ --><li class="icq-icon"><a href="{U_POSTER_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_YIM --><li class="yahoo-icon"><a href="{U_POSTER_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_AIM --><li class="aim-icon"><a href="{U_POSTER_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_JABBER --><li class="jabber-icon"><a href="{U_POSTER_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-						<!-- IF U_POSTER_GALLERY --><li class="gallery-icon"><a href="{U_POSTER_GALLERY}" title="{L_PERSONAL_ALBUM}"><span>{L_PERSONAL_ALBUM}</span></a></li><!-- ENDIF -->
-					</ul>
-				</dd>
-			<!-- ENDIF -->
-			<!-- ENDIF -->
-		</dl>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_QUICK_MOD -->
-	<form method="post" action="{S_MOD_ACTION}">
-	<fieldset class="quickmod" style="float: none; width: 100%;">
-		<label for="quick-mod-select">{L_QUICK_MOD}:</label>
-		<select name="action" id="quick-mod-select">
-			<!-- IF S_QM_MOVE --><option value="images_move">{L_QUEUE_A_MOVE}</option><!-- ENDIF -->
-			<!-- IF S_QM_EDIT --><option value="image_edit">{L_EDIT_IMAGE}</option><!-- ENDIF -->
-			<!-- IF S_QM_STATUS -->
-				<!-- IF not S_STATUS_UNAPPROVED --><option value="images_unapprove">{L_QUEUE_A_UNAPPROVE}</option><!-- ENDIF -->
-				<!-- IF not S_STATUS_APPROVED --><option value="images_approve">{L_QUEUE_A_APPROVE}</option><!-- ENDIF -->
-				<!-- IF not S_STATUS_LOCKED --><option value="images_lock">{L_QUEUE_A_LOCK}</option><!-- ENDIF -->
-			<!-- ENDIF -->
-			<!-- IF S_QM_DELETE --><option value="images_delete">{L_QUEUE_A_DELETE}</option><!-- ENDIF -->
-			<!-- IF S_QM_REPORT and S_IMAGE_REPORTED --><option value="report_details">{L_READ_REPORT}</option><!-- ENDIF -->
-		</select>
-		<input type="submit" value="{L_GO}" class="button2" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF IMAGE_DESC -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3>{L_IMAGE_DESC}</h3>
-		<div class="postbody" style="width: 100%"><div class="content">{IMAGE_DESC}</div></div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<!-- IF not S_IS_BOT and (S_ALLOWED_TO_RATE or S_ALLOWED_TO_COMMENT) -->
-<a name="rating"></a>
-<form id="postform" action="{S_COMMENT_ACTION}" method="post">
-<div id="postingbox" class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<h3><!-- IF S_ALLOWED_TO_RATE and S_ALLOWED_TO_COMMENT -->{L_POST_COMMENT_RATE_IMAGE}<!-- ELSEIF S_ALLOWED_TO_COMMENT -->{L_POST_COMMENT}<!-- ELSE -->{L_RATE_IMAGE}<!-- ENDIF --></h3>
-		<fieldset id="comment-box" class="fields1">
-			<!-- IF S_ALLOWED_TO_RATE -->
-				<dl>
-					<dt><label>{L_YOUR_RATING}:</label></dt>
-					<dd>
-						<!-- IF .rate_scale -->
-							<select name="rating">
-							<!-- BEGIN rate_scale -->
-								<!-- IF rate_scale.RATE_POINT == 1 --><option value="0">{L_DONT_RATE_IMAGE}</option><!-- ENDIF -->
-								<option value="{rate_scale.RATE_POINT}">{rate_scale.RATE_POINT}</option>
-							<!-- END rate_scale -->
-							</select>
-							<!-- IF (not S_ALLOWED_TO_COMMENT or S_HIDE_COMMENT_INPUT) and .rate_scale -->
-								<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-							<!-- ENDIF -->
-						<!-- ELSE -->
-							{CONTEST_RATING}
-						<!-- ENDIF -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF S_ALLOWED_TO_COMMENT and not S_HIDE_COMMENT_INPUT -->
-				<!-- IF not S_USER_LOGGED_IN -->
-					<dl>
-						<dt><label>{L_USERNAME}:</label></dt>
-						<dd><input class="inputbox autowidth" type="text" name="username" maxlength="32" /></dd>
-					</dl>
-				<!-- ENDIF -->
-				<!-- IF CAPTCHA_TEMPLATE -->
-					<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
-				<!-- ENDIF -->
-				<!-- INCLUDE posting_buttons.html -->
-				<div id="smiley-box">
-					<!-- IF S_SMILIES_ALLOWED and .smiley -->
-						<strong>{L_SMILIES}</strong><br />
-						<!-- BEGIN smiley -->
-							<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
-						<!-- END smiley -->
-					<!-- ENDIF -->
-					<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-						<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
-					<!-- ENDIF -->
-
-					<!-- IF BBCODE_STATUS -->
-					<!-- IF .smiley --><hr /><!-- ENDIF -->
-					{BBCODE_STATUS}<br />
-					<!-- IF S_BBCODE_ALLOWED -->
-						{IMG_STATUS}<br />
-						{FLASH_STATUS}<br />
-						{URL_STATUS}<br />
-					<!-- ENDIF -->
-					{SMILIES_STATUS}
-					<!-- ENDIF -->
-					<hr />{L_COMMENT_LENGTH}
-				</div>
-				<div id="message-box">
-					<textarea name="message" id="message" rows="7" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" class="inputbox"></textarea>
-				</div>
-				<div><label for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label></div>
-				<div style="text-align: center;"><input style=" padding-bottom: 3px; padding-top: 3px; vertical-align: middle;"type="submit" name="submit" value="{L_SUBMIT}" class="button1" /></div>
-			</fieldset>
-		<!-- ELSE IF S_HIDE_COMMENT_INPUT -->
-			<!-- IF S_ALLOWED_TO_RATE --><hr class="dashed" /><!-- ENDIF -->
-			{CONTEST_COMMENTS}
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-<!-- ENDIF -->
-
-<!-- IF S_ALLOWED_READ_COMMENTS -->
-<a name="comments"></a>
-<!-- IF not .commentrow or S_COMMENTS_DISABLED -->
-	<div id="comments" class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			<strong><!-- IF S_COMMENTS_DISABLED -->{L_IMAGE_COMMENTS_DISABLED}<!-- ELSE -->{L_NO_COMMENTS}<!-- ENDIF --></strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-<!-- IF .commentrow -->
-	<div class="topic-actions">
-		<div class="pagination">
-			{IMAGE_COMMENTS} {L_COMMENTS} &bull; {PAGE_NUMBER}<!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF -->
-		</div>
-	</div>
-	<!-- BEGIN commentrow -->
-	<a id="comment_{commentrow.COMMENT_ID}"></a>
-	<div class="post <!-- IF commentrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF commentrow.S_ONLINE --> online<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			<div class="postbody">
-				<!-- IF commentrow.U_DELETE or commentrow.U_EDIT or commentrow.U_INFO or commentrow.U_QUOTE -->
-					<ul class="profile-icons">
-						<!-- IF commentrow.U_EDIT --><li class="edit-icon"><a href="{commentrow.U_EDIT}" title="{L_EDIT_COMMENT}"><span>{L_EDIT_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_DELETE --><li class="delete-icon"><a href="{commentrow.U_DELETE}" title="{L_DELETE_COMMENT}"><span>{L_DELETE_COMMENT}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_INFO --><li class="info-icon"><a href="{commentrow.U_INFO}" title="{L_IP}" onclick="popup(this.href, 750, 500); return false;"><span>{L_IP}</span></a></li><!-- ENDIF -->
-						<!-- IF commentrow.U_QUOTE --><li class="quote-icon"><a href="{commentrow.U_QUOTE}" title="{L_QUOTE_COMMENT}"><span>{L_QUOTE_COMMENT}</span></a></li><!-- ENDIF -->
-					</ul>
-				<!-- ENDIF -->
-				<p class="author"><a href="{commentrow.U_COMMENT}">{MINI_POST_IMG}</a>&nbsp;{L_POST_BY_AUTHOR} <strong>{commentrow.POST_AUTHOR_FULL}</strong> &raquo; {commentrow.TIME} </p>
-				<div class="content">{commentrow.TEXT}</div>
-				<!-- IF commentrow.EDIT_INFO --><div class="notice">{commentrow.EDIT_INFO}</div><!-- ENDIF -->
-				<!-- IF commentrow.SIGNATURE --><div id="sig{commentrow.COMMENT_ID}" class="signature">{commentrow.SIGNATURE}</div><!-- ENDIF -->
-			</div>
-			<dl class="postprofile" id="profile{commentrow.COMMENT_ID}">
-				<dt>
-					<!-- IF commentrow.POSTER_AVATAR -->
-						<!-- IF commentrow.U_POST_AUTHOR --><a href="{commentrow.U_POST_AUTHOR}">{commentrow.POSTER_AVATAR}</a><!-- ELSE -->{commentrow.POSTER_AVATAR}<!-- ENDIF --><br />
-					<!-- ENDIF -->
-					<!-- IF not commentrow.U_POST_AUTHOR --><strong>{commentrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{commentrow.POST_AUTHOR_FULL}<!-- ENDIF -->
-				</dt>
-
-				<!-- IF commentrow.RANK_TITLE or commentrow.RANK_IMG --><dd>{commentrow.RANK_TITLE}<!-- IF commentrow.RANK_TITLE and commentrow.RANK_IMG --><br /><!-- ENDIF -->{commentrow.RANK_IMG}</dd><!-- ENDIF -->
-
-				<dd>&nbsp;</dd>
-
-				<!-- IF commentrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {commentrow.POSTER_POSTS}</dd><!-- ENDIF -->
-				<!-- IF commentrow.GALLERY_IMAGES != '' --><dd><strong>{L_IMAGES}:</strong> <!-- IF commentrow.U_GALLERY_SEARCH --><a href="{commentrow.U_GALLERY_SEARCH}">{commentrow.GALLERY_IMAGES}</a><!-- ELSE -->{commentrow.GALLERY_IMAGES}<!-- ENDIF --></dd><!-- ENDIF -->
-				<!-- IF commentrow.POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {commentrow.POSTER_JOINED}</dd><!-- ENDIF -->
-				<!-- IF commentrow.POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {commentrow.POSTER_FROM}</dd><!-- ENDIF -->
-
-				<!-- IF commentrow.S_PROFILE_FIELD1 -->
-					<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-					<dd><strong>{commentrow.PROFILE_FIELD1_NAME}:</strong> {commentrow.PROFILE_FIELD1_VALUE}</dd>
-				<!-- ENDIF -->
-
-				<!-- BEGIN custom_fields -->
-					<dd><strong>{commentrow.custom_fields.PROFILE_FIELD_NAME}:</strong> {commentrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
-				<!-- END custom_fields -->
-
-				<!-- IF not S_IS_BOT -->
-				<!-- IF commentrow.U_PM or commentrow.U_EMAIL or commentrow.U_WWW or commentrow.U_MSN or commentrow.U_ICQ or commentrow.U_YIM or commentrow.U_AIM or commentrow.U_JABBER -->
-					<dd>
-						<ul class="profile-icons">
-							<!-- IF commentrow.U_PM --><li class="pm-icon"><a href="{commentrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_EMAIL --><li class="email-icon"><a href="{commentrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {commentrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {commentrow.POST_AUTHOR}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_WWW --><li class="web-icon"><a href="{commentrow.U_WWW}" title="{L_VISIT_WEBSITE}: {commentrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_MSN --><li class="msnm-icon"><a href="{commentrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_ICQ --><li class="icq-icon"><a href="{commentrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_YIM --><li class="yahoo-icon"><a href="{commentrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_AIM --><li class="aim-icon"><a href="{commentrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_JABBER --><li class="jabber-icon"><a href="{commentrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-							<!-- IF commentrow.U_GALLERY --><li class="gallery-icon"><a href="{commentrow.U_GALLERY}" title="{L_PERSONAL_ALBUM}"><span>{L_PERSONAL_ALBUM}</span></a></li><!-- ENDIF -->
-						</ul>
-					</dd>
-				<!-- ENDIF -->
-				<!-- ENDIF -->
-			</dl>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- END commentrow -->
-
-	<form action="{S_ALBUM_ACTION}" method="post">
-	<fieldset class="display-options" style="margin-top: 0; ">
-		<label>{L_ORDER}: <select name="sort_order"><option value="ASC"<!-- IF SORT_ASC --> selected="selected"<!-- ENDIF -->>{L_SORT_ASCENDING}</option><option value="DESC"<!-- IF not SORT_ASC --> selected="selected"<!-- ENDIF -->>{L_SORT_DESCENDING}</option></select>&nbsp;<input type="submit" name="submit" value="{L_GO}" class="button2" /></label>
-	</fieldset>
-	</form>
-	<hr />
-
-	<div class="topic-actions">
-		<div class="pagination">
-			{IMAGE_COMMENTS} {L_COMMENTS} &bull; {PAGE_NUMBER}<!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF -->
-		</div>
-	</div>
-<!-- ENDIF -->
-<!-- ENDIF -->
-
-<p></p><p><a href="{U_RETURN_LINK}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {S_RETURN_LINK}</a></p>
-<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.album_id.value == -1){return false;}">
-	<fieldset class="jumpbox">
-		<label for="album_id" accesskey="album_id">{L_JUMP_TO}:</label>
-		<select name="album_id" id="album_id" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
-			{ALBUM_JUMPBOX}
-		</select>
-		<input type="submit" value="{L_GO}" class="button2" />
-	</fieldset>
-</form>
-
-<!-- INCLUDE gallery/gallery_footer.html -->
\ No newline at end of file
diff --git a/template/index.htm b/template/index.htm
index ee1f723..e69de29 100644
--- a/template/index.htm
+++ b/template/index.htm
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/template/index_body.html b/template/index_body.html
index bffcf93..73b0451 100644
--- a/template/index_body.html
+++ b/template/index_body.html
@@ -1,37 +1,76 @@
 <!-- INCLUDE overall_header.html -->
 
-<br />
+<!-- ZEIT nicht anzeigen: ********************
+<p class="{S_CONTENT_FLOW_END} responsive-center time<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
+<!-- IF S_USER_LOGGED_IN --><p class="responsive-center time">{CURRENT_TIME}</p><!-- ENDIF -->
+********************  -->
+
+<!-- EVENT index_body_markforums_before -->
+<!-- IF U_MARK_FORUMS -->
+	<div class="action-bar compact">
+		<a href="{U_MARK_FORUMS}" class="mark-read rightside" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a>
+	</div>
+<!-- ENDIF -->
+<!-- EVENT index_body_markforums_after -->
+
+<!-- INCLUDE forumlist_body.html -->
+
+<!-- EVENT index_body_forumlist_body_after -->
+
 <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
 	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
-	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a></h3>
+	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
 		<fieldset class="quick-login">
-			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" tabindex="1" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />  
-			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" tabindex="2" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
+			<label for="username"><span>{L_USERNAME}{L_COLON}</span> <input type="text" tabindex="1" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /></label>
+			<label for="password"><span>{L_PASSWORD}{L_COLON}</span> <input type="password" tabindex="2" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" autocomplete="off" /></label>
+			<!-- IF U_SEND_PASSWORD -->
+				<a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a>
+			<!-- ENDIF -->
 			<!-- IF S_AUTOLOGIN_ENABLED -->
-				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" tabindex="3" name="autologin" id="autologin" /></label>
+				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" tabindex="4" name="autologin" id="autologin" /></label>
 			<!-- ENDIF -->
-			<input type="submit" name="login" tabindex="4" value="{L_LOGIN}" class="button2" />
-		{S_LOGIN_REDIRECT}
+			<input type="submit" tabindex="5" name="login" value="{L_LOGIN}" class="button2" />
+			{S_LOGIN_REDIRECT}
 		</fieldset>
-	</form><br /><br />
+	</form>
 <!-- ENDIF -->
 
-<!-- INCLUDE forumlist_body.html -->
-<!-- IF not S_IS_BOT and U_MARK_FORUMS --><div align="right"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a> &bull; <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> &bull; <!-- ENDIF -->{S_TIMEZONE}</div><!-- ENDIF -->
+<!-- EVENT index_body_stat_blocks_before -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
-	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
-	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
-	<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p>
+	<div class="stat-block online-list">
+		<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
+		<p>
+			<!-- EVENT index_body_block_online_prepend -->
+			{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
+			<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
+			<!-- EVENT index_body_block_online_append -->
+		</p>
+	</div>
 <!-- ENDIF -->
 
-<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST -->
-	<h3>{L_BIRTHDAYS}</h3>
-	<p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>
+<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
+	<div class="stat-block birthday-list">
+		<h3>{L_BIRTHDAYS}</h3>
+		<p>
+			<!-- EVENT index_body_block_birthday_prepend -->
+			<!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF -->
+			<!-- EVENT index_body_block_birthday_append -->
+		</p>
+	</div>
 <!-- ENDIF -->
 
 <!-- IF NEWEST_USER -->
-	<h3>{L_STATISTICS}</h3>
-	<p>{TOTAL_POSTS} &bull; {TOTAL_TOPICS}<!-- IF TOTAL_IMAGES --> &bull; {TOTAL_IMAGES}<!-- ENDIF --> &bull; {TOTAL_USERS} &bull; {NEWEST_USER}</p>
+	<div class="stat-block statistics">
+		<h3>{L_STATISTICS}</h3>
+		<p>
+			<!-- EVENT index_body_block_stats_prepend -->
+			{TOTAL_POSTS} &bull; {TOTAL_TOPICS} &bull; {TOTAL_USERS} &bull; {NEWEST_USER}
+			<!-- EVENT index_body_block_stats_append -->
+		</p>
+	</div>
 <!-- ENDIF -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+
+<!-- EVENT index_body_stat_blocks_after -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/jumpbox.html b/template/jumpbox.html
index 5f37759..4b9e48a 100644
--- a/template/jumpbox.html
+++ b/template/jumpbox.html
@@ -1,32 +1,33 @@
+
 <!-- IF S_VIEWTOPIC -->
-	<p></p><p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p>
+	<p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_FORUM}</a></p>
 <!-- ELSEIF S_VIEWFORUM -->
-	<p></p><p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>
+	<p class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_INDEX}</a></p>
 <!-- ELSEIF SEARCH_TOPIC -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
+	<p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO_TOPIC}</a></p>
 <!-- ELSEIF S_SEARCH_ACTION -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>
+	<p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_GO_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
 
-	<!-- IF $CUSTOM_FIELDSET_CLASS -->
-		<fieldset class="{$CUSTOM_FIELDSET_CLASS}">
-	<!-- ELSE -->
-		<fieldset class="jumpbox">
-	<!-- ENDIF -->
-			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</label>
-			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
+	<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox">
+		<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger button dropdown-select">
+			<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->
+		</span>
+		<div class="dropdown hidden">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents">
 			<!-- BEGIN jumpbox_forums -->
-				<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF -->
-				<option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level -->{jumpbox_forums.FORUM_NAME}</option>
-			<!-- END jumpbox_forums -->
-			</select>
-			<input type="submit" value="{L_GO}" class="button2" />
-		</fieldset>
-	</form>
+				<!-- IF jumpbox_forums.FORUM_ID neq -1 -->
+				<li><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level --><a href="{jumpbox_forums.LINK}">{jumpbox_forums.FORUM_NAME}</a></li>
+				<!-- ENDIF -->
+				<!-- END jumpbox_forums -->
+			</ul>
+		</div>
+	</div>
 
-<!-- ELSE -->
-	<br />
-<!-- ENDIF -->
+	<!-- ELSE -->
+	</br></br>
+	<!-- ENDIF -->
+</div>
diff --git a/template/login_body.html b/template/login_body.html
index 229c9e3..ef08035 100644
--- a/template/login_body.html
+++ b/template/login_body.html
@@ -1,21 +1,21 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
+<form action="{S_LOGIN_ACTION}" method="post" id="login" data-focus="<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->">
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
 	<div class="content">
-		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
+		<h2 class="login-title"><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
 
 		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
 		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
 		<dl>
-			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
+			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
 			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
+			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
+			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" autocomplete="off" /></dd>
 			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
 				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
 				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
@@ -32,28 +32,24 @@
 		</dl>
 		<!-- ENDIF -->
 
-
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>Du kannst Dich auch &uuml;ber unseren <a href="https://debianforum.de/forum/ucp.php?mode=login">SSL-gesicherten Zugang</a>
-			anmelden.</dd>
-		</dl>
-
+		{S_LOGIN_REDIRECT}
 		<dl>
 			<dt>&nbsp;</dt>
 			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
 		</dl>
-		{S_FORM_TOKEN}
-		{S_LOGIN_REDIRECT}
 		</fieldset>
 	</div>
-	<span class="corners-bottom"><span></span></span></div>
+
+	<!-- IF not S_ADMIN_AUTH and PROVIDER_TEMPLATE_FILE -->
+		<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
+	<!-- ENDIF -->
+	</div>
 </div>
 
 
 <!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->
 	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
+		<div class="inner">
 
 		<div class="content">
 			<h3>{L_REGISTER}</h3>
@@ -63,10 +59,10 @@
 			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>
 		</div>
 
-		<span class="corners-bottom"><span></span></span></div>
+		</div>
 	</div>
 <!-- ENDIF -->
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/login_body.html.original b/template/login_body.html.original
deleted file mode 100644
index 352ef66..0000000
--- a/template/login_body.html.original
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
-<div class="panel">
-	<div class="inner">
-
-	<div class="content">
-		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
-		
-		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
-		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
-		<dl>
-			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
-			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
-			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
-				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
-				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
-			<!-- ENDIF -->
-		</dl>
-		
-		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_FULL_LOGIN -->
-		<dl>
-			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
-		</dl>
-	
-		</fieldset>
-	</div>
-	</div>
-</div>
-
-<!-- IF not S_ADMIN_AUTH -->
-	<div class="panel">
-		<div class="inner">
-
-		<div class="content">
-			<h3>{L_REGISTER}</h3>
-			<p>{L_LOGIN_INFO}</p>
-			<p><strong><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></strong></p>
-			<hr class="dashed" />
-			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>
-		</div>
-
-		</div>
-	</div>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/template/login_body_oauth.html b/template/login_body_oauth.html
new file mode 100644
index 0000000..156485d
--- /dev/null
+++ b/template/login_body_oauth.html
@@ -0,0 +1,8 @@
+<div class="content">
+	<!-- BEGIN oauth -->
+	<dl>
+		<dt>&nbsp;</dt>
+		<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
+	</dl>
+	<!-- END oauth -->
+</div>
diff --git a/template/login_forum.html b/template/login_forum.html
index d74de15..7fa9736 100644
--- a/template/login_forum.html
+++ b/template/login_forum.html
@@ -1,37 +1,36 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF FORUM_NAME -->
-	<div id="pageheader">
-		<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
-	</div>
-			
-	<br clear="all" /><br />
-<!-- ENDIF -->
 
-<h2 class="solo">{L_LOGIN} {FORUM_NAME}</h2>
+<!-- IF FORUM_NAME --><h2 class="forum-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->
 
 <form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
 {S_FORM_TOKEN}
 <div class="panel">
 	<div class="inner">
 
-	<p>{L_LOGIN_FORUM}</p>
-
-	<fieldset class="fields2">
-	<!-- IF LOGIN_ERROR -->
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd class="error">{LOGIN_ERROR}</dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="password">{L_PASSWORD}:</label></dt>
-		<dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd>
-	</dl>
-	<dl class="fields2">
-		<dt>&nbsp;</dt>
-		<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
-	</dl>
-	</fieldset>
+	<div class="content">
+		<h2 class="login-title">{L_LOGIN}</h2>
+
+		<p>{L_LOGIN_FORUM}</p>
+
+		<fieldset class="fields1">
+			<!-- IF LOGIN_ERROR -->
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd class="error">{LOGIN_ERROR}</dd>
+				</dl>
+			<!-- ENDIF -->
+
+			<dl>
+				<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
+				<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" autocomplete="off" /></dd>
+			</dl>
+			{S_LOGIN_REDIRECT}
+			<dl>
+				<dt>&nbsp;</dt>
+				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
+			</dl>
+		</fieldset>
+	</div>
 
 	</div>
 </div>
@@ -39,4 +38,4 @@
 </form>
 
 <!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/mcp_approve.html b/template/mcp_approve.html
index eef8706..f7874ab 100644
--- a/template/mcp_approve.html
+++ b/template/mcp_approve.html
@@ -1,3 +1,30 @@
+<!-- IF S_AJAX_REQUEST -->
+
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+
+	<!-- IF S_NOTIFY_POSTER -->
+		<label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label>
+	<!-- ENDIF -->
+
+	<!-- IF not S_APPROVE and not S_RESTORE and .reason -->
+		<label><strong>{L_DISAPPROVE_REASON}{L_COLON}</strong>
+		<select name="reason_id">
+			<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
+		</select></label>
+
+		<label><strong>{L_MORE_INFO}{L_COLON}</strong><br /><span>{L_CAN_LEAVE_BLANK}</span>
+			<textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea>
+		</label>
+	<!-- ENDIF -->
+
+	<fieldset class="submit-buttons">
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
+<!-- ELSE -->
+
 <!-- INCLUDE overall_header.html -->
 
 <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
@@ -7,27 +34,27 @@
 
 	<div class="content">
 
-		<h2>{MESSAGE_TITLE}</h2>
-		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
+		<h2 class="message-title">{MESSAGE_TITLE}</h2>
+		<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
 
 		<fieldset>
 		<!-- IF S_NOTIFY_POSTER -->
-			<dl class="panel">
+			<dl class="fields2 nobg">
 				<dt>&nbsp;</dt>
 				<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
 			</dl>
 		<!-- ENDIF -->
 
-		<!-- IF not S_APPROVE -->
+		<!-- IF not S_APPROVE and not S_RESTORE and .reason -->
 			<dl class="fields2 nobg">
-				<dt><label>{L_DISAPPROVE_REASON}:</label></dt>
+				<dt><label>{L_DISAPPROVE_REASON}{L_COLON}</label></dt>
 				<dd><select name="reason_id">
 					<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
 					</select>
 				</dd>
 			</dl>
 			<dl class="fields2 nobg">
-				<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
+				<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
 				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
 			</dl>
 		<!-- ENDIF -->
@@ -39,7 +66,7 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
 			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 		</fieldset>
 
@@ -50,4 +77,5 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
diff --git a/template/mcp_ban.html b/template/mcp_ban.html
index 270fd94..5b798d9 100644
--- a/template/mcp_ban.html
+++ b/template/mcp_ban.html
@@ -5,27 +5,34 @@
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
+
+	<!-- BEGIN bans -->
+		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
+		<!-- IF bans.A_REASON -->
+			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
+		<!-- ENDIF -->
+		<!-- IF bans.A_GIVE_REASON -->
+			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
+		<!-- ENDIF -->
+	<!-- END bans -->
 
 	function display_details(option)
 	{
-		document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
-		document.getElementById('unbanreason').innerHTML = ban_reason[option];
 		document.getElementById('unbanlength').innerHTML = ban_length[option];
+		if (option in ban_reason) {
+			document.getElementById('unbanreason').innerHTML = ban_reason[option];
+		} else {
+			document.getElementById('unbanreason').innerHTML = '';
+		}
+		if (option in ban_give_reason) {
+			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
+		} else {
+			document.getElementById('unbangivereason').innerHTML = '';
+		}
 	}
 
 // ]]>
@@ -42,41 +49,43 @@
 	<p>{L_EXPLAIN}</p>
 
 	<fieldset>
+	<!-- EVENT mcp_ban_fields_before -->
 	<dl>
-		<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{USERNAMES}</textarea></label></dd>
+		<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
+		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{BAN_QUANTIFIER}</textarea></label></dd>
 		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->
 	</dl>
 	<dl>
-		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
+		<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
 		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
 		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 	</dl>
 	<dl>
-		<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
+		<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>
 		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
 		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255" /></dd>
 	</dl>
 
 	<hr />
 
 	<dl>
-		<dt><label for="banexclude0">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+		<dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
 		<dd>
-			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label> 
+			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label>
 			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label>
 		</dd>
 	</dl>
+	<!-- EVENT mcp_ban_fields_after -->
 	</fieldset>
 
 	</div>
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -89,29 +98,31 @@
 
 	<!-- IF S_BANNED_OPTIONS -->
 		<fieldset>
+		<!-- EVENT mcp_ban_unban_before -->
 		<dl>
-			<dt><label for="unban">{L_BAN_CELL}:</label></dt>
+			<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>
 			<dd><select name="unban[]" id="unban" multiple="multiple" size="5" onchange="if (this.selectedIndex != -1) {display_details(this.options[this.selectedIndex].value);}">{BANNED_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt>{L_BAN_LENGTH}:</dt>
+			<dt>{L_BAN_LENGTH}{L_COLON}</dt>
 			<dd><strong id="unbanlength"></strong></dd>
 		</dl>
 		<dl>
-			<dt>{L_BAN_REASON}:</dt>
+			<dt>{L_BAN_REASON}{L_COLON}</dt>
 			<dd><strong id="unbanreason"></strong></dd>
 		</dl>
 		<dl>
-			<dt>{L_BAN_GIVE_REASON}:</dt>
+			<dt>{L_BAN_GIVE_REASON}{L_COLON}</dt>
 			<dd><strong id="unbangivereason"></strong></dd>
 		</dl>
+		<!-- EVENT mcp_ban_unban_after -->
 		</fieldset>
 
 		</div>
 	</div>
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1" />
 	</fieldset>
 
@@ -125,4 +136,4 @@
 	<!-- ENDIF -->
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_footer.html b/template/mcp_footer.html
index cc150bb..89ce7c3 100644
--- a/template/mcp_footer.html
+++ b/template/mcp_footer.html
@@ -1,9 +1,8 @@
 
 		</div>
-	<div class="clear"></div>
 
 	</div>
 	</div>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/mcp_forum.html b/template/mcp_forum.html
index 1ed65ff..06594ca 100644
--- a/template/mcp_forum.html
+++ b/template/mcp_forum.html
@@ -3,53 +3,99 @@
 <!-- DEFINE $CUSTOM_FIELDSET_CLASS = 'forum-selection2' -->
 <!-- INCLUDE jumpbox.html -->
 
-<h2><a href="{U_VIEW_FORUM}">{L_FORUM}: {FORUM_NAME}</a></h2>
+<h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>
 
 <form method="post" id="mcp" action="{S_MCP_ACTION}">
 
 <div class="panel">
 	<div class="inner">
 
-	<!-- IF PAGINATION or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ENDIF -->
+	<div class="action-bar bar-top">
+		<div class="pagination">
+			{TOTAL_TOPICS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
 	<!-- IF .topicrow -->
-		<ul class="topiclist">
+		<ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->">
 			<li class="header">
 				<dl class="icon">
-					<dt>{L_TOPICS}</dt>
+					<dt><div class="list-inner">{L_TOPICS}</div></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-					<dd class="mark">{L_MARK}</dd>
+					<!-- IF not S_MERGE_SELECT --><dd class="mark">{L_MARK}</dd><!-- ENDIF -->
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->">
 
 		<!-- BEGIN topicrow -->
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt <!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-					<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>&nbsp;&nbsp; <!-- ENDIF --> 
+			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
+				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
+					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+					<!-- EVENT topiclist_row_prepend -->
+					<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>&nbsp;&nbsp; <!-- ENDIF -->
+					<!-- EVENT mcp_forum_topic_title_before -->
 					<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
+					<!-- EVENT mcp_forum_topic_title_after -->
+					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
+						<a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}
+						
+						</a>
+					<!-- ENDIF -->
+					<!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED -->
+						<a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}
+						</a> 
+					<!-- ENDIF -->
+					<!-- IF topicrow.S_TOPIC_REPORTED -->
+						<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}
+						</a>
+					<!-- ENDIF -->
 					<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
 					<br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt>
+
+					<div class="responsive-show" style="display: none;">
+						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+						{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
+					</div>
+					<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
+
+					<!-- IF .topicrow.pagination -->
+					<div class="pagination">
+						<ul>
+						<!-- BEGIN pagination -->
+							<!-- IF topicrow.pagination.S_IS_PREV -->
+							<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li>
+							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+							<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+							<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
+							<!-- ENDIF -->
+						<!-- END pagination -->
+						</ul>
+					</div>
+					<!-- ENDIF -->
+
+					<div class="responsive-hide">
+						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+						{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+					</div>
+					<!-- EVENT topiclist_row_append -->
+					</div>
+				</dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}<br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
+				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span></dd>
+				<!-- IF not S_MERGE_SELECT -->
 				<dd class="mark">
 					<!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE -->&nbsp;<!-- ENDIF -->
 				</dd>
+				<!-- ENDIF -->
 			</dl>
 		</li>
 		<!-- END topicrow -->
@@ -61,31 +107,35 @@
 	<!-- ENDIF -->
 
 	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->	
-		<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> 
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
+		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	</fieldset>
 
 	<hr />
 
-	<!-- IF PAGINATION or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ENDIF -->
+	<div class="action-bar bottom">
+		<div class="pagination">
+			{TOTAL_TOPICS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
 	</div>
 </div>
 
+<!-- EVENT mcp_forum_actions_before -->
 <fieldset class="display-actions">
+	<!-- IF not S_MERGE_SELECT -->
 	<select name="action">
 		<option value="" selected="selected">{L_SELECT_ACTION}</option>
 		<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
+		<!-- IF S_CAN_RESTORE --><option value="restore_topic">{L_RESTORE}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
 		<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
@@ -93,15 +143,16 @@
 		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MAKE_ANNOUNCE -->
-			<option value="make_announce">{L_MAKE_ANNOUNCE}</option>
-			<option value="make_global">{L_MAKE_GLOBAL}</option>
-		<!-- ENDIF -->
+		<!-- IF S_CAN_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF -->
+		<!-- IF S_CAN_MAKE_ANNOUNCE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF -->
+		<!-- EVENT mcp_forum_actions_append -->
 	</select>
 	<input class="button2" type="submit" value="{L_SUBMIT}" />
 	<div><a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
+	<!-- ENDIF -->
 	{S_FORM_TOKEN}
 </fieldset>
+<!-- EVENT mcp_forum_actions_after -->
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_front.html b/template/mcp_front.html
index 8f83fcf..8fe7dfd 100644
--- a/template/mcp_front.html
+++ b/template/mcp_front.html
@@ -2,6 +2,8 @@
 
 <h2>{PAGE_TITLE}</h2>
 
+<!-- EVENT mcp_front_latest_unapproved_before -->
+
 <!-- IF S_SHOW_UNAPPROVED -->
 
 	<form id="mcp_queue" method="post" action="{S_MCP_QUEUE_ACTION}">
@@ -10,30 +12,31 @@
 		<div class="inner">
 
 		<h3>{L_LATEST_UNAPPROVED}</h3>
-		<!-- IF S_HAS_UNAPPROVED_POSTS --><p>{L_UNAPPROVED_TOTAL}</p><!-- ENDIF -->
+		<p>{L_UNAPPROVED_TOTAL}</p>
 
 		<!-- IF .unapproved -->
-			<ul class="topiclist">
+			<ul class="topiclist missing-column">
 				<li class="header">
 					<dl>
-						<dt>{L_VIEW_DETAILS}</dt>
+						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>
 						<dd class="moderation"><span>{L_TOPIC} &amp; {L_FORUM}</span></dd>
 					</dl>
 				</li>
 			</ul>
-			<ul class="topiclist cplist">
+			<ul class="topiclist cplist missing-column responsive-show-all">
 
 			<!-- BEGIN unapproved -->
 			<li class="row<!-- IF unapproved.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
 					<dt>
-						<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br />
-						<!-- IF report.PAGINATION --><strong class="pagination"><span>{report.PAGINATION}</span></strong><!-- ENDIF -->
-						{L_POSTED} {L_POST_BY_AUTHOR} <!-- IF unapproved.U_AUTHOR --><a href="{unapproved.U_AUTHOR}">{unapproved.AUTHOR}</a><!-- ELSE -->{unapproved.AUTHOR}<!-- ENDIF --> {L_POSTED_ON_DATE} {unapproved.POST_TIME}
+						<div class="list-inner">
+							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br />
+							{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
+						</div>
 					</dt>
 					<dd class="moderation"><span>
-						{L_TOPIC}: <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br />
-						{L_FORUM}: <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>
+						{L_TOPIC}{L_COLON} <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br />
+						{L_FORUM}{L_COLON} <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>
 					</dd>
 
 			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}" /></dd>
@@ -41,8 +44,6 @@
 			</li>
 			<!-- END unapproved -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_UNAPPROVED_POSTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		</div>
@@ -52,7 +53,7 @@
 	<!-- IF .unapproved -->
 	<fieldset class="display-actions">
 		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;	
+		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
 		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
 		<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
@@ -60,54 +61,101 @@
 		</form>
 <!-- ENDIF -->
 
+<!-- EVENT mcp_front_latest_reported_before -->
+
 <!-- IF S_SHOW_REPORTS -->
 	<div class="panel">
 		<div class="inner">
 
 		<h3>{L_LATEST_REPORTED}</h3>
-		<!-- IF S_HAS_REPORTS --><p>{L_REPORTS_TOTAL}</p><!-- ENDIF -->
+		<p>{L_REPORTS_TOTAL}</p>
 
 		<!-- IF .report -->
-			<ul class="topiclist">
+			<ul class="topiclist two-long-columns">
 				<li class="header">
 					<dl>
-						<dt>{L_VIEW_DETAILS}</dt>
+						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>
 						<dd class="moderation"><span>{L_REPORTER} &amp; {L_FORUM}</span></dd>
 					</dl>
 				</li>
 			</ul>
-			<ul class="topiclist cplist">
+			<ul class="topiclist cplist two-long-columns responsive-show-all">
 
 			<!-- BEGIN report -->
 			<li class="row<!-- IF report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
 					<dt>
-						<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br />
-						<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} {L_POSTED_ON_DATE}  {report.POST_TIME}</span>
+						<div class="list-inner">
+							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br />
+							<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} &raquo; {report.POST_TIME}</span>
+						</div>
 					</dt>
 					<dd class="moderation">
 						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br />
-						{L_FORUM}: <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>
+						{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>
 					</dd>
 				</dl>
 			</li>
 			<!-- END report -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_REPORTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		</div>
 	</div>
 <!-- ENDIF -->
 
+<!-- EVENT mcp_front_latest_reported_pms_before -->
+
+<!-- IF S_SHOW_PM_REPORTS -->
+	<div class="panel">
+		<div class="inner">
+
+		<h3>{L_LATEST_REPORTED_PMS}</h3>
+		<p>{L_PM_REPORTS_TOTAL}</p>
+
+		<!-- IF .pm_report -->
+			<ul class="topiclist two-long-columns">
+				<li class="header">
+					<dl>
+						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>
+						<dd class="moderation"><span>{L_REPORTER}</span></dd>
+					</dl>
+				</li>
+			</ul>
+			<ul class="topiclist cplist two-long-columns responsive-show-all">
+
+			<!-- BEGIN pm_report -->
+			<li class="row<!-- IF pm_report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
+				<dl>
+					<dt>
+						<div class="list-inner">
+							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br />
+							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} &raquo; {pm_report.PM_TIME}</span><br />
+							<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span>
+						</div>
+					</dt>
+					<dd class="moderation">
+						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {pm_report.REPORTER_FULL} {L_REPORTED_ON_DATE} {pm_report.REPORT_TIME}</span>
+					</dd>
+				</dl>
+			</li>
+			<!-- END pm_report -->
+			</ul>
+		<!-- ENDIF -->
+
+		</div>
+	</div>
+<!-- ENDIF -->
+
+<!-- EVENT mcp_front_latest_logs_before -->
+
 <!-- IF S_SHOW_LOGS -->
 	<div class="panel">
 		<div class="inner">
-	
+
 		<h3>{L_LATEST_LOGS}</h3>
 
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th class="name">{L_ACTION}</th>
@@ -130,7 +178,7 @@
 		</tr>
 	<!-- BEGINELSE -->
 		<tr>
-			<td colspan="5">{L_NO_ENTRIES}</td>
+			<td colspan="6">{L_NO_ENTRIES}</td>
 		</tr>
 	<!-- END log -->
 		</tbody>
@@ -140,4 +188,6 @@
 	</div>
 <!-- ENDIF -->
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- EVENT mcp_front_latest_logs_after -->
+
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_header.html b/template/mcp_header.html
index 42924f1..5841c1b 100644
--- a/template/mcp_header.html
+++ b/template/mcp_header.html
@@ -3,17 +3,15 @@
 <h2>{L_MCP}</h2>
 
 <!-- IF U_MCP -->
-	<p class="linkmcp">
-		[ <a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF -->
-		<!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF -->
-		<!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ]
+	<p class="linkmcp responsive-center">
+		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
 	</p>
 <!-- ENDIF -->
 
-<div id="tabs">
+<div id="tabs" class="tabs">
 	<ul>
 		<!-- BEGIN l_block1 -->
-		<li<!-- IF l_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+		<li class="tab<!-- IF l_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a></li>
 		<!-- END l_block1 -->
 	</ul>
 </div>
@@ -23,14 +21,14 @@
 
 	<div style="width: 100%;">
 
-	<div id="cp-menu">
-		<div id="navigation">
+	<div id="cp-menu" class="cp-menu">
+		<div id="navigation" class="navigation" role="navigation">
 			<ul>
 			<!-- BEGIN l_block1 -->
 			<!-- IF l_block1.S_SELECTED -->
 				<!-- BEGIN l_block2 -->
 				<!-- IF l_block1.l_block2.S_SELECTED -->
-				<li id="active-subsection"><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li>
+				<li id="active-subsection" class="active-subsection"><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li>
 				<!-- ELSE -->
 				<li><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li>
 				<!-- ENDIF -->
@@ -41,27 +39,11 @@
 		</div>
 	</div>
 
-	<div id="cp-main" class="mcp-main">
+	<div id="cp-main" class="cp-main mcp-main panel-container">
 		<!-- IF MESSAGE -->
 		<div class="content">
-			<h2>{L_MESSAGE}</h2>
-			<p>{MESSAGE}</p>
+			<h2 class="message-title">{L_MESSAGE}</h2>
+			<p class="error">{MESSAGE}</p>
 			<p><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></p>
 		</div>
 		<!-- ENDIF -->
-
-		<!-- IF CONFIRM_MESSAGE -->
-			<form id="confirm" method="post" action="{S_CONFIRM_ACTION}"{S_FORM_ENCTYPE}>
-
-			<div class="content">
-				<h2>{L_PLEASE_CONFIRM}</h2>
-				<p>{CONFIRM_MESSAGE}</p>
-			
-				<fieldset class="submit-buttons">
-					{S_HIDDEN_FIELDS}<input class="button1" type="submit" name="submit" value="{L_YES}" />&nbsp; 
-					<input class="button2" type="cancel" value="{L_NO}" />
-				</fieldset>
-			</div>
-
-			</form>
-		<!-- ENDIF -->
diff --git a/template/mcp_logs.html b/template/mcp_logs.html
index 9fda3c7..03216b4 100644
--- a/template/mcp_logs.html
+++ b/template/mcp_logs.html
@@ -7,20 +7,25 @@
 <div class="panel">
 	<div class="inner">
 
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
+	<div class="action-bar bar-top">
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		<div class="pagination">
+			{TOTAL}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
-		<th>{L_USERNAME}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th class="name">{L_USERNAME}</th>
+		<th class="center">{L_IP}</th>
+		<th class="center">{L_TIME}</th>
+		<th class="name">{L_ACTION}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
 	</thead>
@@ -29,8 +34,8 @@
 		<!-- BEGIN log -->
 		<!-- IF log.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
 			<td>{log.USERNAME}</td>
-			<td style="text-align: center">{log.IP}</td>
-			<td style="text-align: center">{log.DATE}</td>
+			<td class="center">{log.IP}</td>
+			<td class="center">{log.DATE}</td>
 			<td>{log.ACTION}<br />
 			{log.DATA}
 		</td>
@@ -46,23 +51,19 @@
 	</table>
 
 	<!-- IF .log -->
-		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		</fieldset>
+		<div class="action-bar bottom">
+			<!-- INCLUDE display_options.html -->
 
-		<hr />
+			<div class="pagination">
+				{TOTAL}
+				<!-- IF .pagination -->
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE -->
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
 
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
 		{S_FORM_TOKEN}
 		</div>
 	</div>
@@ -71,7 +72,7 @@
 			<fieldset class="display-actions">
 				<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
 				&nbsp;<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
-	
+
 				<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
 			</fieldset>
 		<!-- ENDIF -->
@@ -84,4 +85,4 @@
 
 <br />
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_message.html b/template/mcp_message.html
index 1fde48b..062103b 100644
--- a/template/mcp_message.html
+++ b/template/mcp_message.html
@@ -1,8 +1,8 @@
 <!-- INCLUDE mcp_header.html -->
 
 <div class="content">
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_move.html b/template/mcp_move.html
index 9aae88a..45a9ae8 100644
--- a/template/mcp_move.html
+++ b/template/mcp_move.html
@@ -1,19 +1,53 @@
+<!-- IF S_AJAX_REQUEST -->
+
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+
+	<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
+
+	<label>
+		<strong>{L_SELECT_DESTINATION_FORUM}{L_COLON}</strong>
+		<select name="to_forum_id">{S_FORUM_SELECT}</select>
+	</label>
+
+	<!-- IF S_CAN_LEAVE_SHADOW -->
+		<label for="move_leave_shadow">
+			<input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}
+		</label>
+	<!-- ENDIF -->
+
+	<!-- IF S_CAN_LOCK_TOPIC -->
+		<label for="move_lock_topics">
+			<input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}
+		</label>
+	<!-- ENDIF -->
+
+	<fieldset class="submit-buttons">
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
+<!-- ELSE -->
+
 <!-- INCLUDE overall_header.html -->
 
+<!-- EVENT mcp_move_before -->
+
 <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
 
 <div class="panel">
 	<div class="inner">
 
 	<div class="content">
-		<h2>{MESSAGE_TITLE}</h2>
+		<h2 class="message-title">{MESSAGE_TITLE}</h2>
 		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
 
 		<fieldset>
 		<dl class="fields2">
-			<dt><label>{L_SELECT_DESTINATION_FORUM}:</label></dt>
+			<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>
 			<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" checked="checked" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
+			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
+			<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
@@ -22,7 +56,7 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
 			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 			{S_FORM_TOKEN}
 		</fieldset>
@@ -33,4 +67,5 @@
 </div>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
diff --git a/template/mcp_notes_front.html b/template/mcp_notes_front.html
index b455254..11f3623 100644
--- a/template/mcp_notes_front.html
+++ b/template/mcp_notes_front.html
@@ -9,7 +9,7 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="username">{L_SELECT_USER}:</label></dt>
+		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>
 		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -19,10 +19,10 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_notes_user.html b/template/mcp_notes_user.html
index 7be61a0..62d0562 100644
--- a/template/mcp_notes_user.html
+++ b/template/mcp_notes_user.html
@@ -7,7 +7,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3>
+	<h3>{USERNAME_FULL}</h3>
 
 	<div>
 		<div class="column1">
@@ -16,11 +16,11 @@
 
 		<div class="column2">
 			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
+				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
+				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
+				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
 			</dl>
 		</div>
 	</div>
@@ -42,27 +42,32 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 
 <div class="panel">
-	<div class="inner">		
+	<div class="inner">
 
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
+	<div class="action-bar bar-top">
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		<div class="pagination">
+			{TOTAL_REPORTS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
+		<th class="name reportby">{L_REPORT_BY}</th>
+		<th class="center">{L_IP}</th>
+		<th class="center">{L_TIME}</th>
 		<th>{L_ACTION_NOTE}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
@@ -71,41 +76,35 @@
 	<!-- BEGIN usernotes -->
 	<!-- IF usernotes.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
 		<td>{usernotes.REPORT_BY}</td>
-		<td style="text-align: center">{usernotes.IP}</td>
-		<td style="text-align: center">{usernotes.REPORT_AT}</td>
+		<td class="center">{usernotes.IP}</td>
+		<td class="center">{usernotes.REPORT_AT}</td>
 		<td>{usernotes.ACTION}</td>
 
-		<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
+		<!-- IF S_CLEAR_ALLOWED --><td class="center" style="width: 5%;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
 		<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
 	</tr>
-	<!-- END usernames -->
+	<!-- END usernotes -->
 	</tbody>
 	</table>
 
-	<hr />
-
-	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>		
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
-	</fieldset>
+	<div class="action-bar bottom">
+		<!-- INCLUDE display_options.html -->
 
-	<hr />
-
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
+		<div class="pagination">
+			{TOTAL_REPORTS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
 	</div>
-</div>	
+</div>
 
 <!-- IF S_CLEAR_ALLOWED -->
 <fieldset class="display-actions">
@@ -114,9 +113,9 @@
 </fieldset>
 
 <fieldset class="display-actions">
-	<div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>		
+	<div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>
 </fieldset>
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_post.html b/template/mcp_post.html
index 90f49a7..e0da0e8 100644
--- a/template/mcp_post.html
+++ b/template/mcp_post.html
@@ -1,16 +1,20 @@
 <!-- INCLUDE mcp_header.html -->
 
 <!-- IF S_MCP_REPORT -->
+	<!-- IF S_PM -->
+	<h2>{L_PM_REPORT_DETAILS}</h2>
+	<!-- ELSE -->
 	<h2>{L_REPORT_DETAILS}</h2>
+	<!-- ENDIF -->
 
 	<div id="report" class="panel">
 		<div class="inner">
 
 		<div class="postbody">
-			<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3>
-			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} {L_REPORTED_ON_DATE}  {REPORT_DATE}</p>
-		<!-- IF not S_POST_REPORTED -->
-			<p class="rules">{L_REPORT_CLOSED}</p>
+			<h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3>
+			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} &laquo; {REPORT_DATE}</p>
+		<!-- IF S_REPORT_CLOSED -->
+			<p class="post-notice reported"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i>{L_REPORT_CLOSED}</p>
 		<!-- ENDIF -->
 			<div class="content">
 			<!-- IF REPORT_TEXT -->
@@ -24,10 +28,10 @@
 		</div>
 	</div>
 
-	<form method="post" id="mcp_report" action="{U_CLOSE_ACTION}">
+	<form method="post" id="mcp_report" action="{S_CLOSE_ACTION}">
 
 	<fieldset class="submit-buttons">
-		<!-- IF S_POST_REPORTED -->
+		<!-- IF not S_REPORT_CLOSED -->
 			<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> &nbsp;
 		<!-- ENDIF -->
 		<input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" />
@@ -44,21 +48,52 @@
 	<div class="inner">
 
 	<div class="postbody">
-		<!-- IF U_EDIT -->
-		<ul class="profile-icons">
-			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
+		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
+
+		<ul class="post-buttons">
+			<li id="expand">
+				<a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data.trim() == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data.trim() == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}';} return false;">
+					{L_EXPAND_VIEW}
+				</a>
+			</li>
+			<!-- IF U_EDIT -->
+				<li>
+					<a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon">
+						<span>{L_EDIT_POST}</span>
+					</a>
+				</li>
+			<!-- ENDIF -->
 		</ul>
-		<!-- ENDIF -->
 
-		<h3>{POST_SUBJECT}</h3>
-		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} {L_POSTED_ON_DATE}  {POST_DATE}</p>
+		<!-- IF S_PM -->
+		<p class="author">
+			<strong>{L_SENT_AT}{L_COLON}</strong> {POST_DATE}
+			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL}
+			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
+			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
+		</p>
+		<!-- ELSE -->
+		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
+		<!-- ENDIF -->
 
 		<!-- IF S_POST_UNAPPROVED -->
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
-			<p class="rules">
-				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp; 
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
+			<p class="post-notice unapproved">
+				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
+				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
+				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
+				{S_FORM_TOKEN}
+			</p>
+			</form>
+		<!-- ELSEIF S_POST_DELETED -->
+			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
+
+			<p class="post-notice deleted">
+				<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> &nbsp;
+				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
+				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 				{S_FORM_TOKEN}
 			</p>
@@ -66,12 +101,12 @@
 		<!-- ENDIF -->
 
 		<!-- IF S_MESSAGE_REPORTED -->
-			<p class="rules">
+			<p class="post-notice reported">
 				{REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>
 			</p>
 		<!-- ENDIF -->
-		
-		<div class="content">
+
+		<div class="content" id="post_details">
 			{POST_PREVIEW}
 		</div>
 
@@ -84,13 +119,20 @@
 			</dl>
 		<!-- ENDIF -->
 
+		<!-- IF DELETED_MESSAGE or DELETE_REASON -->
+			<div class="notice">
+				{DELETED_MESSAGE}
+				<!-- IF DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{DELETE_REASON}</em><!-- ENDIF -->
+			</div>
+		<!-- ENDIF -->
+
 		<!-- IF SIGNATURE -->
 			<div id="sig{POST_ID}" class="signature">{SIGNATURE}</div>
 		<!-- ENDIF -->
 
 		<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->
 			<hr />
-			<div>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
+			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} <!-- IF U_WHOIS -->
 				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
 			<!-- ELSE -->
 				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
@@ -102,7 +144,7 @@
 	</div>
 </div>
 
-<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
+<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER or S_MCP_POST_ADDITIONAL_OPTS -->
 	<div class="panel">
 		<div class="inner">
 
@@ -112,7 +154,7 @@
 
 			<fieldset>
 			<dl>
-				<dt><label>{L_CHANGE_POSTER}:</label></dt>
+				<dt><label>{L_CHANGE_POSTER}{L_COLON}</label></dt>
 				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->
 				<dd style="margin-top:3px;">
 					<input class="inputbox autowidth" type="text" name="username" value="" />
@@ -125,13 +167,15 @@
 			</fieldset>
 			</form>
 		<!-- ENDIF -->
-	
+
+		<!-- EVENT mcp_post_additional_options -->
+
 		<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
 			<form method="post" id="mcp" action="{U_MCP_ACTION}">
 
 			<fieldset>
 			<dl>
-				<dt><label>{L_MOD_OPTIONS}:</label></dt>
+				<dt><label>{L_MOD_OPTIONS}{L_COLON}</label></dt>
 				<dd><select name="action">
 					<!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF -->
 					<!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF -->
@@ -152,7 +196,7 @@
 	<div class="panel">
 		<div class="inner">
 
-		<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p>
+		<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p>
 
 		</div>
 	</div>
@@ -171,10 +215,10 @@
 				<h3>{L_FEEDBACK}</h3>
 
 				<!-- BEGIN usernotes -->
-					<span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} {L_REPORTED_ON_DATE} {usernotes.REPORT_AT}</strong></span>
+					<span class="small"><strong>{L_REPORTED_BY}{L_COLON} {usernotes.REPORT_BY} &laquo; {usernotes.REPORT_AT}</strong></span>
 					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
 					<div class="postbody">{usernotes.ACTION}</div>
-		
+
 					<hr class="dashed" />
 				<!-- END usernotes -->
 
@@ -194,7 +238,7 @@
 			</fieldset>
 
 			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp; 
+				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;
 				<input class="button2" type="reset" value="{L_RESET}" />
 				{S_FORM_TOKEN}
 			</fieldset>
@@ -211,10 +255,10 @@
 			<h3>{L_MCP_POST_REPORTS}</h3>
 
 			<!-- BEGIN reports -->
-				<span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> {L_REPORTED_ON_DATE} {reports.REPORT_TIME}</strong></span>
-				<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
+				<span class="small"><strong>{L_REPORTED_BY}{L_COLON} <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> &laquo; {reports.REPORT_TIME}</strong></span>
+				<p><em>{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
 			<!-- END reports -->
-	
+
 			</div>
 		</div>
 	<!-- ENDIF -->
@@ -223,13 +267,13 @@
 		<div class="panel" id="ip">
 			<div class="inner">
 
-			<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
+			<p>{L_THIS_POST_IP}{L_COLON} <!-- IF U_WHOIS -->
 				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
 			<!-- ELSE -->
 				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
 			<!-- ENDIF --></p>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_OTHER_USERS}</th>
@@ -250,7 +294,7 @@
 			</tbody>
 			</table>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_IPS_POSTED_FROM}</th>
@@ -281,4 +325,4 @@
 
 <!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_queue.html b/template/mcp_queue.html
index c23ff03..b192d46 100644
--- a/template/mcp_queue.html
+++ b/template/mcp_queue.html
@@ -3,7 +3,7 @@
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
 <fieldset class="forum-selection">
-	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
+	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
 	<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -16,44 +16,57 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>	
-		<ul class="topiclist">
+		<div class="action-bar bar-top">
+			<div class="pagination">
+				{TOTAL}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
+		<ul class="topiclist missing-column">
 			<li class="header">
 				<dl>
-					<dt><!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --></dt>
+					<dt><div class="list-inner"><!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --></div></dt>
 					<dd class="moderation"><span><!-- IF not S_TOPICS -->{L_TOPIC} &amp; <!-- ENDIF -->{L_FORUM}</span></dd>
 					<dd class="mark">{L_MARK}</dd>
 				</dl>
 			</li>
 			</ul>
-			<ul class="topiclist cplist">
+			<ul class="topiclist cplist missing-column responsive-show-all">
 
 		<!-- BEGIN postrow -->
 
 		<!-- IF postrow.S_DELETED_TOPIC -->
-			<li><p class="notopics">{L_DELETED_TOPIC}</li>		
+			<li><p class="notopics">{L_DELETED_TOPIC}</p></li>
 		<!-- ELSE -->
-	
+
 		<li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
 				<dt>
-					<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> <br />
-					<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} {L_POSTED_ON_DATE}  {postrow.POST_TIME}</span>
+					<div class="list-inner">
+						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><!-- IF postrow.S_HAS_ATTACHMENTS --> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --><br />
+						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
+					</div>
 				</dt>
 				<dd class="moderation">
 					<span>
-						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}: <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
-						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
+						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
+						{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
 					</span>
 				</dd>
-				
-			
-		 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></dd>
+
+
+		 		<dd class="mark">
+					<!-- IF S_TOPICS -->
+						<input type="checkbox" name="topic_id_list[]" value="{postrow.TOPIC_ID}" />
+					<!-- ELSE -->
+						<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" />
+					<!-- ENDIF -->
+				</dd>
 			</dl>
 		</li>
 		<!-- ENDIF -->
@@ -61,9 +74,7 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->		
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
+			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
@@ -71,14 +82,25 @@
 
 		<hr />
 
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>		
+		<div class="action-bar bottom">
+			<div class="pagination">
+				{TOTAL}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
 	<!-- ELSE -->
-		<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></strong></p>
+		<p class="notopics"><strong>
+			<!-- IF S_RESTORE -->
+				<!-- IF S_TOPICS -->{L_NO_TOPICS_DELETED}<!-- ELSE -->{L_NO_POSTS_DELETED}<!-- ENDIF -->
+			<!-- ELSE -->
+				<!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF -->
+			<!-- ENDIF -->
+		</strong></p>
 	<!-- ENDIF -->
 
 	</div>
@@ -86,11 +108,22 @@
 
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
+		<!-- IF S_RESTORE -->
+		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
+		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" />
+		<!-- ELSE -->
 		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
 		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
-		<div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
+		<!-- ENDIF -->
+		<div>
+			<!-- IF S_TOPICS -->
+				<a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a>
+			<!-- ELSE -->
+				<a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a>
+			<!-- ENDIF -->
+		</div>
 	</fieldset>
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_reports.html b/template/mcp_reports.html
index 9c8469e..eb380d0 100644
--- a/template/mcp_reports.html
+++ b/template/mcp_reports.html
@@ -2,11 +2,13 @@
 
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
+<!-- IF not S_PM -->
 <fieldset class="forum-selection">
-	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
+	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
 	<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	{S_FORM_TOKEN}
 </fieldset>
+<!-- ENDIF -->
 
 <h2>{L_TITLE}</h2>
 
@@ -16,34 +18,61 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>	
-		<ul class="topiclist">
+		<div class="action-bar bar-top">
+			<div class="pagination">
+				{TOTAL_REPORTS}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
+		<ul class="topiclist missing-column">
 			<li class="header">
 				<dl>
-					<dt>{L_VIEW_DETAILS}</dt>
-					<dd class="moderation"><span>{L_REPORTER} &amp; {L_FORUM}</span></dd>
+					<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>
+					<dd class="moderation"><span>{L_REPORTER}<!-- IF not S_PM --> &amp; {L_FORUM}<!-- ENDIF --></span></dd>
 					<dd class="mark">{L_MARK}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist missing-column">
 
 		<!-- BEGIN postrow -->
 			<li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
+					<!-- IF S_PM -->
 					<dt>
-						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
-						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} {L_POSTED_ON_DATE}  {postrow.POST_TIME}</span>
+						<div class="list-inner">
+							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br />
+							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} &raquo; {postrow.PM_TIME}</span><br />
+							<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
+							<div class="responsive-show" style="display: none;">
+								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}
+							</div>
+						</div>
 					</dt>
 					<dd class="moderation">
-						<span>{postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}<br />
-						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span>
+						<span>{postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}</span>
 					</dd>
+					<!-- ELSE -->
+					<dt>
+						<div class="list-inner">
+							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
+							<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
+							<div class="responsive-show" style="display: none;">
+								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br />
+								<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF -->
+							</div>
+						</div>
+					</dt>
+					<dd class="moderation">
+						<span>{postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br />
+						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span>
+					</dd>
+					<!-- ENDIF -->
 					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd>
 				</dl>
 			</li>
@@ -51,20 +80,24 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
+			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		</fieldset>
+
 		<hr />
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
+
+		<div class="action-bar bottom">
+			<div class="pagination">
+				{TOTAL_REPORTS}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
 
 	<!-- ELSE -->
 		<p><strong>{L_NO_REPORTS}</strong></p>
@@ -74,7 +107,7 @@
 </div>
 
 <!-- IF .postrow -->
-	<fieldset class="display-actions">		
+	<fieldset class="display-actions">
 		<input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
 		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
 		<div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
@@ -82,4 +115,4 @@
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_topic.html b/template/mcp_topic.html
index de27091..e18e3dc 100644
--- a/template/mcp_topic.html
+++ b/template/mcp_topic.html
@@ -1,87 +1,79 @@
 <!-- INCLUDE mcp_header.html -->
 
-<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
-
-<script type="text/javascript">
-// <![CDATA[
-var panels = new Array('display-panel', 'split-panel', 'merge-panel');
+<div class="tabs-container">
+<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}{L_COLON} {TOPIC_TITLE}</a></h2>
 
 <!-- IF S_MERGE_VIEW -->
-	var show_panel = 'merge-panel';
+	<!-- DEFINE $SHOW_PANEL = 'merge-panel' -->
 <!-- ELSEIF S_SPLIT_VIEW -->
-	var show_panel = 'split-panel';
+	<!-- DEFINE $SHOW_PANEL = 'split-panel' -->
 <!-- ELSE -->
-	var show_panel = 'display-panel';
+	<!-- DEFINE $SHOW_PANEL = 'display-panel' -->
 <!-- ENDIF -->
 
-onload_functions.push('subPanels()');
-
-// ]]>
-</script>
-
-<div id="minitabs">
+<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist">
 	<ul>
-		<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
-			
-			<a href="#minitabs" onclick="subPanels('display-panel'); return false;"><span>{L_DISPLAY_OPTIONS}</span></a>
+		<li id="display-panel-tab" class="tab<!-- IF not S_MERGE_VIEW --> activetab<!-- ENDIF -->">
+			<a href="#minitabs" data-subpanel="display-panel" role="tab" aria-controls="display-panel">{L_DISPLAY_OPTIONS}</a>
 		</li>
-		<li id="split-panel-tab">
-			
-			<a href="#minitabs" onclick="subPanels('split-panel'); return false;"><span>{L_SPLIT_TOPIC}</span></a>
+		<li id="split-panel-tab" class="tab">
+			<a href="#minitabs" data-subpanel="split-panel" role="tab" aria-controls="split-panel">{L_SPLIT_TOPIC}</a>
 		</li>
-		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
-			
-			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_TOPIC}</span></a>
+		<li id="merge-panel-tab" class="tab<!-- IF S_MERGE_VIEW --> activetab<!-- ENDIF -->">
+			<a href="#minitabs" data-subpanel="merge-panel" role="tab" aria-controls="merge-panel">{L_MERGE_POSTS}</a>
 		</li>
 	</ul>
 </div>
+</div>
 
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
 <div class="panel">
 	<div class="inner">
 
-	<fieldset id="display-panel" class="fields2">
+	<fieldset id="display-panel" class="fields2" role="tabpanel">
 	<dl>
-		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}:</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
-		<dd><input class="inputbox autowidth" type="text" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>
+		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
+		<dd><input class="inputbox autowidth" type="number" min="0" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>
 	</dl>
 	<dl>
-		<dt><label>{L_DISPLAY_POSTS}:</label></dt>
+		<dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt>
 		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>
 	</dl>
 	</fieldset>
 
 <!-- IF S_CAN_SPLIT -->
-	<fieldset id="split-panel" class="fields2">
+	<fieldset id="split-panel" class="fields2" role="tabpanel">
 		<p>{L_SPLIT_TOPIC_EXPLAIN}</p>
 
 	<!-- IF S_SHOW_TOPIC_ICONS -->
 		<dl>
-			<dt><label for="icon">{L_TOPIC_ICON}:</label></dt>
+			<dt><label for="icon">{L_TOPIC_ICON}{L_COLON}</label></dt>
 			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> {L_NO_TOPIC_ICON}</label>
 			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --></dd>
 		</dl>
 	<!-- ENDIF -->
 
+	<!-- EVENT mcp_topic_options_before -->
 	<dl>
-		<dt><label for="subject">{L_SPLIT_SUBJECT}:</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SPLIT_SUBJECT}" title="Type the post subject" class="inputbox" /></dd>
+		<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt>
+		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>
 	</dl>
+	<!-- EVENT mcp_topic_options_after -->
 	<dl>
-		<dt><label>{L_SPLIT_FORUM}:</label></dt>
+		<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>
 		<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
 	</dl>
 	</fieldset>
 <!-- ENDIF -->
 
 <!-- IF S_CAN_MERGE -->
-	<fieldset id="merge-panel" class="fields2">
+	<fieldset id="merge-panel" class="fields2" role="tabpanel">
 		<p>{L_MERGE_TOPIC_EXPLAIN}</p>
 	<dl>
-		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}:</label></dt>
+		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt>
 		<dd>
-			<input class="inputbox autowidth" type="text" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />
+			<input class="inputbox autowidth" type="number" min="0" max="9999999999" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />
 			<a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a>
 		</dd>
 		<!-- IF TO_TOPIC_INFO --><dd>{TO_TOPIC_INFO}</dd><!-- ENDIF -->
@@ -95,26 +87,48 @@ onload_functions.push('subPanels()');
 <div class="panel">
 	<div class="inner">
 
-	<h3 id="review">
+	<h3 id="review" class="review">
 		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-		{L_TOPIC_REVIEW}: {TOPIC_TITLE}
+		{L_TOPIC_REVIEW}{L_COLON} <!-- EVENT mcp_topic_topic_title_before -->{TOPIC_TITLE}<!-- EVENT mcp_topic_topic_title_after -->
 	</h3>
 
-	<div id="topicreview">
+	<div id="topicreview" class="topicreview">
 		<!-- BEGIN postrow -->
 		<div class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 			<div class="inner">
 
 			<div class="postbody" id="pr{postrow.POST_ID}">
-				<div class="right-box"><a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> | {L_SELECT}: <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></div>
+				<ul class="post-buttons">
+					<li>
+						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
+							<i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span>
+						</a>
+					</li>
+					<li>
+						<label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON}
+							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> />
+						</label>
+					</li>
+				</ul>
 
 				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
 				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
 
-				<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
-				<p class="rules">
-					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><!-- ENDIF -->
-					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
+				<!-- IF postrow.S_POST_UNAPPROVED -->
+				<p class="post-notice unapproved">
+					<a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a>
+				</p>
+				<!-- ENDIF -->
+
+				<!-- IF postrow.S_POST_DELETED -->
+				<p class="post-notice deleted">
+					<a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED}</strong></a>
+				</p>
+				<!-- ENDIF -->
+
+				<!-- IF postrow.S_POST_REPORTED -->
+				<p class="post-notice reported">
+					<a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a>
 				</p>
 				<!-- ENDIF -->
 
@@ -138,14 +152,16 @@ onload_functions.push('subPanels()');
 
 	<hr />
 
-	<!-- IF PAGINATION or TOTAL_POSTS -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-	<!-- ENDIF -->
+	<div class="action-bar bar-bottom">
+		<div class="pagination">
+			{TOTAL_POSTS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 
 	</div>
 </div>
@@ -156,15 +172,17 @@ onload_functions.push('subPanels()');
 		<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
+		<!-- IF S_CAN_RESTORE --><option value="restore">{L_RESTORE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF S_MERGE_VIEW --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
+		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 	</select>&nbsp;
 	<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
-	<div><a href="#" onclick="marklist('mcp', '', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', '', false); return false;">{L_UNMARK_ALL}</a></div>
+	<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>
 {S_HIDDEN_FIELDS}
 {S_FORM_TOKEN}
 </fieldset>
 
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_viewlogs.html b/template/mcp_viewlogs.html
deleted file mode 100644
index 264152d..0000000
--- a/template/mcp_viewlogs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{S_MCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
-<tr>
-	<th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-</tr>
-<tr>
-	<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th>
-	<th width="12%" nowrap="nowrap">{L_IP}</th>
-	<th width="18%" nowrap="nowrap">{L_TIME}</th>
-	<th width="45%" nowrap="nowrap">{L_ACTION}</th>
-	<!-- IF not S_TOPIC_ID --><th width="8%" nowrap="nowrap"></th><!-- ENDIF -->
-</tr>
-<!-- IF S_TOPIC_ID -->
-	<tr>
-		<td class="bg3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEW_TOPIC}"><strong>{TOPIC_NAME}</strong></a></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- BEGIN log -->
-<tr>
-	<td class="bg1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td>
-	<td class="bg1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
-	<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
-	<td class="bg1"><span class="gen">{log.ACTION}</span></td>
-	<!-- IF not S_TOPIC_ID -->
-		<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td>
-	<!-- ENDIF -->
-</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="bg1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-	</tr>
-<!-- END log -->
-<div>
-	{S_FORM_TOKEN}
-</div>
-</table>
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
-	<td align="right" valign="top" nowrap="nowrap"><!-- IF PAGINATION --><strong><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></strong><!-- ENDIF --></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
diff --git a/template/mcp_warn_front.html b/template/mcp_warn_front.html
index bec77cb..9b188b5 100644
--- a/template/mcp_warn_front.html
+++ b/template/mcp_warn_front.html
@@ -11,7 +11,7 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="username">{L_SELECT_USER}:</label></dt>
+		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>
 		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -21,7 +21,7 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -33,7 +33,7 @@
 	<h3>{L_MOST_WARNINGS}</h3>
 
 	<!-- IF .highest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
@@ -51,11 +51,11 @@
 				<td>{highest.WARNING_TIME}</td>
 				<td><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></td>
 			</tr>
-		<!-- END latest -->
+		<!-- END highest -->
 		</tbody>
 		</table>
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	</div>
@@ -67,7 +67,7 @@
 	<h3>{L_LATEST_WARNINGS}</h3>
 
 	<!-- IF .latest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
@@ -88,10 +88,10 @@
 		</tbody>
 		</table>
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	</div>
 </div>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_warn_list.html b/template/mcp_warn_list.html
index 9fe2309..779bf6a 100644
--- a/template/mcp_warn_list.html
+++ b/template/mcp_warn_list.html
@@ -10,14 +10,18 @@
 	<p>{L_WARNED_USERS_EXPLAIN}</p>
 
 	<!-- IF .user -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-		
-		<table class="table1" cellspacing="0">
+		<div class="action-bar bar-top">
+			<div class="pagination">
+				{TOTAL_USERS}
+				<!-- IF .pagination -->
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE -->
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
@@ -38,22 +42,28 @@
 		<!-- END user -->
 		</tbody>
 		</table>
-	<!-- IF .user -->
+
 		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
+			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		</fieldset>
+
 		<hr />
-	<!-- ENDIF -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
+
+		<div class="action-bar bottom">
+			<div class="pagination">
+				{TOTAL_USERS}
+				<!-- IF .pagination -->
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE -->
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	</div>
@@ -63,4 +73,4 @@
 
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_warn_post.html b/template/mcp_warn_post.html
index 61162bc..5e39480 100644
--- a/template/mcp_warn_post.html
+++ b/template/mcp_warn_post.html
@@ -16,11 +16,11 @@
 
 		<div class="column2">
 			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
+				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
+				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
+				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
 			</dl>
 		</div>
 	</div>
@@ -44,6 +44,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_post_add_warning_field_before -->
+
 <div class="panel">
 	<div class="inner">
 
@@ -52,21 +54,25 @@
 
 	<fieldset>
 		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
+		<!-- IF S_CAN_NOTIFY -->
 		<br /><br />
 		<dl class="panel">
 			<dt>&nbsp;</dt>
 			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
 		</dl>
+		<!-- ENDIF -->
 	</fieldset>
 
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_post_add_warning_field_after -->
+
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_warn_user.html b/template/mcp_warn_user.html
index a45d8cd..f4dbf28 100644
--- a/template/mcp_warn_user.html
+++ b/template/mcp_warn_user.html
@@ -7,7 +7,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3>
+	<h3>{USERNAME_FULL}</h3>
 
 	<div>
 		<div class="column1">
@@ -16,11 +16,11 @@
 
 		<div class="column2">
 			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
+				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
+				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
+				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
 			</dl>
 		</div>
 	</div>
@@ -28,6 +28,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_user_add_warning_field_before -->
+
 <div class="panel">
 	<div class="inner">
 
@@ -36,21 +38,25 @@
 
 	<fieldset>
 		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3"></textarea>
+		<!-- IF S_CAN_NOTIFY -->
 		<br /><br />
 		<dl class="panel">
 			<dt>&nbsp;</dt>
 			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
 		</dl>
+		<!-- ENDIF -->
 	</fieldset>
 
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_user_add_warning_field_after -->
+
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/mcp_whois.html b/template/mcp_whois.html
index cfcf10b..1d08a46 100644
--- a/template/mcp_whois.html
+++ b/template/mcp_whois.html
@@ -3,14 +3,20 @@
 
 <div class="panel">
 	<div class="inner">
-	
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
+		<p>
+			<a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
+				<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_POST}</span>
+			</a>
+		</p>
 		<div class="postbody"><div class="content">
 			<pre>{WHOIS}</pre>
 		</div></div>
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
-	
+		<p>
+			<a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
+				<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_POST}</span>
+			</a>
+		</p>
 	</div>
 </div>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
diff --git a/template/memberlist_body.html b/template/memberlist_body.html
index ec4bcd2..997147f 100644
--- a/template/memberlist_body.html
+++ b/template/memberlist_body.html
@@ -1,117 +1,103 @@
 <!-- IF S_IN_SEARCH_POPUP -->
 	<!-- INCLUDE simple_header.html -->
 	<!-- INCLUDE memberlist_search.html -->
-	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false">
-
-<!-- ELSEIF S_SEARCH_USER -->
-	<!-- INCLUDE overall_header.html -->	
-	<!-- INCLUDE memberlist_search.html -->
-	<form method="post" action="{S_MODE_ACTION}">
+	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked_users('#results', this.user); return false;" data-form-name="{S_FORM_NAME}" data-field-name="{S_FIELD_NAME}">
 
 <!-- ELSE -->
 	<!-- INCLUDE overall_header.html -->
+	<div class="panel" id="memberlist_search"<!-- IF not S_SEARCH_USER --> style="display: none;"<!-- ENDIF -->>
+	<!-- INCLUDE memberlist_search.html -->
+	</div>
 	<form method="post" action="{S_MODE_ACTION}">
 
 <!-- ENDIF -->
 
 	<!-- IF S_SHOW_GROUP -->
-
-		<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
+		<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
+		<!-- IF U_MANAGE -->
+			<p class="right responsive-center manage rightside"><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a></p>
+		<!-- ENDIF -->
 		<p>{GROUP_DESC} {GROUP_TYPE}</p>
+
 		<p>
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
 			<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->
 		</p>
-
 	<!-- ELSE -->
-		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
-
-		<div class="panel">
-			<div class="inner">
-
-			<ul class="linklist">
-				<li>
-
-				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
-				<strong style="font-size: 0.95em;"><a href="./memberlist.php?first_char=">{L_ALL}</a>&nbsp; 
-				<a href="./memberlist.php?first_char=a#memberlist">A</a>&nbsp; 
-				<a href="./memberlist.php?first_char=b#memberlist">B</a>&nbsp; 
-				<a href="./memberlist.php?first_char=c#memberlist">C</a>&nbsp; 
-				<a href="./memberlist.php?first_char=d#memberlist">D</a>&nbsp; 
-				<a href="./memberlist.php?first_char=e#memberlist">E</a>&nbsp; 
-				<a href="./memberlist.php?first_char=f#memberlist">F</a>&nbsp; 
-				<a href="./memberlist.php?first_char=g#memberlist">G</a>&nbsp; 
-				<a href="./memberlist.php?first_char=h#memberlist">H</a>&nbsp; 
-				<a href="./memberlist.php?first_char=i#memberlist">I</a>&nbsp; 
-				<a href="./memberlist.php?first_char=j#memberlist">J</a>&nbsp; 
-				<a href="./memberlist.php?first_char=k#memberlist">K</a>&nbsp; 
-				<a href="./memberlist.php?first_char=l#memberlist">L</a>&nbsp; 
-				<a href="./memberlist.php?first_char=m#memberlist">M</a>&nbsp; 
-				<a href="./memberlist.php?first_char=n#memberlist">N</a>&nbsp; 
-				<a href="./memberlist.php?first_char=o#memberlist">O</a>&nbsp; 
-				<a href="./memberlist.php?first_char=p#memberlist">P</a>&nbsp; 
-				<a href="./memberlist.php?first_char=q#memberlist">Q</a>&nbsp; 
-				<a href="./memberlist.php?first_char=r#memberlist">R</a>&nbsp; 
-				<a href="./memberlist.php?first_char=s#memberlist">S</a>&nbsp; 
-				<a href="./memberlist.php?first_char=t#memberlist">T</a>&nbsp; 
-				<a href="./memberlist.php?first_char=u#memberlist">U</a>&nbsp; 
-				<a href="./memberlist.php?first_char=v#memberlist">V</a>&nbsp; 
-				<a href="./memberlist.php?first_char=w#memberlist">W</a>&nbsp; 
-				<a href="./memberlist.php?first_char=x#memberlist">X</a>&nbsp; 
-				<a href="./memberlist.php?first_char=y#memberlist">Y</a>&nbsp; 
-				<a href="./memberlist.php?first_char=z#memberlist">Z</a>&nbsp; 
-				<a href="./memberlist.php?first_char=other">#</a></strong>
-				</li>
-				<li class="rightside pagination">
-					{TOTAL_USERS} &bull; 
-					<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF -->
-				</li>
-			</ul>
-
+		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
+
+		<div class="action-bar bar-top">
+			<div class="member-search panel">
+				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{L_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{L_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
+				<strong>
+				<!-- BEGIN first_char -->
+					<a href="{first_char.U_SORT}">{first_char.DESC}</a>&nbsp;
+				<!-- END first_char -->
+				</strong>
+			</div>
+		
+			<div class="pagination">
+				{TOTAL_USERS}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
 			</div>
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF S_LEADERS_SET or not S_SHOW_GROUP or not .memberrow -->
 	<div class="forumbg forumbg-table">
 		<div class="inner">
 
-		<table class="table1" cellspacing="1" id="memberlist">
+		<table class="table1 memberlist" id="memberlist">
 		<thead>
 		<tr>
-			<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
+			<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}<!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF -->"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
 			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
-			<th class="info"><a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>{L_COMMA_SEPARATOR}<a href="{U_SORT_LOCATION}">{L_LOCATION}</a></th>
+			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>
 			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
 			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
 		</tr>
 		</thead>
 		<tbody>
+	<!-- ENDIF -->
 		<!-- BEGIN memberrow -->
 			<!-- IF S_SHOW_GROUP -->
 				<!-- IF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER -->
-				<!-- IF memberrow.S_FIRST_ROW -->
+				<!-- IF S_LEADERS_SET and memberrow.S_FIRST_ROW -->
 				<tr class="bg1">
 					<td colspan="<!-- IF U_SORT_ACTIVE -->5<!-- ELSE -->4<!-- ENDIF -->">&nbsp;</td>
 				</tr>
 				<!-- ENDIF -->
+<!-- IF S_LEADERS_SET -->
 		</tbody>
 		</table>
 
 	</div>
 </div>
-
-<div class="forumbg">
+<!-- ENDIF -->
+<div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
+	<!-- IF not S_LEADERS_SET -->
+		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
+			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
+			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>
+			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
+			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
+	<!-- ELSEIF S_SHOW_GROUP -->
 		<th class="name">{L_GROUP_MEMBERS}</th>
-		<th class="posts">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-		<th class="joined">&nbsp;</th>
-		<!-- IF U_SORT_ACTIVE --><th class="active">&nbsp;</th><!-- ENDIF -->
+		<th class="posts">{L_POSTS}</th>
+		<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>
+		<th class="joined">{L_JOINED}</th>
+		<!-- IF U_SORT_ACTIVE --><th class="active">{L_LAST_ACTIVE}</th><!-- ENDIF -->
+	<!-- ENDIF -->
 	</tr>
 	</thead>
 	<tbody>
@@ -119,12 +105,12 @@
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
-	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
-		<td class="posts"><!-- IF memberrow.POSTS --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
-		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
+	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF memberrow.S_INACTIVE --> inactive<!-- ENDIF -->">
+		<td><span class="rank-img"><!-- EVENT memberlist_body_rank_prepend --><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --><!-- EVENT memberlist_body_rank_append --></span><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- IF memberrow.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --><!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
+		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
+		<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
 		<td>{memberrow.JOINED}</td>
-		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->
+		<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE}&nbsp;</td><!-- ENDIF -->
 	</tr>
 		<!-- BEGINELSE -->
 	<tr class="bg1">
@@ -151,20 +137,24 @@
 
 <!-- IF S_IN_SEARCH_POPUP and not S_SEARCH_USER -->
 <fieldset class="display-options">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-	<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-	<label for="sk">{L_SELECT_SORT_METHOD}: <select name="sk" id="sk">{S_MODE_SELECT}</select></label> 
-	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label>
+	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>
+	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
+	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />
 </fieldset>
 <!-- ENDIF -->
 
 </form>
 
-<hr />
-
-<ul class="linklist">
-	<li class="rightside pagination">{TOTAL_USERS} &bull; <!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
+<div class="action-bar bar-bottom">
+	<div class="pagination">
+		{TOTAL_USERS}
+		<!-- IF .pagination --> 
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE --> 
+			 &bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+</div>
 
 <!-- IF S_IN_SEARCH_POPUP -->
 	<!-- INCLUDE simple_footer.html -->
diff --git a/template/memberlist_email.html b/template/memberlist_email.html
index 465f784..eea699d 100644
--- a/template/memberlist_email.html
+++ b/template/memberlist_email.html
@@ -1,48 +1,90 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2>
+<!-- EVENT memberlist_email_before -->
+
+<!-- IF S_CONTACT_ADMIN-->
+<h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
+<!-- ELSEIF S_SEND_USER -->
+<h2 class="titlespace">{L_SEND_EMAIL_USER}</h2>
+<!-- ELSE -->
+<h2 class="titlespace">{L_EMAIL_TOPIC}</h2>
+<!-- ENDIF -->
 
 <form method="post" action="{S_POST_ACTION}" id="post">
 
-<div class="panel">
-	<div class="inner">
+	<!-- IF CONTACT_INFO -->
+	<div class="panel">
+		<div class="inner">
+			<div class="postbody">
+				<div class="content">
+					{CONTACT_INFO}
+				</div>
+			</div>
+		</div>
+	</div>
+		<br class="clear" />
+	<!-- ENDIF -->
 
+	<div class="panel">
+		<div class="inner">
 	<div class="content">
+
 		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
 		<fieldset class="fields2">
 		<!-- IF S_SEND_USER -->
 			<dl>
-				<dt><label>{L_RECIPIENT}:</label></dt>
-				<dd><strong>{USERNAME}</strong></dd>
+				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt>
+				<dd><strong>{USERNAME_FULL}</strong></dd>
 			</dl>
 			<dl>
-				<dt><label for="subject">{L_SUBJECT}:</label></dt>
+				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
 				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>
 			</dl>
+		<!-- ELSEIF S_CONTACT_ADMIN-->
+			<dl>
+				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt>
+				<dd><strong>{L_ADMINISTRATOR}</strong></dd>
+			</dl>
+			<!-- IF not S_IS_REGISTERED -->
+			<dl>
+				<dt><label for="email">{L_SENDER_EMAIL_ADDRESS}{L_COLON}</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="name">{L_SENDER_NAME}{L_COLON}</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}" /></dd>
+			</dl>
+			<!-- ENDIF -->
+			<dl>
+				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}" /></dd>
+			</dl>
 		<!-- ELSE -->
 			<dl>
-				<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>
+				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
+				<dd><input class="inputbox autowidth" type="email" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="name">{L_REAL_NAME}:</label></dt>
+				<dt><label for="name">{L_REAL_NAME}{L_COLON}</label></dt>
 				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd>
 			</dl>
 			<dl>
-				<dt><label for="lang">{L_DEST_LANG}:</label><br />
+				<dt><label for="lang">{L_DEST_LANG}{L_COLON}</label><br />
 					<span>{L_DEST_LANG_EXPLAIN}</span></dt>
 				<dd><select name="lang">{S_LANG_OPTIONS}</select></dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="message">{L_MESSAGE_BODY}:</label><br />
+			<dt><label for="message">{L_MESSAGE_BODY}{L_COLON}</label><br />
 			<span>{L_EMAIL_BODY_EXPLAIN}</span></dt>
 			<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>
 		</dl>
+		<!-- IF S_REGISTERED_USER -->
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>
+			<dd><label for="cc_sender"><input type="checkbox" name="cc_sender" id="cc_sender" value="1" checked="checked" tabindex="5" /> {L_CC_SENDER}</label></dd>
 		</dl>
+		<!-- ENDIF -->
 		</fieldset>
 	</div>
 
@@ -62,4 +104,4 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/memberlist_im.html b/template/memberlist_im.html
index 815a206..beed0aa 100644
--- a/template/memberlist_im.html
+++ b/template/memberlist_im.html
@@ -1,79 +1,41 @@
 <!-- INCLUDE simple_header.html -->
 
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
-<h2 class="solo">{L_SEND_IM}</h2>
+<h2>{L_SEND_IM}</h2>
 
 <form method="post" action="{S_IM_ACTION}">
 
 <div class="panel bg2">
 	<div class="inner">
-	
+
 	<p>{L_SEND_IM_EXPLAIN}</p>
 
+	<!-- IF S_SENT_JABBER -->
+		<p>{L_IM_SENT_JABBER}</p>
+	<!-- ENDIF -->
+
 	<fieldset>
 	<dl class="fields2">
-		<dt><label>{L_IM_RECIPIENT}:</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
+		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
+		<dd><strong>{USERNAME}</strong><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
 	</dl>
 
-	<!-- IF S_SEND_ICQ -->
-		<dl class="fields2">
-			<dt><label for="from">{L_IM_NAME}:</label></dt>
-			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd>
-		</dl>
-		<dl class="fields2">
-			<dt><label for="body">{L_IM_MESSAGE}:</label></dt>
-			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd>
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
-		<input type="hidden" name="fromemail" value="{EMAIL}" />
-		<input type="hidden" name="subject" value="{SITENAME}" />
-		<input type="hidden" name="to" value="{IM_CONTACT}" />
-	<!-- ENDIF -->
-
-	<!-- IF S_SEND_AIM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SEND_MSNM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
-			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<dl class="fields2">
-			<dt><label for="message">{L_IM_MESSAGE}:</label></dt>
+			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>
 			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
 			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
 		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_NO_SEND_JABBER -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd>{L_IM_NO_JABBER}</dd>
+			<dd>{L_IM_SENT_JABBER}</dd>
 		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SENT_JABBER -->
+	<!-- ELSE IF S_NO_SEND_JABBER -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd>{L_IM_SENT_JABBER}</dd>
+			<dd>{L_IM_NO_JABBER}</dd>
 		</dl>
 	<!-- ENDIF -->
 	{S_FORM_TOKEN}
@@ -81,77 +43,8 @@
 
 	</div>
 </div>
-<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 </form>
 
-<script type="text/javascript">
-// <![CDATA[
-
-	/** The following will not work with Windows Vista **/
-
-	var app = document.getElementById('objMessengerApp');
-
-	/**
-	* Check whether the browser supports this and whether MSNM is connected
-	*/
-	function msn_supported()
-	{
-		// Does the browser support the MSNM object?
-		if (app.MyStatus)
-		{
-			// Is MSNM connected?
-			if (app.MyStatus == 1)
-			{
-				alert('{LA_IM_MSNM_CONNECT}');
-				return false;
-			}
-		}
-		else
-		{
-			alert('{LA_IM_MSNM_BROWSER}');
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Add to your contact list
-	*/
-	function add_contact(address) 
-	{
-		if (msn_supported()) 
-		{
-			// Could return an error while MSNM is connecting, don't want that
-			try
-			{
-				app.AddContact(0, address);
-			}
-			catch (e)
-			{
-				return;
-			}
-	}
-}
-
-/**
-* Write IM to contact
-*/
-function im_contact(address)
-{
-	if (msn_supported())
-	{
-		// Could return an error while MSNM is connecting, don't want that
-		try
-		{
-			app.InstantMessage(address);
-		}
-		catch (e)
-		{
-			return;
-		}
-	}
-}
-// ]]>
-</script>
+<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/template/memberlist_leaders.html b/template/memberlist_leaders.html
deleted file mode 100644
index c93a19a..0000000
--- a/template/memberlist_leaders.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="solo">{PAGE_TITLE}</h2>
-
-<form method="post" action="{S_MODE_ACTION}">
-
-<div class="forumbg">
-	<div class="inner">
-
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name"><span class="rank-img">{L_RANK}&nbsp;</span>{L_ADMINISTRATORS}</th>
-		<th class="info">{L_PRIMARY_GROUP}</th>
-		<th class="info">{L_FORUMS}</th>
-	</tr>
-	</thead>
-	<tbody>
-<!-- BEGIN admin -->
-	<tr class="<!-- IF admin.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF admin.RANK_IMG --><span class="rank-img">{admin.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{admin.RANK_TITLE}</span><!-- ENDIF -->{admin.USERNAME_FULL}</td>
-		<td class="info"><!-- IF admin.U_GROUP -->
-			<a<!-- IF admin.GROUP_COLOR --> style="font-weight: bold; color:#{admin.GROUP_COLOR}"<!-- ENDIF --> href="{admin.U_GROUP}">{admin.GROUP_NAME}</a>
-			<!-- ELSE -->
-				{admin.GROUP_NAME}
-			<!-- ENDIF --></td>
-		<td class="info">-</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
-	</tr>
-<!-- END admin -->
-	</tbody>
-	</table>
-	
-	</div>
-</div>
-
-<div class="forumbg">
-	<div class="inner">
-	 
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_MODERATORS}</th>
-		<th class="info">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-	</tr>
-	</thead>
-	<tbody>
-<!-- BEGIN mod -->
-	<tr class="<!-- IF mod.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF mod.RANK_IMG --><span class="rank-img">{mod.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{mod.RANK_TITLE}</span><!-- ENDIF -->{mod.USERNAME_FULL}</td>
-		<td class="info"><!-- IF mod.U_GROUP -->
-			<a<!-- IF mod.GROUP_COLOR --> style="font-weight: bold; color:#{mod.GROUP_COLOR}"<!-- ENDIF --> href="{mod.U_GROUP}">{mod.GROUP_NAME}</a>
-			<!-- ELSE -->
-				{mod.GROUP_NAME}
-			<!-- ENDIF --></td>
-		<td class="info"><!-- IF not mod.FORUMS -->{L_ALL_FORUMS}<!-- ELSE --><select style="width: 100%;">{mod.FORUMS}</select><!-- ENDIF --></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
-	</tr>
-<!-- END mod -->
-	</tbody>
-	</table>
-	
-	</div>
-</div>
-	
-</form>
-
-<!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/template/memberlist_search.html b/template/memberlist_search.html
index 92aa638..b1c7a81 100644
--- a/template/memberlist_search.html
+++ b/template/memberlist_search.html
@@ -1,45 +1,3 @@
-<!-- IF S_IN_SEARCH_POPUP -->
-<!-- You should retain this javascript in your own template! -->
-<script type="text/javascript">
-// <![CDATA[
-function insert_user(user)
-{
-	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
-}
-
-function insert_marked(users)
-{
-	if (typeof(users.length) == "undefined")
-	{
-		if (users.checked)
-		{
-			insert_user(users.value);
-		}
-	}
-	else if (users.length > 0)
-	{
-		for (i = 0; i < users.length; i++)
-		{
-			if (users[i].checked)
-			{
-				insert_user(users[i].value);
-			}
-		}
-	}
-
-	self.close();
-}
-
-function insert_single(user)
-{
-	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user;
-	self.close();
-}
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
-<!-- ENDIF -->
-
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
@@ -48,62 +6,69 @@ function insert_single(user)
 
 	<p>{L_FIND_USERNAME_EXPLAIN}</p>
 
+	<!-- EVENT memberlist_search_fields_before -->
 	<fieldset class="fields1 column1">
-	<dl>
-		<dt><label for="username">{L_USERNAME}:</label></dt>
-		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" /></dd>
+	<dl style="overflow: visible;">
+		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
+		<dd>
+			<!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF -->
+			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> />
+			<!-- IF U_LIVE_SEARCH -->
+				<div class="dropdown live-search hidden" id="user-search">
+					<div class="pointer"><div class="pointer-inner"></div></div>
+					<ul class="dropdown-contents search-results">
+						<li class="search-result-tpl"><span class="search-result"></span></li>
+					</ul>
+				</div>
+			</div>
+			<!-- ENDIF -->
+		</dd>
 	</dl>
+<!-- IF S_EMAIL_SEARCH_ALLOWED -->
 	<dl>
-		<dt><label for="email">{L_EMAIL}:</label></dt>
+		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
 		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
 	</dl>
+<!-- ENDIF -->
+<!-- IF S_JABBER_ENABLED -->
 	<dl>
-		<dt><label for="icq">{L_ICQ}:</label></dt>
-		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_AIM}:</label></dt>
-		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd>
+		<dt><label for="jabber">{L_JABBER}{L_COLON}</label></dt>
+		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
 	</dl>
+<!-- ENDIF -->
 	<dl>
-		<dt><label for="yim">{L_YIM}:</label></dt>
-		<dd><input type="text" name="yim" id="yim" value="{YIM}" class="inputbox" /></dd>
+		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
+		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
 	</dl>
+	<!-- EVENT memberlist_search_sorting_options_before -->
 	<dl>
-		<dt><label for="msn">{L_MSNM}:</label></dt>
-		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
+		<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>
+		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
 	</dl>
 	</fieldset>
 
 	<fieldset class="fields1 column2">
 	<dl>
-		<dt><label for="joined">{L_JOINED}:</label></dt>
+		<dt><label for="joined">{L_JOINED}{L_COLON}</label></dt>
 		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}" /></dd>
 	</dl>
 <!-- IF S_VIEWONLINE -->
 	<dl>
-		<dt><label for="active">{L_LAST_ACTIVE}:</label></dt>
+		<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label></dt>
 		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}" /></dd>
 	</dl>
 <!-- ENDIF -->
 	<dl>
-		<dt><label for="count">{L_POSTS}:</label></dt>
-		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="text" name="count" id="count" value="{COUNT}" /></dd>
+		<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
+		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="number" min="0" name="count" id="count" value="{COUNT}" /></dd>
 	</dl>
 <!-- IF S_IP_SEARCH_ALLOWED -->
 	<dl>
-		<dt><label for="ip">{L_POST_IP}:</label></dt>
+		<dt><label for="ip">{L_POST_IP}{L_COLON}</label></dt>
 		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
 	</dl>
 <!-- ENDIF -->
-	<dl>
-		<dt><label for="search_group_id">{L_GROUP}:</label></dt>
-		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt>
-		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
-	</dl>
+	<!-- EVENT memberlist_search_fields_after -->
 	</fieldset>
 
 	<div class="clear"></div>
diff --git a/template/memberlist_team.html b/template/memberlist_team.html
new file mode 100644
index 0000000..327dde4
--- /dev/null
+++ b/template/memberlist_team.html
@@ -0,0 +1,47 @@
+<!-- INCLUDE overall_header.html -->
+
+<h2 class="solo">{PAGE_TITLE}</h2>
+
+<form method="post" action="{S_MODE_ACTION}">
+
+<!-- BEGIN group -->
+<div class="forumbg forumbg-table">
+	<div class="inner">
+
+	<table class="table1" id="team">
+	<thead>
+	<tr>
+		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img">{L_RANK}&nbsp;</span><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></th>
+		<th class="info">{L_PRIMARY_GROUP}</th>
+		<!-- IF S_DISPLAY_MODERATOR_FORUMS --><th class="info">{L_MODERATOR}</th><!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+<!-- BEGIN user -->
+	<tr class="<!-- IF group.user.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF group.user.S_INACTIVE --> inactive<!-- ENDIF -->">
+		<td><!-- IF group.user.RANK_IMG --><span class="rank-img">{group.user.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{group.user.RANK_TITLE}</span><!-- ENDIF --><!-- EVENT memberlist_team_username_prepend -->{group.user.USERNAME_FULL}<!-- IF group.user.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --><!-- EVENT memberlist_team_username_append --></td>
+		<td class="info"><!-- IF group.user.U_GROUP -->
+			<a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color: #{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a>
+			<!-- ELSE -->
+				{group.user.GROUP_NAME}
+			<!-- ENDIF --></td>
+		<!-- IF S_DISPLAY_MODERATOR_FORUMS -->
+			<td class="info"><!-- IF group.user.FORUM_OPTIONS --><select style="width: 100%;">{group.user.FORUMS}</select><!-- ELSEIF group.user.FORUMS -->{group.user.FORUMS}<!-- ELSE -->-<!-- ENDIF --></td>
+		<!-- ENDIF -->
+	</tr>
+<!-- BEGINELSE -->
+	<tr class="bg1">
+		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
+	</tr>
+<!-- END user -->
+	</tbody>
+	</table>
+	
+	</div>
+</div>
+<!-- END group -->
+
+</form>
+
+<!-- INCLUDE jumpbox.html -->
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/memberlist_view.html b/template/memberlist_view.html
index ef2f79d..a7439bc 100644
--- a/template/memberlist_view.html
+++ b/template/memberlist_view.html
@@ -1,74 +1,95 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{PAGE_TITLE}</h2>
+<h2 class="memberlist-title">{PAGE_TITLE}</h2>
+
+<!-- EVENT memberlist_view_content_prepend -->
 
 <form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">
 <div class="panel bg1<!-- IF S_ONLINE --> online<!-- ENDIF -->">
 	<div class="inner">
-	
+
 	<!-- IF AVATAR_IMG -->
 		<dl class="left-box">
-			<dt>{AVATAR_IMG}</dt>
+			<dt class="profile-avatar">{AVATAR_IMG}</dt>
+			<!-- EVENT memberlist_view_rank_avatar_before -->
 			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
 			<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- EVENT memberlist_view_rank_avatar_after -->
 		</dl>
 	<!-- ENDIF -->
 
-	<dl class="left-box details" style="width: 80%;">
-		<dt>{L_USERNAME}:</dt>
+	<dl class="left-box details profile-details">
+		<dt>{L_USERNAME}{L_COLON}</dt>
 		<dd>
 			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
+			<!-- IF U_EDIT_SELF --> [ <a href="{U_EDIT_SELF}">{L_EDIT_PROFILE}</a> ]<!-- ENDIF -->
 			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
+			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
 			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
 		</dd>
 		<!-- IF not AVATAR_IMG -->
-			<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- EVENT memberlist_view_rank_no_avatar_before -->
+			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
+			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- EVENT memberlist_view_rank_no_avatar_after -->
 		<!-- ENDIF -->
-		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
-		<!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF -->
-		<!-- IF AGE --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF -->
-		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF -->
-		<!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF -->
-		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
-<!-- IF U_GALLERY --><dt>{L_GALLERY}:</dt> <dd><a href="{U_GALLERY}">{SHOW_PERSONAL_ALBUM_OF}</a></dd><!-- ENDIF -->
-		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
+		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
+		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
+		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
+		<!-- EVENT memberlist_view_non_contact_custom_fields_before -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
+				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- ENDIF -->
+		<!-- END custom_fields -->
+		<!-- EVENT memberlist_view_non_contact_custom_fields_after -->
+		<!-- EVENT memberlist_view_zebra_before -->
 		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
-			<!-- IF U_ADD_FRIEND and U_ADD_FOE-->
-				<dt>&nbsp;</dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
-				<dt>&nbsp;</dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
+			<!-- IF U_REMOVE_FRIEND -->
+				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
+			<!-- ELSEIF U_REMOVE_FOE -->
+				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FOE}" data-ajax="zebra"><strong>{L_REMOVE_FOE}</strong></a></dd>
 			<!-- ELSE -->
-				<!-- IF U_REMOVE_FRIEND -->
-					<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
-				<!-- ELSE -->
-					<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
+				<!-- IF U_ADD_FRIEND -->
+					<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_ADD_FRIEND}" data-ajax="zebra"><strong>{L_ADD_FRIEND}</strong></a></dd>
+				<!-- ENDIF -->
+				<!-- IF U_ADD_FOE -->
+					<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_ADD_FOE}" data-ajax="zebra"><strong>{L_ADD_FOE}</strong></a></dd>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 		<!-- ENDIF -->
+		<!-- EVENT memberlist_view_zebra_after -->
 	</dl>
 
 	</div>
 </div>
 
+<!-- EVENT memberlist_view_contact_before -->
 <div class="panel bg2">
 	<div class="inner">
+
 	<div class="column1">
+		<h3>{L_CONTACT_USER}</h3>
 
-		<h3>{L_CONTACT_USER} {USERNAME}</h3>
-		
 		<dl class="details">
-		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
-		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
-		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd>
-		<!-- ENDIF -->
-		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
-		<!-- IF S_PROFILE_FIELD_1 -->
+		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF -->
+		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
+		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 750, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
+		<!-- EVENT memberlist_view_contact_custom_fields_before -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF custom_fields.S_PROFILE_CONTACT -->
+				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt>
+				<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->
+					<dd><a href="{custom_fields.PROFILE_FIELD_CONTACT}">{custom_fields.PROFILE_FIELD_DESC}</a></dd>
+				<!-- ELSE -->
+					<dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+		<!-- END custom_fields -->
+		<!-- EVENT memberlist_view_contact_custom_fields_after -->
+		<!-- IF S_PROFILE_FIELD1 -->
 			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<dt>{postrow.PROFILE_FIELD1_NAME}:</dt> <dd>{postrow.PROFILE_FIELD1_VALUE}</dd>
+			<dt>{PROFILE_FIELD1_NAME}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>
 		<!-- ENDIF -->
 		</dl>
 	</div>
@@ -76,33 +97,37 @@
 	<div class="column2">
 		<h3>{L_USER_FORUM}</h3>
 		<dl class="details">
-			<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
-			<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd>
-			<!-- IF U_NOTES or U_WARN -->
-			<dt>{L_WARNINGS}: </dt>
-			<dd><strong>{WARNINGS}</strong> [ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</dd>
+			<!-- EVENT memberlist_view_user_statistics_before -->
+			<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
+			<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_ACTIVE}</dd>
+			<!-- IF S_WARNINGS -->
+			<dt>{L_WARNINGS}{L_COLON} </dt>
+			<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
 			<!-- ENDIF -->
-			<dt>{L_TOTAL_POSTS}:</dt> <dd>{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF --></dd>
+			<dt>{L_TOTAL_POSTS}{L_COLON}</dt>
+				<dd>{POSTS} <!-- IF S_DISPLAY_SEARCH -->| <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- ENDIF -->
+					<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->
+					<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->
+				</dd>
 			<!-- IF S_SHOW_ACTIVITY and POSTS -->
-				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
 			<!-- ENDIF -->
+			<!-- EVENT memberlist_view_user_statistics_after -->
 		</dl>
 	</div>
+
 	</div>
 </div>
-<br /><br />
+<!-- EVENT memberlist_view_contact_after -->
+
 <!-- IF SIGNATURE -->
-<br /><br /><div class="panel bg2">
+<div class="panel bg1">
 	<div class="inner">
-	<div class="column1">
 
 		<h3>{L_SIGNATURE}</h3>
-		
-		<dl class="details">
-		<div class="postbody"><div class="signature" style="border-top:none; margin-top: 0;">{SIGNATURE}</div></div>
-		</dl>
-	</div>
+
+		<div class="postbody"><div class="signature standalone">{SIGNATURE}</div></div>
 
 	</div>
 </div>
@@ -110,6 +135,8 @@
 
 </form>
 
+<!-- EVENT memberlist_view_content_append -->
 
+<!-- INCLUDE jumpbox.html -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/message_body.html b/template/message_body.html
index 58818b9..330203e 100644
--- a/template/message_body.html
+++ b/template/message_body.html
@@ -1,11 +1,25 @@
-<!-- INCLUDE overall_header.html -->
+<!-- IF S_SIMPLE_MESSAGE -->
+	<!-- INCLUDE simple_header.html -->
+<!-- ELSE -->
+	<!-- INCLUDE overall_header.html -->
+<!-- ENDIF -->
 
 <div class="panel" id="message">
 	<div class="inner">
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
-	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
+	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV -->
+		<p>
+			<a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
+				<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_GO_TO_SEARCH_ADV}</span>
+			</a>
+		</p>
+	<!-- ENDIF -->
 	</div>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- IF S_SIMPLE_MESSAGE -->
+	<!-- INCLUDE simple_footer.html -->
+<!-- ELSE -->
+	<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
diff --git a/template/navbar_footer.html b/template/navbar_footer.html
new file mode 100644
index 0000000..0f93d59
--- /dev/null
+++ b/template/navbar_footer.html
@@ -0,0 +1,26 @@
+<div class="navbar" role="navigation">
+	<div class="inner">
+	<ul id="nav-footer" class="linklist bulletin" role="menubar">
+		<li class="small-icon icon-home breadcrumbs">
+			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<!-- EVENT overall_footer_breadcrumb_prepend -->
+			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span>
+			<!-- EVENT overall_footer_breadcrumb_append -->
+		</li>
+		<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-last-responsive="true"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
+
+		<!-- EVENT overall_footer_timezone_before -->
+		<li class="rightside">{S_TIMEZONE}</li>
+		<!-- EVENT overall_footer_timezone_after -->
+		<!-- IF not S_IS_BOT -->
+			<li class="small-icon icon-delete-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">{L_DELETE_COOKIES}</a></li>
+			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside" data-last-responsive="true"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF -->
+		<!-- ENDIF -->
+		<!-- EVENT overall_footer_teamlink_before -->
+		<!-- IF U_TEAM --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF -->
+		<!-- EVENT overall_footer_teamlink_after -->
+		<!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside" data-last-responsive="true"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF -->
+	</ul>
+
+	</div>
+</div>
diff --git a/template/navbar_header.html b/template/navbar_header.html
new file mode 100644
index 0000000..5825984
--- /dev/null
+++ b/template/navbar_header.html
@@ -0,0 +1,70 @@
+<div class="navbar" role="navigation">
+	<div class="inner">
+
+	<ul id="nav-main" class="linklist bulletin" role="menubar">
+
+	<!-- IF S_REGISTERED_USER -->
+		<li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true">
+			<!-- EVENT navbar_header_username_prepend -->
+			<div class="header-profile dropdown-container">
+				<a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a>
+				<div class="dropdown hidden">
+					<div class="pointer"><div class="pointer-inner"></div></div>
+					<ul class="dropdown-contents" role="menu">
+						<!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF -->
+	
+						<!-- EVENT navbar_header_profile_list_before -->
+	
+						<li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li>
+						<li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li>
+	
+						<!-- EVENT navbar_header_profile_list_after -->
+	
+						<li class="separator"></li>
+						<li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li>
+					</ul>
+				</div>
+			</div>
+			<!-- EVENT navbar_header_username_append -->
+		</li>
+		<!-- IF S_DISPLAY_PM -->
+			<li class="small-icon icon-pm rightside" data-skip-responsive="true">
+				<a href="{U_PRIVATEMSGS}" role="menuitem"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
+			</li>
+		<!-- ENDIF -->
+		<!-- IF S_NOTIFICATIONS_DISPLAY -->
+			<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true">
+				<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+				<!-- INCLUDE notification_dropdown.html -->
+			</li>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		<li class="small-icon icon-logout rightside"  data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li>
+		<!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) -->
+			<li class="small-icon icon-register rightside" data-skip-responsive="true"><a href="{U_REGISTER}" role="menuitem">{L_REGISTER}</a></li>
+		<!-- ENDIF -->
+		<!-- EVENT navbar_header_logged_out_content -->
+	<!-- ENDIF -->
+
+		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
+		<!-- EVENT overall_header_breadcrumbs_before -->
+		<li class="small-icon icon-home breadcrumbs">
+			<!-- IF U_SITE_HOME --><span class="crumb"{$MICRODATA}><a href="{U_SITE_HOME}" data-navbar-reference="home" itemprop="url"><span itemprop="title">{L_SITE_HOME}</span></a></span><!-- ENDIF -->
+			<!-- EVENT overall_header_breadcrumb_prepend -->
+			<span class="crumb"{$MICRODATA}><a href="{U_INDEX}" accesskey="h" data-navbar-reference="index" itemprop="url"><span itemprop="title">{L_INDEX}</span></a></span>
+			<!-- BEGIN navlinks -->
+				<!-- EVENT overall_header_navlink_prepend -->
+				<span class="crumb"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemprop="url"><span itemprop="title">{navlinks.FORUM_NAME}</span></a></span>
+				<!-- EVENT overall_header_navlink_append -->
+			<!-- END navlinks -->
+			<!-- EVENT overall_header_breadcrumb_append -->
+		</li>
+		<!-- EVENT overall_header_breadcrumbs_after -->
+
+		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
+			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li>
+		<!-- ENDIF -->
+	</ul>
+
+	</div>
+</div>
diff --git a/template/notification_dropdown.html b/template/notification_dropdown.html
new file mode 100644
index 0000000..13d90a9
--- /dev/null
+++ b/template/notification_dropdown.html
@@ -0,0 +1,45 @@
+<div id="notification_list" class="dropdown dropdown-extended notification_list">
+	<div class="pointer"><div class="pointer-inner"></div></div>
+	<div class="dropdown-contents">
+		<div class="header">
+			{L_NOTIFICATIONS}
+			<span class="header_settings">
+				<a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a>
+				<!-- IF NOTIFICATIONS_COUNT -->
+					<span id="mark_all_notifications"> &bull; <a href="{U_MARK_ALL_NOTIFICATIONS}" data-ajax="notification.mark_all_read">{L_MARK_ALL_READ}</a></span>
+				<!-- ENDIF -->
+			</span>
+		</div>
+
+		<ul>
+			<!-- IF not .notifications -->
+				<li class="no_notifications">
+					{L_NO_NOTIFICATIONS}
+				</li>
+			<!-- ENDIF -->
+			<!-- BEGIN notifications -->
+				<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF --><!-- IF not notifications.URL --> no-url<!-- ENDIF -->">
+					<!-- IF notifications.URL -->
+						<a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">
+					<!-- ENDIF -->
+						<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+						<div class="notification_text">
+							<p class="notification-title">{notifications.FORMATTED_TITLE}</p>
+							<!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF -->
+							<!-- IF notifications.FORUM --><p class="notification-forum">{notifications.FORUM}</p><!-- ENDIF -->
+							<!-- IF notifications.REASON --><p class="notification-reason">{notifications.REASON}</p><!-- ENDIF -->
+							<p class="notification-time">{notifications.TIME}</p>
+						</div>
+					<!-- IF notifications.URL --></a><!-- ENDIF -->
+					<!-- IF notifications.UNREAD -->
+						<a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}"></a>
+					<!-- ENDIF -->
+				</li>
+			<!-- END notifications -->
+		</ul>
+
+		<div class="footer">
+			<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+		</div>
+	</div>
+</div>
diff --git a/template/overall_footer.html b/template/overall_footer.html
index 8802e25..a97936c 100644
--- a/template/overall_footer.html
+++ b/template/overall_footer.html
@@ -1,38 +1,58 @@
+		
+
+
+
+<!-- EVENT overall_footer_content_after -->
 	</div>
-<div style="margin-left:7px;" class="page-sidebar-left">
-<!-- INCLUDE overall_sidebar_menu.html --></div>
-<div id="page-footer">
-<div align="center"><a href="#top"><img src="{T_THEME_PATH}/images/icon_home.gif" alt="top" title="Nach oben!" style="border:none;width:13px;height:12px;" /></a><br /><a href="#top">Zum Seitenanfang</a></div>
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-	<div class="copyright">Diese Webseite ist keine offizielle Webseite des <a href="http://www.debian.org/">Debian</a> Projekts.
-	<br /><a href="http://wiki.debianforum.de/debianforum.de/Impressum">Haftungsausschluss und Impressum</a> &ndash; <a href="http://wiki.debianforum.de/debianforum.de/Verhaltensregeln">debianforum.de Verhaltensregeln</a>
-	<br /><br />Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000-2008 phpBB
-	Group. <!-- IF TRANSLATION_INFO -->{TRANSLATION_INFO}<!-- ENDIF -->
-	<br />
-	Template entwickelt von <a href="http://www.salnet.de">Timo
-	Salmen</a>, basierend auf dem <a
-	href="http://debian-live.alioth.debian.org">Debian Live</a>
-	Template, entwickelt von <a
-	href="http://people.debian.org/~haas/">Christoph Haas</a>.
+
+<!-- EVENT overall_footer_page_body_after -->
+
+<div id="page-footer" role="contentinfo">
+	<!-- INCLUDE navbar_footer.html -->
+
+	<div class="copyright">
+		<!-- EVENT overall_footer_copyright_prepend -->
+		{CREDIT_LINE}
+		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- EVENT overall_footer_copyright_append -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
+		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
+	</div>
+
+	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
+		<div id="darken">&nbsp;</div>
+	</div>
+
+	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
+		<a href="#" class="alert_close"></a>
+		<h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
+	</div>
+	<div id="phpbb_confirm" class="phpbb_alert">
+		<a href="#" class="alert_close"></a>
+		<div class="alert_text"></div>
 	</div>
 </div>
 
 </div>
 
 <div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
+	<a id="bottom" class="anchor" accesskey="z"></a>
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
-</div>
+
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS forum_fn.js -->
+<!-- INCLUDEJS ajax.js -->
+
+<!-- EVENT overall_footer_after -->
+
+<!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF -->
+{$SCRIPTS}
+
+<!-- EVENT overall_footer_body_after -->
+
+
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/overall_header.html b/template/overall_header.html
index 6f38707..dd975f0 100644
--- a/template/overall_header.html
+++ b/template/overall_header.html
@@ -1,180 +1,133 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2002-2008 phpBB Group" />
-<meta name="keywords" content="debian, debianforum, debian-forum, debiansupport, debian-support, gnu/linux, linux, support, apt-get, dpkg, deb, forum, knoppix, hilfe, debian-hilfe, anfaenger-probleme, betriebssystem, installationsproblem, sid, unstable, testing, stable, oldstable, squeeze, lenny, etch, sarge, woody, potato, slink, hamm, buzz, bo, gnoppix, knoppix, knx_hdinstall, sidux, aptosid" />
-<meta http-equiv="Keywords" content="debian, debianforum, debian-forum, debiansupport, debian-support, gnu/linux, linux, support, apt-get, dpkg, deb, forum, knoppix, hilfe, debian-hilfe, anfaenger-probleme, betriebssystem, installationsproblem, sid, unstable, testing, stable, oldstable, squeeze, lenny, etch, sarge, woody, potato, slink, hamm, buzz, bo, gnoppix, knoppix, knx_hdinstall, sidux, aptosid" />
-<meta name="description" content="Support für Debian GNU/Linux auf deutsch" />
-<meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for  "http://www.debianforum.de" r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true for  "http://www.debianforum.de" r (n 0 s 0 v 0 l 0))' />
-<meta name="Abstract" content="Support für Debian GNU/Linux auf deutsch" />
-<meta name="page-topic" content="Debian GNU/Linux" />
-<meta name="author" content="Sebastian Feltel" />
-<meta name="publisher" content="Sebastian Feltel" />
-<meta name="publisher-email" content="sebastian@feltel.de" />
-<meta name="identifier-url" content="http://debianforum.de" />
-<meta name="content-Language" content="de" />
-<meta name="page-type" content="Private Homepage" />
-<meta name="audience" content="Alle" />
-<meta name="robots" content="INDEX,FOLLOW" />
-<meta name="revisit-after" content="7 days" />
-<meta name="DC.Title" content="debianforum.de" />
-<meta name="DC.Creator" content="Sebastian Feltel" />
-<meta name="DC.Subject" content="Support für Debian GNU/Linux auf deutsch" />
-<meta name="DC.Description" content="Support für Debian GNU/Linux auf deutsch" />
-<meta name="DC.Publisher" content="Sebastian Feltel" />
-<meta name="DC.Date" content="2001-12-20" />
-<meta name="DC.Identifier" content="http://debianforum.de" />
-<meta name="DC.Source" content="HTML-Referenz" />
-<meta name="DC.Language" content="de" />
-<meta name="DC.Coverage" content="Leipzig" />
-<link rel="search" title="debianforum.de Forensuche (Ergebnisseanzeige: Beitr&auml;ge)" type="application/opensearchdescription+xml" href="/searchplugins/dfde-forum-posts.xml" />
-<link rel="search" title="debianforum.de Forensuche (Ergebnisseanzeige: Themen)" type="application/opensearchdescription+xml" href="/searchplugins/dfde-forum-topics.xml" />
-<link rel="search" title="debianforum.de Wikisuche" type="application/opensearchdescription+xml" href="http://debianforum.de/searchplugins/dfde_wiki.xml" />
-<link rel="alternate" type="application/rss+xml" title="{SITENAME} (RSS)" href="http://debianforum.de/forum/rdf.php?type=rss" />
-<link rel="alternate" type="application/atom+xml" title="{SITENAME} (Atom)" href="http://debianforum.de/forum/rdf.php?type=atom" />
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+{META}
+<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
+
 <!-- IF S_ENABLE_FEEDS -->
-        <link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" />
-        <!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
-        <!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
-        <!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_TOPICS}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
-        <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
-        <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&amp;t={S_TOPIC_ID}" /><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_NEW}" href="{U_FEED}?mode=topics"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_TOPICS_ACTIVE --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_ACTIVE}" href="{U_FEED}?mode=topics_active"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}"><!-- ENDIF -->
+	<!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&amp;t={S_TOPIC_ID}"><!-- ENDIF -->
+	<!-- EVENT overall_header_feeds -->
+<!-- ENDIF -->
+
+<!-- IF U_CANONICAL -->
+	<link rel="canonical" href="{U_CANONICAL}">
 <!-- ENDIF -->
-<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-<link rel="icon" href="/favicon.ico" type="image/x-icon" />
-{META}
-<title><!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE} &bull; {SITENAME}</title>
 
 <!--
-	phpBB style name: debianforum.de
+	phpBB style name: prosilver
 	Based on style:   prosilver (this is the default phpBB3 style)
 	Original author:  Tom Beddard ( http://www.subBlue.com/ )
-	Modified by:      Timo Salmen for debianforum.de
-	
-	NOTE: This page was generated by phpBB, the free open-source bulletin board package.
-	      The phpBB Group is not responsible for the content of this page and forum. For more information
-	      about phpBB please visit http://www.phpbb.com
+	Modified by:
 -->
 
-<script type="text/javascript">
-// <![CDATA[
-	var jump_page = '{LA_JUMP_PAGE}:';
-	var on_page = '{ON_PAGE}';
-	var per_page = '{PER_PAGE}';
-	var base_url = '{A_BASE_URL}';
-	var style_cookie = 'phpBBstyle';
-	var style_cookie_settings = '{A_COOKIE_SETTINGS}';
-	var onload_functions = new Array();
-	var onunload_functions = new Array();
-
-	<!-- IF S_USER_PM_POPUP -->
-		if ({S_NEW_PM})
-		{
-			var url = '{UA_POPUP_PM}';
-			window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
-		}
-	<!-- ENDIF -->
-
-	/**
-	* Find a member
-	*/
-	function find_username(url)
-	{
-		popup(url, 760, 570, '_usersearch');
-		return false;
-	}
-
-	/**
-	* New function for handling multiple calls to window.onload and window.unload by pentapenguin
-	*/
-	window.onload = function()
-	{
-		for (i = 0; i <= onload_functions.length; i++)
-		{
-			eval(onload_functions[i]);
-		}
-	}
-
-	window.onunload = function()
-	{
-		for (i = 0; i <= onunload_functions.length; i++)
-		{
-			eval(onunload_functions[i]);
+<!-- IF S_ALLOW_CDN -->
+<script>
+	WebFontConfig = {
+		google: {
+			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
 		}
-	}
-
-// ]]>
+	};
+
+	(function(d) {
+		var wf = d.createElement('script'), s = d.scripts[0];
+		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+		wf.async = true;
+		s.parentNode.insertBefore(wf, s);
+	})(document);
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-
-<link href="{T_THEME_PATH}/normal.css" rel="stylesheet" type="text/css" title="A" />
-<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
-<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+<!-- ENDIF -->
+		<!--< link href="{T_STYLESHEET_LINK}" rel="stylesheet">-->
+<link href="./styles/debianforumde/theme/stylesheet.css?{CSSDFTIMESTAMP}" rel="stylesheet">
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="all and (max-width: 700px), all and (max-device-width: 700px)">
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
+<!-- ENDIF -->
+
+<!-- IF S_PLUPLOAD -->
+	<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
 <!-- ENDIF -->
 
+<!--[if lte IE 9]>
+	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
+<![endif]-->
+
+<!-- EVENT overall_header_head_append -->
+
+{$STYLESHEETS}
+
+<!-- EVENT overall_header_stylesheets_after -->
+
 </head>
+<body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">
+
+
+
 
-<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
-<p class="navijump">
-	<a href="#navijump" title="Hier kannst Du direkt zur Navigation springen">zur Navigation</a><br />
-</p>
 
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
+<div id="wrapoverallheader">
+	<a id="top" class="anchor" accesskey="t"></a>
 	<div id="page-header">
-		<div class="headerbar">
+		<div class="headerbar" role="banner">
 			<div class="inner">
 
 			<div id="site-description">
-				<a href="{U_INDEX}" title="debianforum.de - die deutschsprachige Supportwebseite rund um das Debian-Projekt" id="logo">{SITE_LOGO_IMG}</a>
-				<a href="{U_INDEX}" title="debianforum.de - die deutschsprachige Supportwebseite rund um das Debian-Projekt"><h1 title="{SITENAME}">{SITENAME}</h1>
-				<p title="{SITE_DESCRIPTION}">{SITE_DESCRIPTION}</p></a>
-<!--				<div id="dfsection">forum</div> -->
-				<p style="display: none;"><a href="#start_here">{L_SKIP}</a></p>
+				<a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->">{SITE_LOGO_IMG}</a>
+				<h1>{SITENAME}</h1>
+				<p>{SITE_DESCRIPTION}</p>
+				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>
 			</div>
 
-		<!-- IF S_DISPLAY_SEARCH -->
-			<div id="search-box"><br />
-				<form action="{U_SEARCH}" method="post" id="search">
-<input type="hidden" name="sr" value="topics">				
-<input name="keywords" id="keywords" size="20" type="text" class="headersearchbox" style="position:relative;top:-1px;" title="im Forum suchen" value="im Forum suchen" onBlur="if(this.value=='') this.value='im Forum suchen';" onFocus="if(this.value=='im Forum suchen') this.value='';" />&nbsp;<input type="image" alt="submit" style="border:none;width:4px;height:6px;position:relative;top:-1px;" title="im Forum suchen" src="{T_THEME_PATH}/images/arrow_right.gif" /></form><form id="searchform" method="get" action="//wiki.debianforum.de" target="_blank">
-<input type="hidden" name="title" value="Spezial%3ASearch">
-<input type="hidden" name="go" value="Seite">
-<input id="searchinput" type="text" name="search" size="20" class="headersearchbox" title="im Wiki suchen" value="im Wiki suchen" onBlur="if(this.value=='') this.value='im Wiki suchen';" onFocus="if(this.value=='im Wiki suchen') this.value='';" />&nbsp;<input type="image" alt="submit" style="border:none;width:4px;height:6px;" title="im Wiki suchen" src="{T_THEME_PATH}/images/arrow_right.gif" /></form><form method="get" action="//www.google.de/search" target="_blank">
-<input type="hidden" name="q" value="site:debianforum.de -viewforum -printview" />
-<input type=hidden name="domains" value="debianforum.de">
-<input type="text" name="q" size="20" class="headersearchbox" style="position:relative;top:1px;" title="mit Google suchen" value="mit Google suchen" onBlur="if(this.value=='') this.value='mit Google suchen';" onFocus="if(this.value=='mit Google suchen') this.value='';" />&nbsp;<input type="image" alt="submit" style="border:none;width:4px;height:6px;position:relative;top:1px;" title="mit Google suchen" src="{T_THEME_PATH}/images/arrow_right.gif" /></form>
+			<!-- EVENT overall_header_searchbox_before -->
+			<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
+			<div id="search-box" class="search-box search-header" role="search">
+				<form action="{U_SEARCH}" method="get" id="search">
+				<fieldset>
+					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" />
+					<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
+					<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
+					{S_SEARCH_HIDDEN_FIELDS}
+				</fieldset>
+				</form>
 			</div>
-		<!-- ENDIF -->
-
+			<!-- ENDIF -->
 
 			</div>
 		</div>
+		<!-- EVENT overall_header_navbar_before -->
+		<!-- INCLUDE navbar_header.html -->
+	</div>
 
+	<!-- EVENT overall_header_page_body_before -->
 
-
-	<a name="start_here"></a>
-	<div id="page-body" style="margin-right:19px;">
-	<ul class="linklist navlinks">
-<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a><!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
-</ul>	
-		 <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> 
-		<div id="message" class="rules">
+	<a id="start_here" class="anchor"></a>
+	<div id="page-body" role="main">
+		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
+		<div id="information" class="rules">
 			<div class="inner">
-				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
+				<strong>{L_INFORMATION}{L_COLON}</strong> {L_BOARD_DISABLED}
 			</div>
 		</div>
-		<!-- ENDIF -->
\ No newline at end of file
+		<!-- ENDIF -->
+
+		<!-- EVENT overall_header_content_before -->
+<dfnavibar>
+<!-- INCLUDE overall_sidebar_menu.html --> 
+</dfnavibar>
+
+
+
+<div style="margin-left:7px;" class="page-sidebar-left"> 
+<div id="wrapdf">	<div id="page-body2" role="main2">
+
+</div>
+
+
diff --git a/template/overall_sidebar_menu.html b/template/overall_sidebar_menu.html
index 38b2dfc..408efe9 100644
--- a/template/overall_sidebar_menu.html
+++ b/template/overall_sidebar_menu.html
@@ -1,36 +1,37 @@
-<a id="navijump" name="navijump" accesskey="n"></a><div class="menuitem" style="margin-bottom:3px;" title="WILLKOMMEN!">Willkommen!</div>
-<div class="menusubitem"><a href="{U_INDEX}" title="Startseite">Startseite</a></div>
-<div class="menusubitem"><a href="//wiki.debianforum.de/debianforum.de/JabberChat" title="Chat">Chat</a></div>
-<div class="menusubitem"><a href="//wiki.debianforum.de/" title="Wiki/Tipps">Wiki/Tipps</a></div>
-<div class="menusubitem"><a href="//planet.debianforum.de/" title="Planet">Planet</a></div>
-<div class="menusubitem"><a href="//gallery.debianforum.de/" title="Bildergalerie">Bildergalerie</a></div>
-<div class="menusubitem"><a href="{U_PASTEBIN}" title="{L_PASTEBIN}">{L_PASTEBIN}</a></div>
-<div class="menusubitem"><a href="//wiki.debianforum.de/Links" title="Links">Links</a></div>
-<div class="menusubitem"><a href="///twitter.com/debianforum_de" title="debianforum.de auf Twitter">Twitter</a></div>
-<div class="menusubitem"><a href="//wiki.debianforum.de/DiesesUndJenes" title="dieses und jenes">dieses und jenes</a></div>
-
-<div class="menuitem" style="margin-top:15px;margin-bottom:3px;" title="FORUM">Forum</div>
-<!-- IF not S_IS_BOT -->
-<!-- IF S_DISPLAY_MEMBERLIST --><div class="menusubitem"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST}">{L_MEMBERLIST}</a></div><!-- ENDIF -->
-<div class="menusubitem"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">Foren-FAQ</a></div>
-<!-- IF not S_USER_LOGGED_IN --><div class="menusubitem"><a href="{U_REGISTER}" title="{L_REGISTER}">{L_REGISTER}</a></div><!-- ENDIF -->
-<div class="menusubitem"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></div>
-<!-- ENDIF -->
-<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-<div class="menusubitem"><a href="{U_PROFILE}" title="{L_PROFILE}">{L_PROFILE}</a></div>
-<!-- IF S_DISPLAY_PM --><div class="menusubitem"><a href="{U_PRIVATEMSGS}" title="Nachrichtencenter">{PRIVATE_MESSAGE_INFO}</a></div><!-- ENDIF -->
-<!-- ENDIF -->
-<!-- IF U_MCP --><div class="menusubitem"><a href="{U_MCP}" title="Moderationsbereich">Mod-Panel</a></div><!-- ENDIF -->
-<!-- IF U_ACP --><div class="menusubitem"><a href="{U_ACP}" title="Administrationsbereich">Admin-Panel</a></div><!-- ENDIF -->
-
-<div class="menuitem" style="margin-top:15px;margin-bottom:3px;" title="SUCHEN">Suchen</div>
-<div class="menusubitem"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a></div>
-<!-- IF S_USER_LOGGED_IN --><div class="menusubitem"><a href="{U_SEARCH_SELF}" title="{L_SEARCH_SELF}">eigene Beitr&auml;ge</a></div>
-<div class="menusubitem"><a href="{U_SEARCH_NEW}" title="{L_SEARCH_NEW}">neue Beitr&auml;ge</a></div><!-- ENDIF -->
-<div class="menusubitem"><a href="{U_SEARCH_UNANSWERED}" title="{L_SEARCH_UNANSWERED}">unbeantw. Beitr&auml;ge</a></div>
-<div class="menusubitem"><a href="{U_SEARCH_ACTIVE_TOPICS}" title="{L_SEARCH_ACTIVE_TOPICS}">aktive Themen</a></div>
-
-
-<br /><br /><br />
-<div class="menusubitem"><a href="http://www.ffii.org/"><img src="{T_THEME_PATH}/images/patent_button.png" alt="No ePatents Button" title="NO ePATENTS!" style="border:none;width:88px;height:36px;text-align:center;" /></a></div>
-<div class="menusubitem"><a href="http://www.germany.fsfeurope.org/donate/thankgnus-2004.de.html"><img src="{T_THEME_PATH}/images/fsfeurope_supporter2004.png" alt="FSFE Supporter 2004 Button" title="Free Software Foundation Europe Supporter 2004" style="border:none;width:88px;height:27px;text-align:center;" /></a></div>
\ No newline at end of file
+<a id="navijump" name="navijump" accesskey="n"></a><div class="menuitem" style="margin-bottom:3px;" title="WILLKOMMEN!">Willkommen!</div>
+<div class="menusubitem"><a href="{U_INDEX}" title="Startseite">Startseite</a></div>
+<div class="menusubitem"><a href="//wiki.debianforum.de/debianforum.de/JabberChat" title="Chat">Chat</a></div>
+<div class="menusubitem"><a href="//wiki.debianforum.de/" title="Wiki/Tipps">Wiki/Tipps</a></div>
+<div class="menusubitem"><a href="//planet.debianforum.de/" title="Planet">Planet</a></div>
+<div class="menusubitem"><a href="//gallery.debianforum.de/" title="Bildergalerie">Bildergalerie</a></div>
+<!-- <div class="menusubitem"><a href="{U_PASTEBIN}" title="{L_PASTEBIN}">{L_PASTEBIN}</a></div> -->
+<div class="menusubitem"><a href="https://debianforum.de/forum/pastebin.php" title="NoPaste">NoPaste</a></div>
+<div class="menusubitem"><a href="//wiki.debianforum.de/Links" title="Links">Links</a></div>
+<div class="menusubitem"><a href="///twitter.com/debianforum_de" title="debianforum.de auf Twitter">Twitter</a></div>
+<div class="menusubitem"><a href="//wiki.debianforum.de/DiesesUndJenes" title="dieses und jenes">dieses und jenes</a></div>
+
+<div class="menuitem" style="margin-top:15px;margin-bottom:3px;" title="FORUM">Forum</div>
+<!-- IF not S_IS_BOT -->
+<!-- IF S_DISPLAY_MEMBERLIST --><div class="menusubitem"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST}">{L_MEMBERLIST}</a></div><!-- ENDIF -->
+<div class="menusubitem"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">Foren-FAQ</a></div>
+<!-- IF not S_USER_LOGGED_IN --><div class="menusubitem"><a href="{U_REGISTER}" title="{L_REGISTER}">{L_REGISTER}</a></div><!-- ENDIF -->
+<div class="menusubitem"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></div>
+<!-- ENDIF -->
+<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+<div class="menusubitem"><a href="{U_PROFILE}" title="{L_PROFILE}">{L_PROFILE}</a></div>
+<!-- IF S_DISPLAY_PM --><div class="menusubitem"><a href="{U_PRIVATEMSGS}" title="Nachrichtencenter">{PRIVATE_MESSAGE_INFO}</a></div><!-- ENDIF -->
+<!-- ENDIF -->
+<!-- IF U_MCP --><div class="menusubitem"><a href="{U_MCP}" title="Moderationsbereich">Mod-Panel</a></div><!-- ENDIF -->
+<!-- IF U_ACP --><div class="menusubitem"><a href="{U_ACP}" title="Administrationsbereich">Admin-Panel</a></div><!-- ENDIF -->
+
+<div class="menuitem" style="margin-top:15px;margin-bottom:3px;" title="SUCHEN">Suchen</div>
+<div class="menusubitem"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a></div>
+<!-- IF S_USER_LOGGED_IN --><div class="menusubitem"><a href="{U_SEARCH_SELF}" title="{L_SEARCH_SELF}">eigene Beitr&auml;ge</a></div>
+<div class="menusubitem"><a href="{U_SEARCH_NEW}" title="{L_SEARCH_NEW}">neue Beitr&auml;ge</a></div><!-- ENDIF -->
+<div class="menusubitem"><a href="{U_SEARCH_UNANSWERED}" title="{L_SEARCH_UNANSWERED}">unbeantw. Beitr&auml;ge</a></div>
+<div class="menusubitem"><a href="{U_SEARCH_ACTIVE_TOPICS}" title="{L_SEARCH_ACTIVE_TOPICS}">aktive Themen</a></div>
+
+
+<br /><br /><br />
+<div class="menusubitem"><a href="http://www.ffii.org/"><img src="{T_THEME_PATH}/images/patent_button.png" alt="No ePatents Button" title="NO ePATENTS!" style="border:none;width:88px;height:36px;text-align:center;" /></a></div>
+<div class="menusubitem"><a href="http://www.germany.fsfeurope.org/donate/thankgnus-2004.de.html"><img src="{T_THEME_PATH}/images/fsfeurope_supporter2004.png" alt="FSFE Supporter 2004 Button" title="Free Software Foundation Europe Supporter 2004" style="border:none;width:88px;height:27px;text-align:center;" /></a></div>
diff --git a/template/pagination.html b/template/pagination.html
index bf9c854..4a51acf 100644
--- a/template/pagination.html
+++ b/template/pagination.html
@@ -1 +1,30 @@
-<!-- IF PAGINATION --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> &nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF -->
\ No newline at end of file
+<ul>
+<!-- IF BASE_URL and TOTAL_PAGES > 6 -->
+	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
+		<a class="dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{PAGE_NUMBER}</a>
+		<div class="dropdown hidden">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents">
+				<li>{L_JUMP_TO_PAGE}{L_COLON}</li>
+				<li class="page-jump-form">
+					<input type="number" name="page-number" min="1" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" />
+					<input class="button2" value="{L_GO}" type="button" />
+				</li>
+			</ul>
+		</div>
+	</li>
+<!-- ENDIF -->
+<!-- BEGIN pagination -->
+	<!-- IF pagination.S_IS_PREV -->
+		<li class="previous"><a href="{pagination.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</a></li>
+	<!-- ELSEIF pagination.S_IS_CURRENT -->
+	<li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
+	<!-- ELSEIF pagination.S_IS_ELLIPSIS -->
+	<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
+	<!-- ELSEIF pagination.S_IS_NEXT -->
+		<li class="next"><a href="{pagination.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li>
+	<!-- ELSE -->
+		<li><a href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
+	<!-- ENDIF -->
+<!-- END pagination -->
+</ul>
diff --git a/template/plupload.html b/template/plupload.html
new file mode 100644
index 0000000..fc66311
--- /dev/null
+++ b/template/plupload.html
@@ -0,0 +1,69 @@
+<script type="text/javascript">
+//<![CDATA[
+phpbb.plupload = {
+	i18n: {
+		'b': '{LA_BYTES_SHORT}',
+		'kb': '{LA_KB}',
+		'mb': '{LA_MB}',
+		'gb': '{LA_GB}',
+		'tb': '{LA_TB}',
+		'Add Files': '{LA_PLUPLOAD_ADD_FILES}',
+		'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}',
+		'Close': '{LA_PLUPLOAD_CLOSE}',
+		'Drag files here.': '{LA_PLUPLOAD_DRAG}',
+		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}',
+		'File: %s': '{LA_PLUPLOAD_FILE}',
+		'File: %s, size: %d, max file size: %d': '{LA_PLUPLOAD_FILE_DETAILS}',
+		'File count error.': '{LA_PLUPLOAD_ERR_FILE_COUNT}',
+		'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}',
+		'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}',
+		'File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}',
+		'Filename': '{LA_PLUPLOAD_FILENAME}',
+		'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}',
+		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}',
+		'Image format either wrong or not supported.': '{LA_PLUPLOAD_IMAGE_FORMAT}',
+		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',
+		'IO error.': '{LA_PLUPLOAD_IO_ERROR}',
+		'Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}',
+		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}',
+		'Runtime ran out of available memory.': '{LA_PLUPLOAD_ERR_RUNTIME_MEMORY}',
+		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}',
+		'Select files': '{LA_PLUPLOAD_SELECT_FILES}',
+		'Size': '{LA_PLUPLOAD_SIZE}',
+		'Start Upload': '{LA_PLUPLOAD_START_UPLOAD}',
+		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}',
+		'Status': '{LA_PLUPLOAD_STATUS}',
+		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}',
+		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}',
+		"Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}',
+		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}',
+		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}',
+		'%s already present in the queue.': '{LA_PLUPLOAD_ALREADY_QUEUED}'
+	},
+	config: {
+		runtimes: 'html5',
+		url: '{S_PLUPLOAD_URL}',
+		max_file_size: '{FILESIZE}b',
+		chunk_size: '{CHUNK_SIZE}b',
+		unique_names: true,
+		filters: [{FILTERS}],
+		{S_RESIZE}
+		headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'},
+		file_data_name: 'fileupload',
+		multipart_params: {'add_file': '{LA_ADD_FILE}'},
+		form_hook: '#postform',
+		browse_button: 'add_files',
+		drop_element : 'message',
+	},
+	lang: {
+		ERROR: '{LA_ERROR}',
+		TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}',
+	},
+	order: '{ATTACH_ORDER}',
+	maxFiles: {MAX_ATTACHMENTS},
+	data: {S_ATTACH_DATA},
+}
+//]]>
+</script>
+<!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js -->
diff --git a/template/posting_advice.html b/template/posting_advice.html
deleted file mode 100644
index 8477d44..0000000
--- a/template/posting_advice.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="panel" id="postingbox">
-	<div class="inner">
-	
-	<h3>Wichtiger Hinweis</h3>
-
-<strong>Bevor Du einen Beitrag postest:</strong><br />
-- Kennst Du unsere <a class="advice" style="color:#D70751" href="http://wiki.debianforum.de/debianforum.de/Verhaltensregeln" target="_blank">Verhaltensregeln</a>?<br />
-- Hast Du die <a class="advice" style="color:#D70751" href="{U_SEARCH}" target="_blank">Suchfunktion</a> benutzt? Deine Frage wurde vielleicht schon in einem anderen Beitrag beantwortet.<br />
-- Ist schon ein Artikel in unserem <a class="advice" style="color:#D70751" href="http://wiki.debianforum.de/" target="_blank">Wiki</a> vorhanden, der Deine Frage beantwortet?<br />
-- Lange Codezeilen/Logs geh&ouml;ren nach <a class="advice" style="color:#D70751" href="http://nopaste.debianforum.de/" target="_blank">NoPaste</a>, in Deinen Beitrag dann der passende Link dazu.<br />
-- Bilder und Grafiken k&ouml;nnen in der <a class="advice" style="color:#D70751" href="http://gallery.debianforum.de/verschiedenes/BilderVomForum" target="_blank">Galerie</a> abgespeichert werden.<br /><br />
-	</div>
-</div>
-<br />
\ No newline at end of file
diff --git a/template/posting_attach_body.html b/template/posting_attach_body.html
index 162b0b5..85a6fcb 100644
--- a/template/posting_attach_body.html
+++ b/template/posting_attach_body.html
@@ -1,21 +1,85 @@
-<div class="panel bg3" id="attach-panel">
+<div class="panel bg3 panel-container" id="attach-panel">
 	<div class="inner">
 
-	<p>{L_ADD_ATTACHMENT_EXPLAIN}</p>
-	
-	<fieldset class="fields2">
+	<p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p>
+
+	<fieldset class="fields2" id="attach-panel-basic">
 	<dl>
-		<dt><label for="fileupload">{L_FILENAME}:</label></dt>
+		<dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt>
 		<dd>
 			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth" /> 
 			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="filecomment">{L_FILE_COMMENT}:</label></dt>
+		<dt><label for="filecomment">{L_FILE_COMMENT}{L_COLON}</label></dt>
 		<dd><textarea name="filecomment" id="filecomment" rows="1" cols="40" class="inputbox autowidth">{FILE_COMMENT}</textarea></dd>
 	</dl>
 	</fieldset>
 
+	<div id="attach-panel-multi" class="attach-panel-multi">
+		<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" />
+	</div>
+
+	<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container">
+		<div class="inner">
+			<table class="table1 zebra-list fixed-width-table">
+				<thead>
+					<tr>
+						<th class="attach-name">{L_PLUPLOAD_FILENAME}</th>
+						<th class="attach-comment">{L_FILE_COMMENT}</th>
+						<th class="attach-filesize">{L_PLUPLOAD_SIZE}</th>
+						<th class="attach-status">{L_PLUPLOAD_STATUS}</th>
+					</tr>
+				</thead>
+				<tbody class="responsive-skip-empty" id="file-list">
+					<tr class="attach-row" id="attach-row-tpl">
+							<td class="attach-name">
+								<span class="file-name ellipsis-text"></span>
+								<span class="attach-controls">
+									<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp;
+									<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
+								</span>
+								<span class="clear"></span>
+							</td>
+							<td class="attach-comment">
+								<textarea rows="1" cols="30" class="inputbox"></textarea>
+							</td>
+							<td class="attach-filesize">
+								<span class="file-size"></span>
+							</td>
+							<td class="attach-status">
+								<span class="file-progress">
+									<span class="file-progress-bar"></span>
+								</span>
+								<span class="file-status"></span>
+							</td>
+					</tr>
+					<!-- BEGIN attach_row -->
+						<tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}">
+							<td class="attach-name">
+								<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
+								<span class="attach-controls">
+									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
+									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />
+								</span>
+								<span class="clear"></span>
+							</td>
+							<td class="attach-comment">
+								<textarea name="comment_list[{attach_row.ASSOC_INDEX}]" rows="1" cols="30" class="inputbox">{attach_row.FILE_COMMENT}</textarea>
+								{attach_row.S_HIDDEN}
+							</td>
+							<td class="attach-filesize">
+								<span class="file-size">{attach_row.FILESIZE}</span>
+							</td>
+							<td class="attach-status">
+								<span class="file-status file-uploaded"></span>
+							</td>
+						</tr>
+					<!-- END attach_row -->
+				</tbody>
+			</table>
+		</div>
+	</div>
 	</div>
 </div>
diff --git a/template/posting_buttons.html b/template/posting_buttons.html
index 2aa241b..e357a56 100644
--- a/template/posting_buttons.html
+++ b/template/posting_buttons.html
@@ -19,88 +19,85 @@
 		q: '{LA_BBCODE_Q_HELP}',
 		c: '{LA_BBCODE_C_HELP}',
 		l: '{LA_BBCODE_L_HELP}',
-		e: '{LA_BBCODE_LISTITEM_HELP}',
 		o: '{LA_BBCODE_O_HELP}',
 		p: '{LA_BBCODE_P_HELP}',
 		w: '{LA_BBCODE_W_HELP}',
 		a: '{LA_BBCODE_A_HELP}',
 		s: '{LA_BBCODE_S_HELP}',
 		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
 		d: '{LA_BBCODE_D_HELP}'
 		<!-- BEGIN custom_tags -->
 			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
 	}
 
-	var panels = new Array('options-panel', 'attach-panel', 'poll-panel');
-	var show_panel = 'options-panel';
+	function change_palette()
+	{
+		phpbb.toggleDisplay('colour_palette');
+		e = document.getElementById('colour_palette');
 
+		if (e.style.display == 'block')
+		{
+			document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+		}
+		else
+		{
+			document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+		}
+	}
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
 	<dl style="clear: left;">
-		<dt><label>{L_FONT_COLOR}:</label></dt>
-		<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-			function change_palette()
-			{
-				dE('colour_palette');
-				e = document.getElementById('colour_palette');
-				
-				if (e.style.display == 'block')
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
-				}
-				else
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
-				}
-			}
-
-			colorPalette('h', 15, 10);
-		// ]]>
-		</script>
-		</dd>
+		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
+		<dd id="color_palette_placeholder" class="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd>
 	</dl>
 </div>
 
-<div id="format-buttons">
-	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+<!-- EVENT posting_editor_buttons_before -->
+<div id="format-buttons" class="format-buttons">
+	<input type="button" class="button2 bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+	<input type="button" class="button2 bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+	<input type="button" class="button2 bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
 	<!-- IF S_BBCODE_QUOTE -->
-		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+		<input type="button" class="button2 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
 	<!-- ENDIF -->
-	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<input type="button" class="button2 bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+	<input type="button" class="button2 bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+	<input type="button" class="button2 bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+	<input type="button" class="button2 bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
 	<!-- IF S_BBCODE_IMG -->
-		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+		<input type="button" class="button2 bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
 	<!-- ENDIF -->
 	<!-- IF S_LINKS_ALLOWED -->
-		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+		<input type="button" class="button2 bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+	<!-- ENDIF -->
+	<!-- IF S_BBCODE_FLASH -->
+		<input type="button" class="button2 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
 	<!-- ENDIF -->
-	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
 		<option value="85">{L_FONT_SMALL}</option>
 		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
 		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
 			<option value="150">{L_FONT_LARGE}</option>
 			<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-				<option	value="200">{L_FONT_HUGE}</option>
+				<option value="200">{L_FONT_HUGE}</option>
 			<!-- ENDIF -->
 		<!-- ENDIF -->
 	</select>
-	<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
+	<input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
+
+	<!-- EVENT posting_editor_buttons_custom_tags_before -->
+
 	<!-- BEGIN custom_tags -->
-		<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+		<input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 	<!-- END custom_tags -->
 </div>
+<!-- EVENT posting_editor_buttons_after -->
 <!-- ENDIF -->
diff --git a/template/posting_editor.html b/template/posting_editor.html
index ec74d6d..7317e83 100644
--- a/template/posting_editor.html
+++ b/template/posting_editor.html
@@ -1,131 +1,69 @@
 <fieldset class="fields1">
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 
-	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
-
-		<div class="column1">
-		<!-- IF S_ALLOW_MASS_PM -->
-			<!-- IF .to_recipient -->
-				<dl>
-					<dt><label>{L_TO}:</label></dt>
-					<dd>
-						<!-- BEGIN to_recipient -->
-							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a>&nbsp;<!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END to_recipient -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF .bcc_recipient -->
-				<dl>
-					<dt><label>{L_BCC}:</label></dt>
-					<dd>
-						<!-- BEGIN bcc_recipient -->
-							<!-- IF not bcc_recipient.S_FIRST_ROW and bcc_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END bcc_recipient -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-			<dl class="pmlist">
-				<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2"></textarea></dt>
-				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
-				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd>
-			</dl>
-		<!-- ELSE -->
-			<dl>
-				<dt><label for="username_list">{L_TO}:</label><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span></dt>
-				<!-- IF .to_recipient -->
-					<dd>
-						<!-- BEGIN to_recipient -->
-							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END to_recipient -->
-					</dd>
-				<!-- ENDIF -->
-
-				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-			</dl>
-		<!-- ENDIF -->
-
-		</div>
-
-		<!-- IF S_GROUP_OPTIONS -->
-			<div class="column2">
-				<dl>
-					<dd><label for="group_list">{L_USERGROUPS}:</label> <select name="group_list[]" id="group_list "multiple="true" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd>
-				</dl>
-			</div>
-		<!-- ENDIF -->
-
-		<div class="clear"></div>
-
-	<!-- ENDIF -->
-
-	<!-- IF S_DELETE_ALLOWED -->
-	<dl>
-		<dt><label for="delete">{L_DELETE_POST}:</label></dt>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST_WARN}</label></dd>
-	</dl>
-	<!-- ENDIF -->
-
 	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
 	<dl>
-		<dt><label for="icon">{L_ICON}:</label></dt>
+		<dt><label for="icon">{L_ICON}{L_COLON}</label></dt>
 		<dd>
-			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon -->
+			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
+			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="{topic_icon.ICON_ALT}" title="{topic_icon.ICON_ALT}" /></label> <!-- END topic_icon -->
 		</dd>
 	</dl>
 	<!-- ENDIF -->
 
 	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
-	<dl>
-		<dt><label for="username">{L_USERNAME}:</label></dt>
-		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox" /></dd>
+	<dl style="clear: left;">
+		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
+		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
 	</dl>
 	<!-- ENDIF -->
 
+	<!-- EVENT posting_editor_subject_before -->
+
 	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
 	<dl style="clear: left;">
-		<dt><label for="subject">{L_SUBJECT}:</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
+		<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
+		<dd>
+			<!-- EVENT posting_editor_subject_prepend -->
+			<input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" />
+			<!-- EVENT posting_editor_subject_append -->
+		</dd>
 	</dl>
-		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
-		<!-- ENDIF -->
+	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
+		<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->
+		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 	<!-- ENDIF -->
+	<!-- ENDIF -->
+
+	<!-- EVENT posting_editor_subject_after -->
 
 	<!-- INCLUDE posting_buttons.html -->
 
-	<div id="smiley-box">
+	<div id="smiley-box" class="smiley-box">
+		<!-- EVENT posting_editor_smilies_before -->
 		<!-- IF S_SMILIES_ALLOWED and .smiley -->
 			<strong>{L_SMILIES}</strong><br />
 			<!-- BEGIN smiley -->
 				<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
 			<!-- END smiley -->
 		<!-- ENDIF -->
-		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
+		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED -->
+			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
 		<!-- ENDIF -->
-
+		<!-- EVENT posting_editor_smilies_after -->
 		<!-- IF BBCODE_STATUS -->
-		<!-- IF .smiley --><hr /><!-- ENDIF -->
-		{BBCODE_STATUS}<br />
-		<!-- IF S_BBCODE_ALLOWED -->
-			{IMG_STATUS}<br />
-			{URL_STATUS}<br />
+		<div class="bbcode-status">
+			<!-- IF .smiley --><hr /><!-- ENDIF -->
+			{BBCODE_STATUS}<br />
+			<!-- IF S_BBCODE_ALLOWED -->
+				{IMG_STATUS}<br />
+				{FLASH_STATUS}<br />
+				{URL_STATUS}<br />
+			<!-- ENDIF -->
 			{SMILIES_STATUS}
+		</div>
 		<!-- ENDIF -->
-		<!-- ENDIF -->
+		<!-- EVENT posting_editor_bbcode_status_after -->
 		<!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->
 			<!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF -->
 			<!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
@@ -133,10 +71,14 @@
 		<!-- ENDIF -->
 	</div>
 
-	<div id="message-box">
-		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
+	<!-- EVENT posting_editor_message_before -->
+
+	<div id="message-box" class="message-box">
+		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
 	</div>
-</fieldset>
+
+	<!-- EVENT posting_editor_message_after -->
+	</fieldset>
 
 <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
 
@@ -145,44 +87,17 @@
 	</div>
 	<!-- ENDIF -->
 
-	<!-- IF S_HAS_ATTACHMENTS -->
-		<div class="panel bg2">
-			<div class="inner">
-			<h3>{L_POSTED_ATTACHMENTS}</h3>
-
-			<fieldset class="fields2">
-
-			<!-- BEGIN attach_row -->
-			<dl>
-
-				<dt><label for="comment_list[{attach_row.ASSOC_INDEX}]">{L_FILE_COMMENT}:</label></dt>
-				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list[{attach_row.ASSOC_INDEX}]" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd>
-				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}" class="{S_CONTENT_FLOW_END}">{attach_row.FILENAME}</a></dd>
-				<dd style="margin-top: 5px;">
-					<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2" />&nbsp; <!-- ENDIF -->
-					<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2" />
-				</dd>
-			</dl>
-			{attach_row.S_HIDDEN}
-				<!-- IF not attach_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
-			<!-- END attach_row -->
-
-			</fieldset>
-
-			</div>
-		</div>
-	<!-- ENDIF -->
-
 	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
 	<div class="panel bg2">
 		<div class="inner">
 		<fieldset class="submit-buttons">
 			{S_HIDDEN_ADDRESS_FIELD}
 			{S_HIDDEN_FIELDS}
-			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
-			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
+			<!-- EVENT posting_editor_submit_buttons -->
+			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
+			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" class="button2" />&nbsp; <!-- ENDIF -->
 			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
-			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
+			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 default-submit-action" />&nbsp;
 
 		</fieldset>
 
@@ -191,11 +106,22 @@
 	<!-- ENDIF -->
 
 	<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
-		<div id="tabs">
+		<div id="tabs" class="tabs sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist">
 			<ul>
-				<li id="options-panel-tab" class="activetab"><a href="#tabs" onclick="subPanels('options-panel'); return false;"><span>{L_OPTIONS}</span></a></li>
-				<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" onclick="subPanels('attach-panel'); return false;"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF -->
-				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" onclick="subPanels('poll-panel'); return false;"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
+				<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li>
+				<!-- IF S_SHOW_ATTACH_BOX -->
+					<li id="attach-panel-tab" class="tab">
+						<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel">
+							{L_ATTACHMENTS} <strong id="file-total-progress" class="file-total-progress"><strong id="file-total-progress-bar" class="file-total-progress-bar"></strong></strong>
+						</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE -->
+					<li id="poll-panel-tab" class="tab">
+						<a href="#tabs" data-subpanel="poll-panel" role="tab" aria-controls="poll-panel">{L_ADD_POLL}</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- EVENT posting_editor_add_panel_tab -->
 			</ul>
 		</div>
 	<!-- ENDIF -->
@@ -205,6 +131,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
+			<!-- EVENT posting_editor_options_prepend -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
@@ -233,26 +160,37 @@
 
 			<!-- IF S_TYPE_TOGGLE -->
 			<dl>
-				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->:</label></dt>
+				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON}</label></dt>
 				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>
 			</dl>
 			<!-- ENDIF -->
 
 			<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
 			<dl>
-				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}:</label></dt>
-				<dd><label for="topic_time_limit"><input type="text" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
+				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}{L_COLON}</label></dt>
+				<dd><label for="topic_time_limit"><input type="number" min="0" max="999" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
 				<dd>{L_STICK_TOPIC_FOR_EXPLAIN}</dd>
 			</dl>
 			<!-- ENDIF -->
 
+			<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED -->
+				<hr class="dashed" />
+				<dl>
+					<dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt>
+					<dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED} /> {L_DELETE_POST_WARN}</label></dd>
+					<!-- IF S_DELETE_ALLOWED and S_SOFTDELETE_ALLOWED -->
+						<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent" /> {L_DELETE_POST_PERMANENTLY}</label></dd>
+					<!-- ENDIF -->
+				</dl>
+			<!-- ENDIF -->
+
 			<!-- IF S_EDIT_REASON -->
 			<dl>
-				<dt><label for="edit_reason">{L_EDIT_REASON}:</label></dt>
+				<dt><label for="edit_reason">{L_EDIT_REASON}{L_COLON}</label></dt>
 				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
 		<!-- ENDIF -->
 
-<!-- ENDIF -->
\ No newline at end of file
+<!-- ENDIF -->
diff --git a/template/posting_layout.html b/template/posting_layout.html
index 4dc9fb7..bca9195 100644
--- a/template/posting_layout.html
+++ b/template/posting_layout.html
@@ -1,22 +1,22 @@
 <!-- INCLUDE overall_header.html -->
 
 <!-- IF TOPIC_TITLE -->
-	<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+	<h2 class="posting-title"><!-- EVENT posting_topic_title_before --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT posting_topic_title_after --></h2>
 <!-- ELSE -->
-	<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
+	<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
  <!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
-	<div class="rules">
+	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
 		<div class="inner">
-		
+
 		<!-- IF U_FORUM_RULES -->
 			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
 		<!-- ELSE -->
 			<strong>{L_FORUM_RULES}</strong><br />
 			{FORUM_RULES}
 		<!-- ENDIF -->
-		
+
 		</div>
 	</div>
 <!-- ENDIF -->
@@ -26,10 +26,10 @@
 <!-- IF S_DRAFT_LOADED -->
 	<div class="panel">
 		<div class="inner">
-		
+
 		<h3>{L_INFORMATION}</h3>
 		<p>{L_DRAFT_LOADED}</p>
-		
+
 		</div>
 	</div>
 <!-- ENDIF -->
@@ -45,10 +45,10 @@
 			<h2>{L_SELECT_DESTINATION_FORUM}</h2>
 			<p>{L_UNGLOBALISE_EXPLAIN}</p>
 			<dl>
-				<dt><label for="to_forum_id">{L_MOVE}:</label></dt>
+				<dt><label for="to_forum_id">{L_MOVE}{L_COLON}</label></dt>
 				<dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd>
 			</dl>
-			
+
 			<dl>
 				<dt>&nbsp;</dt>
 				<dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
@@ -61,16 +61,14 @@
 
 <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
 
-<!-- INCLUDE posting_advice.html -->
-
-
 <div class="panel" id="postingbox">
 	<div class="inner">
-	
+
 	<h3>{L_POST_A}</h3>
 
 	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->
 	<!-- INCLUDE posting_editor.html -->
+	<input type="hidden" name="show_panel" value="options-panel" />
 	{S_FORM_TOKEN}
 	</div>
 </div>
@@ -79,15 +77,10 @@
 
 <!-- IF S_SHOW_POLL_BOX or S_POLL_DELETE --><!-- INCLUDE posting_poll_body.html --><!-- ENDIF -->
 
+<!-- EVENT posting_layout_include_panel_body -->
+
 <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
 
 </form>
-<!-- IF not S_PRIVMSGS -->
-<script type="text/javascript">
-// <![CDATA[
-	subPanels(show_panel);
-// ]]>
-</script>
-<!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/template/posting_pm_header.html b/template/posting_pm_header.html
new file mode 100644
index 0000000..032d8c6
--- /dev/null
+++ b/template/posting_pm_header.html
@@ -0,0 +1,83 @@
+<fieldset class="fields1">
+	<!-- IF not S_SHOW_DRAFTS -->
+
+		<!-- IF S_GROUP_OPTIONS -->
+			<div class="column2">
+				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br />
+				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br />
+			</div>
+		<!-- ENDIF -->
+		<!-- IF S_ALLOW_MASS_PM -->
+		<div class="column1">
+			<!-- IF not S_EDIT_POST -->
+			<dl class="pmlist">
+				<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
+				<dd class="recipients">
+				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
+				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+				<!-- EVENT posting_pm_header_find_username_before -->
+				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
+				<!-- EVENT posting_pm_header_find_username_after -->
+				</dd>
+			</dl>
+			<!-- ENDIF -->
+		</div>
+		<!-- IF .to_recipient or .bcc_recipient --><hr /><!-- ENDIF -->
+		<div class="column1">
+			<!-- IF .to_recipient -->
+				<dl>
+					<dt><label>{L_TO_MASS}{L_COLON}</label></dt>
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN to_recipient -->
+						<li>
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
+						</li>
+						<!-- END to_recipient -->
+					</ul>
+					</dd>
+				</dl>
+			<!-- ENDIF -->
+		</div>
+			<!-- IF .bcc_recipient -->
+			<div class="column2">
+				<dl>
+					<dt><label>{L_BCC}{L_COLON}</label></dt>
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN bcc_recipient -->
+						<li>
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
+						</li>
+						<!-- END bcc_recipient -->
+					</ul>
+					</dd>
+				</dl>
+			</div>
+			<!-- ENDIF -->
+		<!-- ELSE -->
+		<div class="column1">
+			<dl>
+				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
+				<!-- IF not S_EDIT_POST -->
+				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
+				<!-- ENDIF -->
+				<!-- IF .to_recipient -->
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN to_recipient -->
+						<li>
+							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+						</li>
+						<!-- END to_recipient -->
+					</dd>
+				<!-- ENDIF -->
+			</dl>
+		</div>
+		<!-- ENDIF -->
+
+	<!-- ENDIF -->
+	</fieldset>
diff --git a/template/posting_pm_layout.html b/template/posting_pm_layout.html
index fa9ba24..316fa79 100644
--- a/template/posting_pm_layout.html
+++ b/template/posting_pm_layout.html
@@ -3,10 +3,10 @@
 <!-- IF S_DRAFT_LOADED -->
 	<div class="panel">
 		<div class="inner">
-		
+
 		<h3>{L_INFORMATION}</h3>
 		<p>{L_DRAFT_LOADED_PM}</p>
-		
+
 		</div>
 	</div>
 <!-- ENDIF -->
@@ -15,7 +15,15 @@
 
 <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
 
-<h2>{L_TITLE}</h2>
+<h2 class="posting-title">{L_TITLE}</h2>
+
+<div class="panel" id="pmheader-postingbox">
+	<div class="inner">
+	<!-- EVENT posting_pm_layout_include_pm_header_before -->
+	<!-- INCLUDE posting_pm_header.html -->
+	<!-- EVENT posting_pm_layout_include_pm_header_after -->
+	</div>
+</div>
 
 <div class="panel" id="postingbox">
 	<div class="inner">
@@ -32,4 +40,4 @@
 
 <!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/posting_poll_body.html b/template/posting_poll_body.html
index 3f64c5d..dcaec14 100644
--- a/template/posting_poll_body.html
+++ b/template/posting_poll_body.html
@@ -6,50 +6,47 @@
 	<!-- ENDIF -->
 
 	<fieldset class="fields2">
+	<!-- IF S_POLL_DELETE -->
+		<dl>
+			<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
+			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
+		</dl>
+	<!-- ENDIF -->
+
 	<!-- IF S_SHOW_POLL_BOX -->
-		<!-- IF S_POLL_DELETE -->
-			<dl>
-				<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt>
-				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
-			</dl>
-		<!-- ENDIF -->
 		<dl>
-			<dt><label for="poll_title">{L_POLL_QUESTION}:</label></dt>
+			<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>
 			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="poll_option_text">{L_POLL_OPTIONS}:</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>
+			<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>
 			<dd><textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="inputbox">{POLL_OPTIONS}</textarea></dd>
 		</dl>
 
 		<hr class="dashed" />
 
 		<dl>
-			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}:</label></dt>
-			<dd><input type="text" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>
+			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}{L_COLON}</label></dt>
+			<dd><input type="number" min="0" max="999" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>
 			<dd>{L_POLL_MAX_OPTIONS_EXPLAIN}</dd>
 		</dl>
 		<dl>
-			<dt><label for="poll_length">{L_POLL_FOR}:</label></dt>
-			<dd><label for="poll_length"><input type="text" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
+			<dt><label for="poll_length">{L_POLL_FOR}{L_COLON}</label></dt>
+			<dd><label for="poll_length"><input type="number" min="0" max="999" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
 			<dd>{L_POLL_FOR_EXPLAIN}</dd>
 		</dl>
 
 		<!-- IF S_POLL_VOTE_CHANGE -->
 			<hr class="dashed" />
-			
+
 			<dl>
-				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}:</label></dt>
+				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}{L_COLON}</label></dt>
 				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>
 			</dl>
 		<!-- ENDIF -->
-
-	<!-- ELSEIF S_POLL_DELETE -->
-		<dl class="fields1">
-			<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt>
-			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
-		</dl>
 	<!-- ENDIF -->
+
+	<!-- EVENT posting_poll_body_options_after -->
 	</fieldset>
 
 	</div>
diff --git a/template/posting_preview.html b/template/posting_preview.html
index 25c1f04..aac117c 100644
--- a/template/posting_preview.html
+++ b/template/posting_preview.html
@@ -1,9 +1,9 @@
-<div class="post bg2" id="preview">
+<div class="post <!-- IF S_PRIVMSGS -->pm<!-- ELSE -->bg2<!-- ENDIF -->" id="preview">
 	<div class="inner">
 
 <!-- IF S_HAS_POLL_OPTIONS -->
 	<div class="content">
-		<h2>{L_PREVIEW}: {POLL_QUESTION}</h2>
+		<h2>{L_PREVIEW}{L_COLON} {POLL_QUESTION}</h2>
 		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br /><!-- ENDIF -->{L_MAX_VOTES}</p>
 
 		<fieldset class="polls">
@@ -19,16 +19,18 @@
 	</div>
 </div>
 
-<div class="post <!-- IF S_PRIVMSGS --> pm<!-- ELSE --> bg2<!-- ENDIF -->">
+<div class="post bg2">
 	<div class="inner">
 
 <!-- ENDIF -->
 
+<!-- EVENT posting_preview_poll_after -->
+
 	<div class="postbody">
-		<h3>{L_PREVIEW}: {PREVIEW_SUBJECT}</h3>
-		
+		<h3>{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}</h3>
+
 		<div class="content">{PREVIEW_MESSAGE}</div>
-		
+
 		<!-- IF .attachment -->
 		<dl class="attachbox">
 			<dt>{L_ATTACHMENTS}</dt>
@@ -37,7 +39,7 @@
 			<!-- END attachment -->
 		</dl>
 		<!-- ENDIF -->
-		
+
 		<!-- IF PREVIEW_SIGNATURE --><div class="signature">{PREVIEW_SIGNATURE}</div><!-- ENDIF -->
 	</div>
 
diff --git a/template/posting_review.html b/template/posting_review.html
index 80f0d29..25b7194 100644
--- a/template/posting_review.html
+++ b/template/posting_review.html
@@ -3,12 +3,18 @@
 <p>{L_POST_REVIEW_EXPLAIN}</p>
 
 <!-- BEGIN post_review_row -->
-<div id="ppr{post_review_row.POST_ID}" class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF post_review_row.ONLINE_STATUS --> online<!-- ENDIF -->">
+<!-- IF post_review_row.S_IGNORE_POST -->
+<div class="post bg3 post-ignore">
 	<div class="inner">
-	
-	<div class="postbody">
+		{post_review_row.L_IGNORE_POST}
+<!-- ELSE -->
+<div class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
+	<div class="inner">
+<!-- ENDIF -->
+
+	<div class="postbody" id="ppr{post_review_row.POST_ID}">
 		<h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3>
-		<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong>  {post_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {post_review_row.POST_DATE}</p>
+		<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong>  {post_review_row.POST_AUTHOR_FULL}</strong> &raquo; {post_review_row.POST_DATE}</p>
 		<div class="content">{post_review_row.MESSAGE}</div>
 
 		<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
@@ -21,9 +27,9 @@
 		<!-- ENDIF -->
 
 	</div>
-	
+
 	</div>
 </div>
 <!-- END post_review_row -->
 
-<hr />
\ No newline at end of file
+<hr />
diff --git a/template/posting_smilies.html b/template/posting_smilies.html
index 7faeb04..3bd5127 100644
--- a/template/posting_smilies.html
+++ b/template/posting_smilies.html
@@ -2,21 +2,26 @@
 
 <script type="text/javascript">
 // <![CDATA[
-	var form_name = 'postform';
-	var text_name = 'message';
+	var form_name = opener.form_name;
+	var text_name = opener.text_name;
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <h2>{L_SMILIES}</h2>
 <div class="panel">
 	<div class="inner">
 		<!-- BEGIN smiley --> 
-			<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> 
-		<!-- END smiley	-->
+			<a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> 
+		<!-- END smiley -->
 	
 	</div>
 </div>
-<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
+<!-- IF .pagination --> 
+	<div class="pagination">
+		<!-- INCLUDE pagination.html -->
+	</div>
+<!-- ENDIF -->
+<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/template/posting_topic_review.html b/template/posting_topic_review.html
index e5086c5..6909877 100644
--- a/template/posting_topic_review.html
+++ b/template/posting_topic_review.html
@@ -1,23 +1,49 @@
 
 <h3 id="review">
 	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-	{L_TOPIC_REVIEW}: {TOPIC_TITLE}
+	{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}
 </h3>
 
 <div id="topicreview">
+<script type="text/javascript">
+// <![CDATA[
+	bbcodeEnabled = {S_BBCODE_ALLOWED};
+// ]]>
+</script>
 	<!-- BEGIN topic_review_row -->
-	<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
+
+	<!-- IF topic_review_row.S_IGNORE_POST -->
+	<div class="post bg3 post-ignore">
+		<div class="inner">
+			{topic_review_row.L_IGNORE_POST}
+	<!-- ELSE -->
+	<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> reported<!-- ENDIF -->">
 		<div class="inner">
-		
+	<!-- ENDIF -->
+
 		<div class="postbody" id="pr{topic_review_row.POST_ID}">
+			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
+
+			<!-- IF (topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE) or topic_review_row.U_MCP_DETAILS -->
+			<ul class="post-buttons">
+			<!-- IF topic_review_row.U_MCP_DETAILS -->
+				<li>
+					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon">
+						<span>{L_POST_DETAILS}</span>
+					</a>
+				<li>
+			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
+				<li>
+					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button quote-icon">
+						<span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
+					</a>
+				</li>
+			<!-- ENDIF -->
 			</ul>
 			<!-- ENDIF -->
-			<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
-			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
-			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {topic_review_row.POST_DATE}  </p>
+
+			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}  </p>
 			<div class="content">{topic_review_row.MESSAGE}</div>
 
 			<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
@@ -44,4 +70,4 @@
 	<p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p>
 <!-- ELSE -->
 	<p><a href="#postingbox" class="top2">{L_BACK_TO_TOP}</a></p>
-<!-- ENDIF -->
\ No newline at end of file
+<!-- ENDIF -->
diff --git a/template/profilefields/bool.html b/template/profilefields/bool.html
new file mode 100644
index 0000000..f1d7ba7
--- /dev/null
+++ b/template/profilefields/bool.html
@@ -0,0 +1,7 @@
+<!-- BEGIN bool -->
+<!-- IF bool.FIELD_LENGTH eq 1 -->
+	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
+<!-- ELSE -->
+	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+<!-- ENDIF -->
+<!-- END bool -->
diff --git a/template/profilefields/date.html b/template/profilefields/date.html
new file mode 100644
index 0000000..5d5bc04
--- /dev/null
+++ b/template/profilefields/date.html
@@ -0,0 +1,5 @@
+<!-- BEGIN date -->
+<label for="{date.FIELD_IDENT}_day">{L_DAY}{L_COLON} <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label>
+<label for="{date.FIELD_IDENT}_month">{L_MONTH}{L_COLON} <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label>
+<label for="{date.FIELD_IDENT}_year">{L_YEAR}{L_COLON} <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label>
+<!-- END date -->
diff --git a/template/profilefields/dropdown.html b/template/profilefields/dropdown.html
new file mode 100644
index 0000000..243b703
--- /dev/null
+++ b/template/profilefields/dropdown.html
@@ -0,0 +1,5 @@
+<!-- BEGIN dropdown -->
+<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
+	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
+</select>
+<!-- END dropdown -->
diff --git a/template/profilefields/int.html b/template/profilefields/int.html
new file mode 100644
index 0000000..a6f9a0a
--- /dev/null
+++ b/template/profilefields/int.html
@@ -0,0 +1,3 @@
+<!-- BEGIN int -->
+<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+<!-- END int -->
diff --git a/template/profilefields/string.html b/template/profilefields/string.html
new file mode 100644
index 0000000..cf457d3
--- /dev/null
+++ b/template/profilefields/string.html
@@ -0,0 +1,3 @@
+<!-- BEGIN string -->
+<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+<!-- END string -->
diff --git a/template/profilefields/text.html b/template/profilefields/text.html
new file mode 100644
index 0000000..f54c639
--- /dev/null
+++ b/template/profilefields/text.html
@@ -0,0 +1,3 @@
+<!-- BEGIN text -->
+<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox">{text.FIELD_VALUE}</textarea>
+<!-- END text -->
diff --git a/template/profilefields/url.html b/template/profilefields/url.html
new file mode 100644
index 0000000..8dd3a90
--- /dev/null
+++ b/template/profilefields/url.html
@@ -0,0 +1,3 @@
+<!-- BEGIN url -->
+<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
+<!-- END url -->
diff --git a/template/quickreply_editor.html b/template/quickreply_editor.html
index f56747a..6a88466 100644
--- a/template/quickreply_editor.html
+++ b/template/quickreply_editor.html
@@ -1,83 +1,26 @@
-<script type="text/javascript">
-// <![CDATA[
-	function hide_qr(show)
-	{
-		dE('qr_editor_div');
-		dE('qr_showeditor_div');
-		if (show && document.getElementById('qr_editor_div').style.display != 'none')
-		{
-			document.getElementsByName('message')[0].focus();
-		}
-		return true;
-	}
-
-
-	function init_qr()
-	{
-		dE('qr_showeditor_div');
-		return true;
-	}
-	onload_functions.push('init_qr();');
-	// ]]>
-</script>
-<noscript>
-	<form method="post" action="{U_QR_ACTION}">
-		<div class="panel" id="qr_ns_editor_div">
-			<div class="inner"><span class="corners-top"><span></span></span>
-				<div class="content">
-					<h2>{L_QUICKREPLY}</h2>
-					<fieldset class="fields1">
-						<dl style="clear: left;">
-							<dt><label for="subject">{L_SUBJECT}:</label></dt>
-							<dd><input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
-						</dl>
-					<div id="message-box-ns">
-						<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea>
-					</div>
-					</fieldset>
-					<fieldset class="submit-buttons">
-						{S_FORM_TOKEN}
-						{QR_HIDDEN_FIELDS}
-						<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-						<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
-					</fieldset>
-				</div>
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</form>
-</noscript>
-<form method="post" action="{U_QR_ACTION}">
-	<div class="panel" style="display: none" id="qr_editor_div">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			<div class="content">
-				<h2>{L_QUICKREPLY}</h2>
+<form method="post" action="{U_QR_ACTION}" id="qr_postform">
+<!-- EVENT quickreply_editor_panel_before -->
+	<div class="panel">
+		<div class="inner">
+				<h2 class="quickreply-title">{L_QUICKREPLY}</h2>
 				<fieldset class="fields1">
 					<dl style="clear: left;">
-						<dt><label for="subject">{L_SUBJECT}:</label></dt>
-						<dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
+						<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
+						<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
 					</dl>
+				<!-- EVENT quickreply_editor_message_before -->
 				<div id="message-box">
 					<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea>
 				</div>
+				<!-- EVENT quickreply_editor_message_after -->
 				</fieldset>
 				<fieldset class="submit-buttons">
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
-					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-					<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
-				</fieldset>
-				<a href="" class="right-box up" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
-			</div>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<div class="panel" style="display: none" id="qr_showeditor_div" >
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="content">
-				<fieldset class="submit-buttons">
-					<input type="submit" name="show_qr" tabindex="1" class="button2" value="{L_SHOW_QR}" onclick="hide_qr(true);return false;"/>
+					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" id="qr_full_editor" />&nbsp;
+					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
 				</fieldset>
-			</div>
-		<span class="corners-bottom"><span></span></span></div>
+		</div>
 	</div>
+<!-- EVENT quickreply_editor_panel_after -->
 </form>
diff --git a/template/report_body.html b/template/report_body.html
index ea9ab00..285e8ec 100644
--- a/template/report_body.html
+++ b/template/report_body.html
@@ -8,25 +8,29 @@
 
 	<div class="content">
 		<p><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p>
-		
+
 		<fieldset>
+		<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->
 		<dl class="fields2">
-			<dt><label for="reason_id">{L_REASON}:</label></dt>
+			<dt><label for="reason_id">{L_REASON}{L_COLON}</label></dt>
 			<dd><select name="reason_id" id="reason_id" class="full"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></dd>
 		</dl>
 		<!-- IF S_CAN_NOTIFY -->
 			<dl class="fields2">
-				<dt><label for="notify1">{L_REPORT_NOTIFY}:</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>
+				<dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>
 				<dd>
-					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 				</dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl class="fields2">
-			<dt><label for="report_text">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
+			<dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
 			<dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd>
 		</dl>
+		<!-- IF CAPTCHA_TEMPLATE -->
+			<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
+		<!-- ENDIF -->
 		</fieldset>
 	</div>
 
@@ -48,4 +52,4 @@
 </div>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/search_body.html b/template/search_body.html
index 6c1ec12..8d56a10 100644
--- a/template/search_body.html
+++ b/template/search_body.html
@@ -1,23 +1,24 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2 class="solo">{L_SEARCH} im Forum</h2>
+<h2 class="solo">{L_SEARCH}</h2>
 
-<form method="get" action="{S_SEARCH_ACTION}">
+<!-- EVENT search_body_form_before -->
+<form method="get" action="{S_SEARCH_ACTION}" data-focus="keywords">
 
 <div class="panel">
 	<div class="inner">
 	<h3>{L_SEARCH_QUERY}</h3>
-	
+
 	<fieldset>
 	<dl>
-		<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input type="text" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
+		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
 		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>
 		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="author">{L_SEARCH_AUTHOR}:</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
-		<dd><input type="text" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
+		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
+		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
 	</dl>
 	</fieldset>
 
@@ -28,21 +29,21 @@
 	<div class="inner">
 
 	<h3>{L_SEARCH_OPTIONS}</h3>
-	
+
 	<fieldset>
 	<dl>
-		<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
+		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
 		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt>
+		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}{L_COLON}</label></dt>
 		<dd>
-			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label> 
+			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>
 			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="sf1">{L_SEARCH_WITHIN}:</label></dt>
+		<dt><label for="sf1">{L_SEARCH_WITHIN}{L_COLON}</label></dt>
 		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_TITLE_MSG}</label></dd>
 		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_MSG_ONLY}</label></dd>
 		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
@@ -52,25 +53,25 @@
 	<hr class="dashed" />
 
 	<dl>
-		<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt>
+		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>
 		<dd>
-			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" /> {L_POSTS}</label> 
-			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" checked="checked" /> {L_TOPICS}</label>
+			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>
+			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="sd">{L_RESULT_SORT}:</label></dt>
+		<dt><label for="sd">{L_RESULT_SORT}{L_COLON}</label></dt>
 		<dd>{S_SELECT_SORT_KEY}&nbsp;
-			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label> 
+			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>
 			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label>{L_RESULT_DAYS}:</label></dt>
+		<dt><label>{L_RESULT_DAYS}{L_COLON}</label></dt>
 		<dd>{S_SELECT_SORT_DAYS}</dd>
 	</dl>
 	<dl>
-		<dt><label>{L_RETURN_FIRST}:</label></dt>
+		<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>
 		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>
 	</dl>
 	</fieldset>
@@ -82,7 +83,7 @@
 	<div class="inner">
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
 	</fieldset>
 
@@ -91,7 +92,32 @@
 
 </form>
 
-<!-- INCLUDE search_body_wiki.html -->
-<!-- INCLUDE search_body_google.html -->
+<!-- IF .recentsearch -->
+<div class="forumbg forumbg-table">
+	<div class="inner">
+
+	<table class="table1">
+	<thead>
+	<tr>
+		<th colspan="2" class="name">{L_RECENT_SEARCHES}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN recentsearch -->
+		<tr class="<!-- IF recentsearch.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
+			<td><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
+			<td class="active">{recentsearch.TIME}</td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="bg1">
+			<td colspan="2">{L_NO_RECENT_SEARCHES}</td>
+		</tr>
+	<!-- END recentsearch -->
+	</tbody>
+	</table>
+
+	</div>
+</div>
+<!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/search_body_google.html b/template/search_body_google.html
deleted file mode 100644
index e391ee4..0000000
--- a/template/search_body_google.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<br />
-<h2 class="solo">{L_SEARCH} mit Google</h2>
-
-<form method="get" action="//www.google.de/search" target="_blank">
-
-<div class="panel">
-	<div class="inner">
-	<h3>{L_SEARCH_QUERY}</h3>
-	
-	<fieldset>
-	<dl>
-		<dt><label for="q">{L_SEARCH_KEYWORDS}:</label></dt>
-		<dd><input type="text" class="inputbox" name="q" id="q" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
-	</dl>
-	</fieldset>
-
-<input type="hidden" name="q" value="site:debianforum.de -viewforum -printview" />
-<input type=hidden name="domains" value="debianforum.de">
-	</div>
-</div>
-
-<div class="panel bg3">
-	<div class="inner">
-
-	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
-	</fieldset>
-
-	</div>
-</div>
-
-</form>
\ No newline at end of file
diff --git a/template/search_body_wiki.html b/template/search_body_wiki.html
deleted file mode 100644
index a35dfdc..0000000
--- a/template/search_body_wiki.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<br />
-<h2 class="solo">{L_SEARCH} im Wiki</h2>
-
-<form method="get" action="//wiki.debianforum.de" target="_blank">
-
-<div class="panel">
-	<div class="inner">
-	<h3>{L_SEARCH_QUERY}</h3>
-	
-	<fieldset>
-	<dl>
-		<dt><label for="value">{L_SEARCH_KEYWORDS}:</label></dt>
-		<dd><input type="text" class="inputbox" name="search" id="searchinput" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
-	</dl>
-	</fieldset>
-<input type="hidden" name="title" value="Spezial%3ASearch">
-<input type="hidden" name="go" value="Seite">
-	</div>
-</div>
-
-<div class="panel bg3">
-	<div class="inner">
-
-	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
-	</fieldset>
-
-	</div>
-</div>
-
-</form>
\ No newline at end of file
diff --git a/template/search_results.html b/template/search_results.html
index 9ae3502..f76afe3 100644
--- a/template/search_results.html
+++ b/template/search_results.html
@@ -1,34 +1,46 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
-<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
+<!-- EVENT search_results_header_before -->
+
+<h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
+<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}{L_COLON} <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF -->
+<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}{L_COLON} <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
+<!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->
 
 <!-- IF SEARCH_TOPIC -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
+	<p class="return-link"><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p>
 <!-- ELSE -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
+	<p class="advanced-search-link"><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
-<!-- IF PAGINATION or SEARCH_MATCHES or PAGE_NUMBER -->
-	<form method="post" action="{S_SEARCH_ACTION}">
+<!-- EVENT search_results_header_after -->
 
-	<div class="topic-actions">
+<!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER -->
+	<div class="action-bar top">
 
-	<!-- IF SEARCH_MATCHES -->
-		<div class="search-box">
-			<!-- IF SEARCH_IN_RESULTS -->
-				<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
-				<input type="hidden" name="show_results" value="posts" />
-				<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
-			<!-- ENDIF -->
+	<!-- IF TOTAL_MATCHES > 0 -->
+		<div class="search-box" role="search">
+			<form method="post" action="{S_SEARCH_ACTION}">
+			<fieldset>
+				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" />
+				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
+				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
+			</fieldset>
+			</form>
 		</div>
 	<!-- ENDIF -->
-		<div class="rightside pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
+
+		<!-- EVENT search_results_searchbox_after -->
+
+		<div class="pagination">
+			{SEARCH_MATCHES}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
 		</div>
 	</div>
-
-	</form>
 <!-- ENDIF -->
 
 <!-- IF S_SHOW_TOPICS -->
@@ -40,7 +52,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
-					<dt>{L_TOPICS}</dt>
+					<dt><div class="list-inner">{L_TOPICS}</div></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -50,28 +62,51 @@
 		<ul class="topiclist topics">
 
 		<!-- BEGIN searchresults -->
+			<!-- EVENT search_results_topic_before -->
 			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-						<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
-						<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
-						<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-						<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
-						{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} 
-						<!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF -->
+				<dl class="icon {searchresults.TOPIC_IMG_STYLE}">
+					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
+						<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+						<div class="list-inner">
+
+							<!-- EVENT topiclist_row_prepend -->
+							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
+							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
+							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
+							<!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
+							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+							<!-- IF .searchresults.pagination -->
+							<div class="pagination">
+								<ul>
+								<!-- BEGIN pagination -->
+									<!-- IF searchresults.pagination.S_IS_PREV -->
+									<!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><li class="active"><span>{searchresults.pagination.PAGE_NUMBER}</span></li>
+									<!-- ELSEIF searchresults.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+									<!-- ELSEIF searchresults.pagination.S_IS_NEXT -->
+									<!-- ELSE --><li><a href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a></li>
+									<!-- ENDIF -->
+								<!-- END pagination -->
+								</ul>
+							</div>
+							<!-- ENDIF -->
+							<!-- IF searchresults.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
+							<!-- EVENT topiclist_row_append -->
+
+						</div>
 					</dt>
 					<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>
 					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
 					<dd class="lastpost"><span>
 						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
-						<a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}<br /> </span>
+						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>
 					</dd>
 				</dl>
 			</li>
+			<!-- EVENT search_results_topic_after -->
 		<!-- END searchresults -->
 		</ul>
-		
+
 		</div>
 	</div>
 	<!-- ELSE -->
@@ -85,42 +120,41 @@
 <!-- ELSE -->
 
 	<!-- BEGIN searchresults -->
+		<!-- EVENT search_results_post_before -->
 		<div class="search post <!-- IF searchresults.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF searchresults.S_POST_REPORTED --> reported<!-- ENDIF -->">
-			<div class="inner">	
-	
+			<div class="inner">
+
 	<!-- IF searchresults.S_IGNORE_POST -->
-		<div class="postbody">		
+		<div class="postbody">
 			{searchresults.L_IGNORE_POST}
 		</div>
 	<!-- ELSE -->
+		<dl class="postprofile">
+			<!-- EVENT search_results_postprofile_before -->
+			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt>
+			<dd class="search-result-date">{searchresults.POST_DATE}</dd>
+			<dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd>
+			<dd>{L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>
+			<dd>{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></dd>
+			<dd>{L_VIEWS}{L_COLON} <strong>{searchresults.TOPIC_VIEWS}</strong></dd>
+			<!-- EVENT search_results_postprofile_after -->
+		</dl>
+
 		<div class="postbody">
-			<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>		
+			<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
 			<div class="content">{searchresults.MESSAGE}</div>
 		</div>
-	
-		<dl class="postprofile">
-			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt>
-			<dd>{L_POSTED_ON_DATE} {searchresults.POST_DATE}</dd>
-			<dd>&nbsp;</dd>		
-			<!-- IF searchresults.FORUM_TITLE -->
-				<dd>{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd>
-				<dd>{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>	
-			<!-- ELSE -->
-				<dd>{L_GLOBAL}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>	
-			<!-- ENDIF -->
-			<dd>{L_REPLIES}: <strong>{searchresults.TOPIC_REPLIES}</strong></dd>
-			<dd>{L_VIEWS}: <strong>{searchresults.TOPIC_VIEWS}</strong></dd> 
-		</dl>	
 	<!-- ENDIF -->
-	
+
 	<!-- IF not searchresults.S_IGNORE_POST -->
 		<ul class="searchresults">
-			<li ><a href="{searchresults.U_VIEW_POST}" class="{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>
-		</ul>	
+			<li ><a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>
+		</ul>
 	<!-- ENDIF -->
 
 			</div>
 		</div>
+		<!-- EVENT search_results_post_after -->
 	<!-- BEGINELSE -->
 		<div class="panel">
 			<div class="inner">
@@ -130,15 +164,14 @@
 	<!-- END searchresults -->
 <!-- ENDIF -->
 
-<!-- IF PAGINATION or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->
+<!-- IF .pagination or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->
 	<form method="post" action="{S_SEARCH_ACTION}">
 
 	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
 			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <!-- ELSE --></label><!-- ENDIF --><input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<!-- ENDIF -->
 	</fieldset>
 
@@ -147,12 +180,19 @@
 	<hr />
 <!-- ENDIF -->
 
-<!-- IF PAGINATION or .searchresults or PAGE_NUMBER -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</li>
-	</ul>
+<!-- IF .pagination or .searchresults or PAGE_NUMBER -->
+<div class="action-bar bottom">
+	<div class="pagination">
+		{SEARCH_MATCHES}
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			 &bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+</div>
 <!-- ENDIF -->
+
 <!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/simple_footer.html b/template/simple_footer.html
index 7641deb..123f899 100644
--- a/template/simple_footer.html
+++ b/template/simple_footer.html
@@ -1,24 +1,34 @@
 	</div>
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
 
-	The phpBB Group : 2006
-//-->
-
-	<div class="copyright">Diese Webseite ist keine offizielle Webseite des <a href="http://www.debian.org/">Debian</a> Projekts.
-	<br /><a href="http://wiki.debianforum.de/debianforum.de/Impressum">Haftungsausschluss und Impressum</a> &ndash; <a href="http://wiki.debianforum.de/debianforum.de/Verhaltensregeln">debianforum.de Verhaltensregeln</a>
-	<br /><br />Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000-2008 phpBB Group
+	<div class="copyright" role="contentinfo">{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- IF U_MCP --><br /><br /><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->
-		<!-- IF U_ACP --><br /><a href="{U_ACP}">{L_ACP}</a><!-- ENDIF -->
-		<!-- IF DEBUG_OUTPUT --><br /><br />{DEBUG_OUTPUT}<!-- ENDIF -->
+		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
+	</div>
+
+	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
+		<div id="darken">&nbsp;</div>
+	</div>
+	<div id="loading_indicator"></div>
+
+	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
+		<a href="#" class="alert_close"></a>
+		<h3 class="alert_title"></h3><p class="alert_text"></p>
+	</div>
+	<div id="phpbb_confirm" class="phpbb_alert">
+		<a href="#" class="alert_close"></a>
+		<div class="alert_text"></div>
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS forum_fn.js -->
+<!-- INCLUDEJS ajax.js -->
+
+<!-- EVENT simple_footer_after -->
+
+{$SCRIPTS}
+
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/simple_header.html b/template/simple_header.html
index 6117fd3..baa6223 100644
--- a/template/simple_header.html
+++ b/template/simple_header.html
@@ -1,65 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2002-2006 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
-<script type="text/javascript">
-// <![CDATA[
-
-	var onload_functions = new Array();
-	var onunload_functions = new Array();
-
-	/**
-	* New function for handling multiple calls to window.onload and window.unload by pentapenguin
-	*/
-	window.onload = function()
-	{
-		for (var i = 0; i < onload_functions.length; i++)
-		{
-			eval(onload_functions[i]);
+<!-- IF S_ALLOW_CDN -->
+<script>
+	WebFontConfig = {
+		google: {
+			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
 		}
-	}
-
-	window.onunload = function()
-	{
-		for (var i = 0; i < onunload_functions.length; i++)
-		{
-			eval(onunload_functions[i]);
-		}
-	}
-
-// ]]>
+	};
+
+	(function(d) {
+		var wf = d.createElement('script'), s = d.scripts[0];
+		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+		wf.async = true;
+		s.parentNode.insertBefore(wf, s);
+	})(document);
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-
-<link href="{T_THEME_PATH}/normal.css" rel="alternate stylesheet" type="text/css" title="A" />
-<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
-<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+<!-- ENDIF -->
+<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
+<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet">
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)">
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
 <!-- ENDIF -->
 
+<!--[if lte IE 8]>
+	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet">
+<![endif]-->
+
 <!-- DEFINE $POPUP = 1 -->
 
+<!-- EVENT simple_header_head_append -->
+
+{$STYLESHEETS}
+
+<!-- EVENT simple_header_stylesheets_after -->
+
 </head>
 
-<body id="phpbb" class="{S_CONTENT_DIRECTION}">
+<body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}">
+
+<!-- EVENT simple_header_body_before -->
 
-<div id="simple-wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-body">
\ No newline at end of file
+<div id="wrap">
+	<a id="top" class="anchor" accesskey="t"></a>
+	<div id="page-body" role="main">
diff --git a/template/styleswitcher.js b/template/styleswitcher.js
deleted file mode 100644
index bbcac9b..0000000
--- a/template/styleswitcher.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-function fontsizeup(event)
-{
-	// Skip tabs; 9 being the ASCII code for a tab
-	if (event && getKeyCode(event) == 9)
-	{
-		return true;
-	}
-
-	var active = getActiveStyleSheet();
-
-	switch (active)
-	{
-		case 'A--':
-			setActiveStyleSheet('A-');
-		break;
-
-		case 'A-':
-			setActiveStyleSheet('A');
-		break;
-
-		case 'A':
-			setActiveStyleSheet('A+');
-		break;
-
-		case 'A+':
-			setActiveStyleSheet('A++');
-		break;
-
-		case 'A++':
-			setActiveStyleSheet('A');
-		break;
-
-		default:
-			setActiveStyleSheet('A');
-		break;
-	}
-
-	return false;
-}
-
-function fontsizedown(event)
-{
-	// Skip tabs
-	if (event && getKeyCode(event) == 9)
-	{
-		return true;
-	}
-
-	var active = getActiveStyleSheet();
-
-	switch (active)
-	{
-		case 'A++' : 
-			setActiveStyleSheet('A+');
-		break;
-
-		case 'A+' : 
-			setActiveStyleSheet('A');
-		break;
-
-		case 'A' : 
-			setActiveStyleSheet('A-');
-		break;
-
-		case 'A-' : 
-			setActiveStyleSheet('A--');
-		break;
-
-		case 'A--' : 
-		break;
-
-		default :
-			setActiveStyleSheet('A--');
-		break;
-	}
-
-	return false;
-}
-
-function getKeyCode(event)
-{
-	// IE doesn't fire the onkeypress event for tabs
-	// Reference: http://www.quirksmode.org/js/keys.html
-
-	var code = (event.keyCode) ? event.keyCode : 0;
-
-	// Probably using FF
-	if (!code && event.charCode)
-	{
-		code = event.charCode;
-	}
-
-	return code;
-}
-
-function setActiveStyleSheet(title)
-{
-	var i, a, main;
-
-	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
-	{
-		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title'))
-		{
-			a.disabled = true;
-			if (a.getAttribute('title') == title)
-			{
-				a.disabled = false;
-			}
-		}
-	}
-}
-
-function getActiveStyleSheet()
-{
-	var i, a;
-
-	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
-	{
-		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled)
-		{
-			return a.getAttribute('title');
-		}
-	}
-
-	return null;
-}
-
-function getPreferredStyleSheet()
-{
-	return ('A-');
-}
-
-function createCookie(name, value, days)
-{
-	if (days)
-	{
-		var date = new Date();
-		date.setTime(date.getTime() + (days*24*60*60*1000));
-		var expires = '; expires=' + date.toGMTString();
-	}
-	else
-	{
-		expires = '';
-	}
-
-	document.cookie = name + '=' + value + expires + style_cookie_settings;
-}
-
-function readCookie(name)
-{
-	var nameEQ = name + '=';
-	var ca = document.cookie.split(';');
-
-	for (var i = 0; i < ca.length; i++)
-	{
-		var c = ca[i];
-
-		while (c.charAt(0) == ' ')
-		{
-			c = c.substring(1, c.length);
-		}
-
-		if (c.indexOf(nameEQ) == 0)
-		{
-			return c.substring(nameEQ.length, c.length);
-		}
-	}
-
-	return null;
-}
-
-function load_cookie()
-{
-	var cookie = readCookie('style_cookie');
-	var title = cookie ? cookie : getPreferredStyleSheet();
-	setActiveStyleSheet(title);
-}
-
-function unload_cookie()
-{
-	var title = getActiveStyleSheet();
-	createCookie('style_cookie', title, 365);
-}
-
-onload_functions.push('load_cookie()');
-onunload_functions.push('unload_cookie()');
-
-/*
-var cookie = readCookie("style");
-var title = cookie ? cookie : getPreferredStyleSheet();
-setActiveStyleSheet(title);
-*/
diff --git a/template/syndication_atom.xml b/template/syndication_atom.xml
deleted file mode 100755
index 27c67da..0000000
--- a/template/syndication_atom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-{HEADER}
-<feed xmlns="http://www.w3.org/2005/Atom">
-	<title>{TITLE}</title>
-	<subtitle>{DESCRIPTION}</subtitle>
-	<link href="{LINK}" />
-	<updated>{LAST_BUILD}</updated>
-	<id>{LINK}</id>
-	<link rel="self" href="{FEED_LINK}" />
-	<!-- BEGIN item -->
-	<entry>
-		<title>{item.TITLE}</title>
-		<link href="{item.LINK}"/>
-		<id>{item.IDENTIFIER}</id>
-		<author>
-			<name>{item.AUTHOR}</name>
-		</author>
-		<published>{item.TIME}</published>
-		<updated>{item.TIME}</updated>
-		<summary type="xhtml">
-			<div xmlns="http://www.w3.org/1999/xhtml">{item.TEXT}</div>
-		</summary>
-	</entry>
-	<!-- END item -->
-</feed>
\ No newline at end of file
diff --git a/template/syndication_rss2.xml b/template/syndication_rss2.xml
deleted file mode 100755
index 6a59311..0000000
--- a/template/syndication_rss2.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-{HEADER}
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title>{TITLE}</title>
-		<description>{DESCRIPTION}</description>
-		<link>{LINK}</link>
-		<lastBuildDate>{LAST_BUILD}</lastBuildDate>
-		<!-- BEGIN item -->
-		<item>
-			<dc:creator>{item.AUTHOR}</dc:creator>
-			<pubDate>{item.TIME}</pubDate>
-			<guid>{item.IDENTIFIER}</guid>
-			<link>{item.LINK}</link>
-			<title>{item.TITLE}</title>
-			<description>{item.TEXT}</description>
-		</item>
-		<!-- END item -->
-	</channel>
-</rss>
\ No newline at end of file
diff --git a/template/template.cfg b/template/template.cfg
deleted file mode 100644
index b73d8aa..0000000
--- a/template/template.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# phpBB Template Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# General Information about this template
-name = debianforum.de
-copyright = &copy; 2008 Timo Salmen for debianforum.de
-version = 1.0.1
-
-# Defining a different template bitfield
-template_bitfield = lNg=
diff --git a/template/timezone.js b/template/timezone.js
new file mode 100644
index 0000000..44ec1b0
--- /dev/null
+++ b/template/timezone.js
@@ -0,0 +1,20 @@
+/* global phpbb */
+
+(function($) { // Avoid conflicts with other libraries
+
+'use strict';
+
+$('#tz_date').change(function() {
+	phpbb.timezoneSwitchDate(false);
+});
+
+$('#tz_select_date_suggest').click(function(){
+	phpbb.timezonePreselectSelect(true);
+});
+
+$(function () {
+	phpbb.timezoneEnableDateSelection();
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
+});
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/template/timezone_option.html b/template/timezone_option.html
new file mode 100644
index 0000000..728dc94
--- /dev/null
+++ b/template/timezone_option.html
@@ -0,0 +1,28 @@
+<dl>
+	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
+	<!-- IF .timezone_date -->
+	<dd id="tz_select_date" style="display: none;">
+		<select name="tz_date" id="tz_date" class="autowidth tz_select">
+			<option value="">{L_SELECT_CURRENT_TIME}</option>
+			<!-- BEGIN timezone_date -->
+				<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
+			<!-- END timezone_date -->
+		</select>
+		<input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+	</dd>
+	<!-- ENDIF -->
+	<dd>
+		<select name="tz" id="timezone" class="autowidth tz_select timezone">
+			<option value="">{L_SELECT_TIMEZONE}</option>
+			<!-- BEGIN timezone_select -->
+			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
+				<!-- BEGIN timezone_options -->
+				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
+				<!-- END timezone_options -->
+			</optgroup>
+			<!-- END timezone_select -->
+		</select>
+
+		<!-- INCLUDEJS timezone.js -->
+	</dd>
+</dl>
diff --git a/template/ucp_agreement.html b/template/ucp_agreement.html
index 94a61e2..943774c 100644
--- a/template/ucp_agreement.html
+++ b/template/ucp_agreement.html
@@ -1,28 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript" defer="defer" >
-// <![CDATA[
-	function disable(disabl, name)
-	{
-		document.getElementById(name).disabled = disabl;
-		if (disabl)
-		{
-			document.getElementById(name).className = 'button1 disabled';
-		}
-		else
-		{
-			document.getElementById(name).className = 'button1 enabled';
-		}
-	}
-
-	<!-- IF S_TIME -->
-		onload_functions.push('disable(true, "agreed")');
-		setInterval('disable(false, "agreed")', {S_TIME});
-	<!-- ENDIF -->
-// ]]>
-</script>
-
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
+
 <!-- IF S_LANG_OPTIONS -->
 <script type="text/javascript">
 // <![CDATA[
@@ -31,6 +10,7 @@
 	*/
 	function change_language(lang_iso)
 	{
+		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit();
 	}
@@ -40,7 +20,7 @@
 
 	<form method="post" action="{S_UCP_ACTION}" id="register">
 		<p class="rightside">
-			<label for="lang">{L_LANGUAGE}:</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select>
+			<label for="lang">{L_LANGUAGE}{L_COLON}</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select>
 			{S_HIDDEN_FIELDS}
 		</p>
 	</form>
@@ -54,8 +34,10 @@
 	<div class="panel">
 		<div class="inner">
 		<div class="content">
-			<h2>{SITENAME} - {L_REGISTRATION}</h2>
+			<h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2>
+			<!-- EVENT ucp_agreement_terms_before -->
 			<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p>
+			<!-- EVENT ucp_agreement_terms_after -->
 		</div>
 		</div>
 	</div>
@@ -81,7 +63,7 @@
 	<div class="panel">
 		<div class="inner">
 		<div class="content">
-			<h2>{SITENAME} - {AGREEMENT_TITLE}</h2>
+			<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>
 			<p>{AGREEMENT_TEXT}</p>
 			<hr class="dashed" />
 			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>
@@ -91,4 +73,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_attachments.html b/template/ucp_attachments.html
index c853d46..1d49632 100644
--- a/template/ucp_attachments.html
+++ b/template/ucp_attachments.html
@@ -10,30 +10,38 @@
 	<p>{L_ATTACHMENTS_EXPLAIN}</p>
 
 	<!-- IF .attachrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>	
+		<div class="action-bar top">
+			<div class="pagination">
+				{NUM_ATTACHMENTS}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
 		
 		<ul class="topiclist">
 			<li class="header">
 				<dl>
-					<dt style="width: 40%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
+					<dt><div class="list-inner"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></div></dt>
 					<dd class="extra"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></dd>
 					<dd class="time"><span><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></span></dd>
 					<dd class="mark">{L_MARK}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist responsive-show-columns">
 
 		<!-- BEGIN attachrow -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
-					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt>
+				<dt>
+					<div class="list-inner">
+						<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle attachment-filename ellipsis-text" title="{attachrow.FILENAME}">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
+						<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}{L_COLON} <!-- ELSE -->{L_TOPIC}{L_COLON} <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a>
+					</div>
+				</dt>
 				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>
 				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>
 				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd>
@@ -43,22 +51,25 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label for="sk">{L_SORT_BY}: <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
+			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
 			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
 			<input class="button2" type="submit" name="sort" value="{L_SORT}" />
 			{S_FORM_TOKEN}
 		</fieldset>
 
 		<hr />
-		
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
+
+		<div class="action-bar bottom">
+			<div class="pagination">
+				{TOTAL_ATTACHMENTS} {L_TITLE}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
+
 	<!-- ELSE -->
 		<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>
 	<!-- ENDIF -->
@@ -75,4 +86,4 @@
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_auth_link.html b/template/ucp_auth_link.html
new file mode 100644
index 0000000..078da58
--- /dev/null
+++ b/template/ucp_auth_link.html
@@ -0,0 +1,15 @@
+<!-- INCLUDE ucp_header.html -->
+
+<h2>{L_UCP_AUTH_LINK_TITLE}</h2>
+
+<div class="panel">
+	<div class="inner">
+		<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->
+
+		<!-- IF PROVIDER_TEMPLATE_FILE -->
+			<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
+		<!-- ENDIF -->
+	</div>
+</div>
+
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_auth_link_oauth.html b/template/ucp_auth_link_oauth.html
new file mode 100644
index 0000000..1831661
--- /dev/null
+++ b/template/ucp_auth_link_oauth.html
@@ -0,0 +1,29 @@
+<!-- BEGIN oauth -->
+	<form id="ucp" method="post" action="{S_UCP_ACTION}">
+		<h3>{oauth.SERVICE_NAME}</h3>
+
+		<fieldset class="fields2">
+			<!-- IF oauth.UNIQUE_ID -->
+				<dl>
+					<dt>{L_UCP_AUTH_LINK_ID}{L_COLON}</dt>
+					<dd>{oauth.UNIQUE_ID}</dd>
+				</dl>
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1" /></dd>
+				</dl>
+			<!-- ELSE -->
+				<dl>
+					<dd>{L_UCP_AUTH_LINK_ASK}</dd>
+				</dl>
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
+				</dl>
+			<!-- ENDIF -->
+		</fieldset>
+		{oauth.HIDDEN_FIELDS}
+		{S_HIDDEN_FIELDS}
+		{S_FORM_TOKEN}
+	</form>
+<!-- END oauth -->
diff --git a/template/ucp_avatar_options.html b/template/ucp_avatar_options.html
index f55087c..2cf9488 100644
--- a/template/ucp_avatar_options.html
+++ b/template/ucp_avatar_options.html
@@ -1,4 +1,3 @@
-
 <div class="panel">
 	<div class="inner">
 	<!-- IF not S_AVATARS_ENABLED -->
@@ -7,64 +6,42 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-
-	<!-- IF S_UPLOAD_AVATAR_FILE -->
 		<dl>
-			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
+			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
 		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_UPLOAD_AVATAR_URL -->
+	</fieldset>
+	<h3>{L_AVATAR_SELECT}</h3>
+	<fieldset>
 		<dl>
-			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
+			<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
+			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
+				<!-- BEGIN avatar_drivers -->
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
+				<!-- END avatar_drivers -->
+			</select></dd>
 		</dl>
-	<!-- ENDIF -->
+	</fieldset>
+	<div id="avatar_options">
+<!-- BEGIN avatar_drivers -->
+	<div id="avatar_option_{avatar_drivers.DRIVER}">
+	<noscript>
+	<h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3>
+	</noscript>
+	<p>{avatar_drivers.L_EXPLAIN}</p>
 
-	<!-- IF S_LINK_AVATAR -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd>
-				<label for="width"><input type="text" name="width" id="width" size="3" value="{AVATAR_WIDTH}" class="inputbox autowidth" /> px</label> &times;&nbsp; 
-				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> px</label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->
+	<fieldset>
+	{avatar_drivers.OUTPUT}
 	</fieldset>
-	
-	<!-- IF S_IN_AVATAR_GALLERY -->
-		</div>
 	</div>
-
-	<div class="panel">
-		<div class="inner">
-
-		<h3>{L_AVATAR_GALLERY}</h3>
-	
-		<fieldset>
-			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label>
-			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" />
-			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />
-		</fieldset>
-
-		<div id="gallery">
-		<!-- BEGIN avatar_row --><!-- BEGIN avatar_column -->
-			<label for="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="" /><br />
-				<input type="radio" name="avatar_select" id="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}" value="{avatar_row.avatar_column.AVATAR_FILE}" /></label>
-		<!-- END avatar_column --><!-- END avatar_row -->
-		</div>
-	
-	<!-- ENDIF -->
-
+<!-- END avatar_drivers -->
+	</div>
+<!-- IF not S_GROUP_MANAGE -->
+	<fieldset class="submit-buttons">
+		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	</fieldset>
+<!-- ENDIF -->
 	</div>
 </div>
diff --git a/template/ucp_avatar_options_gravatar.html b/template/ucp_avatar_options_gravatar.html
new file mode 100644
index 0000000..b1076c2
--- /dev/null
+++ b/template/ucp_avatar_options_gravatar.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" data-reset-on-edit="#avatar_gravatar_width, #avatar_gravatar_height" /></dd>
+</dl>
+<dl>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/template/ucp_avatar_options_local.html b/template/ucp_avatar_options_local.html
new file mode 100644
index 0000000..2a0f403
--- /dev/null
+++ b/template/ucp_avatar_options_local.html
@@ -0,0 +1,19 @@
+<!-- IF .avatar_local_cats -->
+<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
+<!-- BEGIN avatar_local_cats -->
+<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
+<!-- END avatar_local_cats -->
+</select></label>
+<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" />
+
+<div id="gallery">
+<!-- BEGIN avatar_local_row -->
+<!-- BEGIN avatar_local_col -->
+	<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
+	<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+<!-- END avatar_local_col -->
+<!-- END avatar_local_row -->
+</div>
+<!-- ELSE -->
+<p><strong>{L_NO_AVATARS}</strong></p>
+<!-- ENDIF -->
diff --git a/template/ucp_avatar_options_remote.html b/template/ucp_avatar_options_remote.html
new file mode 100644
index 0000000..a8f6135
--- /dev/null
+++ b/template/ucp_avatar_options_remote.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" data-reset-on-edit="#avatar_remote_width, #avatar_remote_height" /></dd>
+</dl>
+<dl>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dd>
+		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+	</dd>
+</dl>
diff --git a/template/ucp_avatar_options_upload.html b/template/ucp_avatar_options_upload.html
new file mode 100644
index 0000000..63a734e
--- /dev/null
+++ b/template/ucp_avatar_options_upload.html
@@ -0,0 +1,11 @@
+<dl>
+	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
+</dl>
+
+<!-- IF S_UPLOAD_AVATAR_URL -->
+	<dl>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
+	</dl>
+<!-- ENDIF -->
diff --git a/template/ucp_footer.html b/template/ucp_footer.html
index 4b3b14b..f2f1a68 100644
--- a/template/ucp_footer.html
+++ b/template/ucp_footer.html
@@ -1,9 +1,8 @@
 
 		</div>
-	<div class="clear"></div>
 
 	</div>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- IF S_COMPOSE_PM -->
 <div>{S_FORM_TOKEN}</div>
@@ -12,4 +11,4 @@
 
 <!-- INCLUDE jumpbox.html -->
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_groups_manage.html b/template/ucp_groups_manage.html
index 9ae3798..3b805c4 100644
--- a/template/ucp_groups_manage.html
+++ b/template/ucp_groups_manage.html
@@ -1,38 +1,37 @@
 <!-- INCLUDE ucp_header.html -->
 
-<h2>{L_USERGROUPS}</h2>
+<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{L_USERGROUPS}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h2>
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
 <div class="panel">
 	<div class="inner">
-	
+
+	<!-- IF S_ERROR -->
+	<fieldset>
+		<p class="error">{ERROR_MSG}</p>
+	</fieldset>
+	<!-- ENDIF -->
+
 	<p>{L_GROUPS_EXPLAIN}</p>
 
 	<!-- IF S_EDIT -->
 		<h3>{L_GROUP_DETAILS}</h3>
-	
-		<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-		<!-- ENDIF -->
-	
+
 		<fieldset>
 		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
+			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>
 			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />
 				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox" /><!-- ENDIF --></dd>
 		</dl>
 		<dl>
-			<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
+			<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>
 			<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45" class="inputbox">{GROUP_DESC}</textarea></dd>
 			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>&nbsp;<label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>&nbsp;<label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 		</dl>
 		<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
-			<dt><label for="group_type1">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
 				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label> 
 				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> 
@@ -54,11 +53,16 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd>
+		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dd>
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" />
+			<span style="background-color: #{GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span>
+			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]
+			<div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+		</dd>
 	</dl>
 	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
+		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -70,16 +74,15 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
+	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
 	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 
 <!-- ELSEIF S_LIST -->
 
-	<table class="table1" cellspacing="1">
+	<!-- IF .leader -->
+	<table class="table1">
 	<thead>
 	<tr>
 		<th class="name">{L_GROUP_LEAD}</th>
@@ -101,24 +104,11 @@
 	<!-- END leader -->
 	</tbody>
 	</table>
+	<!-- ENDIF -->
 
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_GROUP_APPROVED}</th>
-		<th class="info">{L_GROUP_DEFAULT}</th>
-		<th class="posts">{L_POSTS}</th>
-		<th class="joined">{L_JOINED}</th>
-		<th class="mark">{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>	
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
-			</tbody>
-			</table>
-
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_GROUP_PENDING}</th>
@@ -128,7 +118,23 @@
 				<th class="mark">{L_MARK}</th>
 			</tr>
 			</thead>
-			<tbody>	
+			<tbody>
+		<!-- ELSEIF member.S_APPROVED -->
+			<!-- IF S_PENDING_SET -->
+				</tbody>
+				</table>
+			<!-- ENDIF -->
+			<table class="table1">
+			<thead>
+			<tr>
+				<th class="name">{L_GROUP_APPROVED}</th>
+				<th class="info">{L_GROUP_DEFAULT}</th>
+				<th class="posts">{L_POSTS}</th>
+				<th class="joined">{L_JOINED}</th>
+				<th class="mark">{L_MARK}</th>
+			</tr>
+			</thead>
+			<tbody>
 		<!-- ELSE -->
 			<tr class="<!-- IF member.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 				<td class="name">{member.USERNAME_FULL}</td>
@@ -139,18 +145,27 @@
 			</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
+		<table class="table1">
+		<thead>
+		<tr>
+			<th class="name">{L_MEMBERS}</th>
+		</tr>
+		</thead>
+		<tbody>
 		<tr>
-			<td class="bg1" colspan="5">{L_GROUPS_NO_MEMBERS}</td>
+			<td class="bg1">{L_GROUPS_NO_MEMBERS}</td>
 		</tr>
 	<!-- END member -->
 	</tbody>
 	</table>
 
-	<ul class="linklist">
-		<li class="leftside pagination">
-			<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{S_ON_PAGE}<!-- ENDIF -->
-		</li>
-	</ul>
+	<!-- IF .pagination -->
+	<div class="action-bar bottom">
+		<div class="pagination"> 
+			<!-- INCLUDE pagination.html -->
+		</div>
+	</div>
+	<!-- ENDIF -->
 
 	</div>
 </div>
@@ -166,18 +181,18 @@
 
 	<h3>{L_ADD_USERS}</h3>
 
-	<p>{L_ADD_USERS_EXPLAIN}</p>
+	<p>{L_ADD_USERS_UCP_EXPLAIN}</p>
 
 	<fieldset>
 	<dl>
-		<dt><label for="default0">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
 		<dd>
 			<label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label> 
 			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -194,21 +209,25 @@
 <!-- ELSE -->
 
 	<!-- IF .leader -->
-		<ul class="topiclist">
+		<ul class="topiclist two-long-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_GROUP_LEADER}</dt>
+					<dt><div class="list-inner">{L_GROUP_LEADER}</div></dt>
 					<dd class="info"><span>{L_OPTIONS}</span></dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist two-long-columns responsive-show-all">
 
 		<!-- BEGIN leader -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt><a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{GROUP_COLOR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-					<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --></dt>
+				<dt>
+					<div class="list-inner">
+						<a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
+						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
+					</div>
+				</dt>
 				<dd class="option"><span><a href="{leader.U_EDIT}" >{L_EDIT}</a></span></dd>
 				<dd class="option"><span><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></span></dd>
 			</dl>
@@ -225,4 +244,4 @@
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_groups_membership.html b/template/ucp_groups_membership.html
index 4a3862b..d7df3b0 100644
--- a/template/ucp_groups_membership.html
+++ b/template/ucp_groups_membership.html
@@ -10,15 +10,15 @@
 	<p>{L_GROUPS_EXPLAIN}</p>
 	<!-- DEFINE $SHOW_BUTTONS = 0 -->
 	<!-- IF .leader -->
-		<ul class="topiclist">
+		<ul class="topiclist two-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_GROUP_LEADER}</dt>
+					<dt><div class="list-inner">{L_GROUP_LEADER}</div></dt>
 					<dd class="mark">{L_SELECT}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist two-columns">
 
 		<!-- BEGIN leader -->
 		<!-- IF not leader.GROUP_SPECIAL -->
@@ -26,10 +26,13 @@
 		<!-- ENDIF -->
 		<li class="row<!-- IF leader.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF -->
-				<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-				<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF -->
+				<dt>
+					<div class="list-inner">
+						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF -->
+						<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
+						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF -->
+					</div>
 				</dt>
 				<dd class="mark"><input type="radio" name="selected" value="{leader.GROUP_ID}" <!-- IF leader.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
 			</dl>
@@ -39,15 +42,15 @@
 	<!-- ENDIF -->
 
 	<!-- IF .member -->
-		<ul class="topiclist">
+		<ul class="topiclist two-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_GROUP_MEMBER}</dt>
+					<dt><div class="list-inner">{L_GROUP_MEMBER}</div></dt>
 					<dd class="mark">{L_SELECT}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist two-columns">
 
 		<!-- BEGIN member -->
 		<!-- IF not member.GROUP_SPECIAL -->
@@ -55,10 +58,13 @@
 		<!-- ENDIF -->		
 		<li class="row<!-- IF member.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF -->
-				<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a>
-				<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF -->
+				<dt>
+					<div class="list-inner">
+						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF -->
+						<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a>
+						<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF -->
+					</div>
 				</dt>
 				<dd class="mark"><input type="radio" name="selected" value="{member.GROUP_ID}" <!-- IF member.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
 			</dl>
@@ -72,15 +78,15 @@
 <!-- IF .pending -->
 <div class="panel">
 	<div class="inner">	
-		<ul class="topiclist">
+		<ul class="topiclist two-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_GROUP_PENDING}</dt>
+					<dt><div class="list-inner">{L_GROUP_PENDING}</div></dt>
 					<dd class="mark">{L_SELECT}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist two-columns">
 
 		<!-- BEGIN pending -->
 		<!-- IF not pending.GROUP_SPECIAL -->
@@ -89,11 +95,13 @@
 		<li class="row<!-- IF pending.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
 				<dt>
-				<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a>
-				<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
+					<div class="list-inner">
+						<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a>
+						<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
+					</div>
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="diabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
 			</dl>
 		</li>
 		<!-- END pending -->
@@ -104,15 +112,15 @@
 <!-- IF .nonmember -->
 <div class="panel">
 	<div class="inner">
-		<ul class="topiclist">
+		<ul class="topiclist two-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_GROUP_NONMEMBER}</dt>
+					<dt><div class="list-inner">{L_GROUP_NONMEMBER}</div></dt>
 					<dd class="mark">{L_SELECT}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist two-columns">
 
 		<!-- BEGIN nonmember -->
 		<!-- IF nonmember.S_CAN_JOIN -->
@@ -121,9 +129,11 @@
 		<li class="row<!-- IF nonmember.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
 				<dt>
-				<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a>
-				<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
+					<div class="list-inner">
+						<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a>
+						<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
+					</div>
 				</dt>
 				<dd class="mark"><input type="radio" name="selected" value="{nonmember.GROUP_ID}" <!-- IF not nonmember.S_CAN_JOIN -->disabled="disabled"<!-- ENDIF --> /></dd>
 			</dl>
@@ -146,7 +156,7 @@
 
 		<!-- IF $SHOW_BUTTONS eq 1 -->
 		<div class="right-box">
-			<label for="action">{L_SELECT}:</label> 
+			<label for="action">{L_SELECT}{L_COLON}</label> 
 			<select name="action" id="action">
 				<option value="join">{L_JOIN_SELECTED}</option>
 				<option value="resign">{L_RESIGN_SELECTED}</option>
@@ -161,4 +171,4 @@
 
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_header.html b/template/ucp_header.html
index c5d58b8..a17f145 100644
--- a/template/ucp_header.html
+++ b/template/ucp_header.html
@@ -1,11 +1,11 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_UCP}</h2>
+<h2 class="ucp-title">{L_UCP}</h2>
 
 <div id="tabs">
 	<ul>
 		<!-- BEGIN t_block1 -->
-		<li <!-- IF t_block1.S_SELECTED -->class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+		<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
 		<!-- END t_block1 -->
 	</ul>
 </div>
@@ -20,7 +20,7 @@
 	<div style="width: 100%;">
 
 	<div id="cp-menu">
-		<div id="navigation">
+		<div id="navigation" role="navigation">
 
 		<!-- IF S_PRIVMSGS -->
 			<!-- BEGIN t_block2 -->
@@ -98,4 +98,4 @@
 
 	</div>
 
-	<div id="cp-main" class="ucp-main">
+	<div id="cp-main" class="ucp-main panel-container">
diff --git a/template/ucp_header.html~ b/template/ucp_header.html~
deleted file mode 100644
index 9e54830..0000000
--- a/template/ucp_header.html~
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-<!-- INCLUDE overall_sidebar_menu.html -->
-
-<h2>{L_UCP}</h2>
-
-<div id="tabs">
-	<ul>
-		<!-- BEGIN t_block1 -->
-		<li <!-- IF t_block1.S_SELECTED -->class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-		<!-- END t_block1 -->
-	</ul>
-</div>
-
-<!-- IF S_COMPOSE_PM -->
-<form id="postform" method="post" action="{S_POST_ACTION}"{S_FORM_ENCTYPE}>
-<!-- ENDIF -->
-
-<div class="panel bg3">
-	<div class="inner">
-
-	<div style="width: 100%;">
-
-	<div id="cp-menu">
-		<div id="navigation">
-
-		<!-- IF S_PRIVMSGS -->
-			<!-- BEGIN t_block2 -->
-				<!-- IF S_PRIVMSGS and not t_block2.S_LAST_ROW -->
-				<ul>
-					<!-- IF t_block2.S_SELECTED -->
-						<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-					<!-- ELSE -->
-						<li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-					<!-- ENDIF -->
-				</ul>
-				<!-- ENDIF -->
-			<!-- END t_block2 -->
-
-			<hr />
-			<!-- BEGIN folder -->
-				<!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF -->
-				<!-- IF folder.S_CUR_FOLDER -->
-					<li id="active-subsection"><a href="{folder.U_FOLDER}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li>
-				<!-- ELSE -->
-					<li><a href="{folder.U_FOLDER}"><span><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></span></a></li>
-				<!-- ENDIF -->
-				<!-- IF folder.S_LAST_ROW --></ul><!-- ENDIF -->
-			<!-- END folder -->
-			<hr />
-		<!-- ENDIF -->
-
-			<ul>
-		<!-- BEGIN t_block2 -->
-			<!-- IF (S_PRIVMSGS and t_block2.S_LAST_ROW) or not S_PRIVMSGS -->
-				<!-- IF t_block2.S_SELECTED -->
-					<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-				<!-- ELSE -->
-					<li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-		<!-- END t_block2 -->
-			</ul>
-		</div>
-
-		<!-- IF .friends_online or .friends_offline -->
-		<div class="cp-mini">
-			<div class="inner">
-
-			<dl class="mini">
-				<dt>{L_FRIENDS}</dt>
-
-				<!-- BEGIN friends_online -->
-					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd>
-				<!-- END friends_online -->
-
-				<!-- BEGIN friends_offline -->
-					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd>
-				<!-- END friends_offline -->
-			</dl>
-
-			</div>
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF S_SHOW_COLOUR_LEGEND -->
-		<div class="cp-mini">
-			<div class="inner">
-
-			<dl class="mini">
-				<dt>{L_MESSAGE_COLOURS}</dt>
-				<!-- BEGIN pm_colour_info -->
-					<dd class="pm-legend<!-- IF pm_colour_info.CLASS --> {pm_colour_info.CLASS}<!-- ENDIF -->"><!-- IF pm_colour_info.IMG -->{pm_colour_info.IMG} <!-- ENDIF -->{pm_colour_info.LANG}</dd>
-				<!-- END pm_colour_info -->
-			</dl>
-
-			</div>
-		</div>
-		<!-- ENDIF -->
-
-	</div>
-
-	<div id="cp-main" class="ucp-main">
diff --git a/template/ucp_login_link.html b/template/ucp_login_link.html
new file mode 100644
index 0000000..be17331
--- /dev/null
+++ b/template/ucp_login_link.html
@@ -0,0 +1,58 @@
+<!-- INCLUDE overall_header.html -->
+
+<div class="panel">
+	<div class="inner">
+
+	<h2>{SITENAME} - {L_LOGIN_LINK}</h2>
+
+	<p>{L_LOGIN_LINK_EXPLAIN}</p>
+
+	<!-- IF LOGIN_LINK_ERROR --><div class="content">
+		<div class="error">{LOGIN_LINK_ERROR}</div>
+	</div><!-- ENDIF -->
+
+	<div class="content">
+		<h2>{L_REGISTER}</h2>
+
+		<form action="{REGISTER_ACTION}" method="post" id="register">
+			<fieldset class="fields1">
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd>
+				</dl>
+			</fieldset>
+		</form>
+	</div>
+
+	<div class="content">
+		<h2>{L_LOGIN}</h2>
+
+		<form action="{LOGIN_ACTION}" method="post" id="login">
+			<fieldset class="fields1">
+				<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
+				<dl>
+					<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
+					<dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd>
+				</dl>
+				<dl>
+					<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
+					<dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" autocomplete="off" /></dd>
+				</dl>
+				<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
+					<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
+					<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
+				<!-- ENDIF -->
+
+				{S_LOGIN_REDIRECT}
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
+				</dl>
+			</fieldset>
+		</form>
+	</div>
+
+	</div>
+</div>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_main_bookmarks.html b/template/ucp_main_bookmarks.html
index 56ae0f0..f74728b 100644
--- a/template/ucp_main_bookmarks.html
+++ b/template/ucp_main_bookmarks.html
@@ -6,41 +6,68 @@
 
 <div class="panel">
 	<div class="inner">
-	
+
 	<p>{L_BOOKMARKS_EXPLAIN}</p>
-	
+
 <!-- IF S_NO_DISPLAY_BOOKMARKS -->
 	<p class="error">{L_BOOKMARKS_DISABLED}</p>
 <!-- ELSE -->
 
 <!-- IF .topicrow -->
-	<ul class="topiclist">
+	<ul class="topiclist missing-column">
 		<li class="header">
 			<dl class="icon">
-				<dt>{L_BOOKMARKS}</dt>
+				<dt><div class="list-inner">{L_BOOKMARKS}</div></dt>
 				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
+				<dd class="mark">{L_MARK}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist cplist">
+	<ul class="topiclist cplist missing-column">
 
 	<!-- BEGIN topicrow -->
 		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<!-- IF topicrow.S_DELETED_TOPIC -->
-				<dl><dt><strong>{L_DELETED_TOPIC}</strong></dt>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
+				<dl>
+					<dt><div class="list-inner"><strong>{L_DELETED_TOPIC}</strong></div></dt>
+					<dd class="lastpost"><span>&nbsp;</span></dd>
+					<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
 				</dl>
 			<!-- ELSE -->
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt style="<!-- IF topicrow.TOPIC_ICON_IMG -->background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;<!-- ENDIF -->" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
+			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
+					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF .topicrow.pagination -->
+						<div class="pagination">
+							<ul>
+							<!-- BEGIN pagination -->
+								<!-- IF topicrow.pagination.S_IS_PREV -->
+								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
+								<!-- ENDIF -->
+							<!-- END pagination -->
+							</ul>
+						</div>
+						<!-- ENDIF -->
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo;
+							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
+					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
 			</dl>
@@ -48,12 +75,18 @@
 		</li>
 	<!-- END topicrow -->
 	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
+
+	<div class="action-bar bottom">
+		<div class="pagination">
+			{TOTAL_TOPICS}
+			<!-- IF .pagination --> 
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
+
 <!-- ELSE -->
 	<p><strong>{L_NO_BOOKMARKS}</strong></p>
 <!-- ENDIF -->
@@ -64,7 +97,7 @@
 </div>
 
 <!-- IF .topicrow and not S_NO_DISPLAY_BOOKMARKS -->
-	<fieldset class="display-actions">		
+	<fieldset class="display-actions">
 		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button2" />
 		<div><a href="#" onclick="marklist('ucp', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', '', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
@@ -72,4 +105,4 @@
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_main_drafts.html b/template/ucp_main_drafts.html
index dd828e0..52ad5b5 100644
--- a/template/ucp_main_drafts.html
+++ b/template/ucp_main_drafts.html
@@ -24,26 +24,32 @@
 <!-- ELSE -->
 
 	<!-- IF .draftrow -->
-		<ul class="topiclist">
+		<ul class="topiclist missing-column">
 			<li class="header">
 				<dl>
-					<dt>{L_DRAFT_TITLE}</dt>
+					<dt><div class="list-inner">{L_DRAFT_TITLE}</div></dt>
 					<dd class="info"><span>{L_SAVE_DATE}</span></dd>
 					<dd class="mark">{L_MARK}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist missing-column">
 
 		<!-- BEGIN draftrow -->
 			<li class="row<!-- IF draftrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl>
 					<dt>
-						<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br />
-						<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-						<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-						<!-- ELSEIF S_PRIVMSGS -->
-						<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->
+						<div class="list-inner">
+							<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br />
+							<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+							<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+							<!-- ELSEIF S_PRIVMSGS -->
+							<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->
+							<div class="responsive-show" style="display: none;">
+								{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong><br />
+								<!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a>
+							</div>
+						</div>
 					</dt>
 					<dd class="info"><span>{draftrow.DATE}<br /><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>
 					<dd class="mark"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" id="d{draftrow.DRAFT_ID}" /></dd>
@@ -70,4 +76,4 @@
 
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_main_front.html b/template/ucp_main_front.html
index e35de26..7bc8d40 100644
--- a/template/ucp_main_front.html
+++ b/template/ucp_main_front.html
@@ -10,17 +10,40 @@
 <!-- IF .topicrow -->
 	<h3>{L_IMPORTANT_NEWS}</h3>
 
-	<ul class="topiclist cplist">
+	<ul class="topiclist cplist two-long-columns">
 	<!-- BEGIN topicrow -->
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-					<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
+					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
+						<!-- IF .topicrow.pagination -->
+						<div class="pagination">
+							<ul>
+							<!-- BEGIN pagination -->
+								<!-- IF topicrow.pagination.S_IS_PREV -->
+								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
+								<!-- ENDIF -->
+							<!-- END pagination -->
+							</ul>
+						</div>
+						<!-- ENDIF -->
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
+					</div>
 				</dt>
 				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
 		</li>
@@ -30,16 +53,18 @@
 
 	<h3>{L_YOUR_DETAILS}</h3>
 
+<!-- EVENT ucp_main_front_user_activity_before -->
 	<dl class="details">
-		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
-		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
-		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
-		<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-		<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
+		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
+		<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
+		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
+		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
+		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
 	</dl>
+<!-- EVENT ucp_main_front_user_activity_after -->
 
 	</div>
 </div>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_main_subscribed.html b/template/ucp_main_subscribed.html
index 3aaf6eb..ef03317 100644
--- a/template/ucp_main_subscribed.html
+++ b/template/ucp_main_subscribed.html
@@ -9,82 +9,139 @@
 	<p>{L_WATCHED_EXPLAIN}</p>
 
 <!-- IF .forumrow -->
-	<ul class="topiclist">
+	<ul class="topiclist missing-column">
 		<li class="header">
 			<dl class="icon">
-				<dt>{L_WATCHED_FORUMS}</dt>
+				<dt><div class="list-inner">{L_WATCHED_FORUMS}</div></dt>
+				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
 				<dd class="mark">{L_MARK}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist cplist">
+	<ul class="topiclist cplist missing-column">
 
 	<!-- BEGIN forumrow -->
 		<li class="row<!-- IF forumrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
-				<!-- IF forumrow.LAST_POST_TIME -->{L_LAST_POST} {L_POST_BY_AUTHOR} <!-- IF forumrow.U_LAST_POST_AUTHOR --><a href="{forumrow.U_LAST_POST_AUTHOR}">{forumrow.LAST_POST_AUTHOR}</a>
-				<!-- ELSE -->{forumrow.LAST_POST_AUTHOR}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> {L_POSTED_ON_DATE} {forumrow.LAST_POST_TIME}
-				<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF -->
+			<dl class="icon {forumrow.FORUM_IMG_STYLE}">
+				<dt>
+					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
+						{forumrow.FORUM_DESC}
+						<!-- IF forumrow.LAST_POST_TIME -->
+						<div class="responsive-show" style="display: none;">
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{forumrow.LAST_POST_TIME}</a>
+						</div>
+						<!-- ENDIF -->
+					</div>
 				</dt>
+				<dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL}
+					<a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span>
+					<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF -->
+				</dd>
 				<dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}" /></dd>
 			</dl>
 		</li>
 	<!-- END forumrow -->
 	</ul>
 <!-- ELSEIF S_FORUM_NOTIFY -->
+    <ul class="topiclist">
+        <li class="header">
+            <dl class="icon">
+                <dt>{L_WATCHED_FORUMS}</dt>
+            </dl>
+        </li>
+    </ul>
 	<p><strong>{L_NO_WATCHED_FORUMS}</strong></p>
 <!-- ENDIF -->
+    <br />
 
 <!-- IF .topicrow -->
-	<ul class="topiclist">
+	<ul class="topiclist missing-column">
 		<li class="header">
 			<dl class="icon">
-				<dt>{L_WATCHED_TOPICS}</dt>
-				<dd class="lastpost">{L_LAST_POST}</dd>
+				<dt><div class="list-inner">{L_WATCHED_TOPICS}</div></dt>
+				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
+				<dd class="mark">{L_MARK}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist cplist">
+	<ul class="topiclist cplist missing-column">
 
 	<!-- BEGIN topicrow -->
 		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt style="<!-- IF topicrow.TOPIC_ICON_IMG -->background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;<!-- ENDIF -->" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
+			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
+					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF .topicrow.pagination -->
+						<div class="pagination">
+							<ul>
+							<!-- BEGIN pagination -->
+								<!-- IF topicrow.pagination.S_IS_PREV -->
+								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
+								<!-- ENDIF -->
+							<!-- END pagination -->
+							</ul>
+						</div>
+						<!-- ENDIF -->
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
+					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
 			</dl>
 		</li>
 	<!-- END topicrow -->
 	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
+
+	<div class="action-bar bottom">
+		<div class="pagination">
+			{TOTAL_TOPICS}
+			<!-- IF .pagination --> 
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
+
 <!-- ELSEIF S_TOPIC_NOTIFY -->
+    <ul class="topiclist">
+        <li class="header">
+            <dl class="icon">
+                <dt>{L_WATCHED_TOPICS}</dt>
+            </dl>
+        </li>
+    </ul>
 	<p><strong>{L_NO_WATCHED_TOPICS}</strong></p>
 <!-- ENDIF -->
-	
+
 	</div>
 </div>
 
 <!-- IF .topicrow or .forumrow -->
-	<fieldset class="display-actions">	
+	<fieldset class="display-actions">
 		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button2" />
-		<div><a href="#" onclick="marklist('ucp', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', '', false); return false;">{L_UNMARK_ALL}</a></div>
+		<div><a href="#" onclick="marklist('ucp', 't', true); marklist('ucp', 'f', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 't', false); marklist('ucp', 'f', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
 <!-- ENDIF -->
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_notifications.html b/template/ucp_notifications.html
new file mode 100644
index 0000000..500bae0
--- /dev/null
+++ b/template/ucp_notifications.html
@@ -0,0 +1,122 @@
+<!-- INCLUDE ucp_header.html -->
+
+<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+
+<h2>{TITLE}</h2>
+<div class="panel">
+	<div class="inner">
+
+		<p>{TITLE_EXPLAIN}</p>
+
+		<!-- IF MODE == 'notification_options' -->
+			<table class="table1">
+				<thead>
+					<tr>
+						<th>{L_NOTIFICATION_TYPE}</th>
+						<!-- BEGIN notification_methods -->
+							<th class="mark">{notification_methods.NAME}</th>
+						<!-- END notification_methods -->
+						<th class="mark">{L_NOTIFICATIONS}</th>
+					</tr>
+				</thead>
+				<tbody>
+				<!-- BEGIN notification_types -->
+					<!-- IF notification_types.GROUP_NAME -->
+						<tr class="bg3">
+							<td colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td>
+						</tr>
+					<!-- ELSE -->
+						<tr class="<!-- IF notification_types.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
+							<td>
+								{notification_types.NAME}
+								<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+							</td>
+							<!-- BEGIN notification_methods -->
+								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+							<!-- END notification_methods -->
+							<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+						</tr>
+					<!-- ENDIF -->
+				<!-- END notification_types -->
+				</tbody>
+			</table>
+		<!-- ELSE -->
+			<!-- IF .notification_list -->
+				<div class="action-bar top">
+					<div class="pagination">
+						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
+						{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
+						<!-- IF .pagination -->
+							<!-- INCLUDE pagination.html -->
+						<!-- ELSE -->
+							 &bull; {PAGE_NUMBER}
+						<!-- ENDIF -->
+					</div>
+				</div>
+
+			<div class="notification_list">
+				<ul class="topiclist two-columns">
+					<li class="header">
+						<dl>
+							<dt><div class="list-inner">{L_NOTIFICATIONS}</div></dt>
+							<dd class="mark">{L_MARK_READ}</dd>
+						</dl>
+					</li>
+				</ul>
+				<ul class="topiclist cplist two-columns">
+					<!-- BEGIN notification_list -->
+						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->">
+							<dl>
+								<dt>
+									<div class="list-inner">										
+										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										<div class="notifications">
+											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+											<p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
+											<!-- IF notification_list.URL --></a><!-- ENDIF -->				
+											<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF -->
+											<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- ENDIF -->
+											<p class="notifications_time">{notification_list.TIME}</p>
+										</div>
+									</div>
+								</dt>
+
+								<dd class="mark">&nbsp;<input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}"<!-- IF not notification_list.UNREAD --> disabled="disabled"<!-- ENDIF --> /> <dfn>{L_MARK_READ}</dfn>&nbsp;</dd>
+							</dl>
+						</li>
+					<!-- END notification_list -->
+				</ul>
+			</div>
+
+			<div class="action-bar bottom">
+				<div class="pagination">
+					{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
+					<!-- IF .pagination -->
+						<!-- INCLUDE pagination.html -->
+					<!-- ELSE -->
+						  &bull; {PAGE_NUMBER}
+					<!-- ENDIF -->
+				</div>
+			</div>
+
+			<!-- ELSE -->
+				<p><strong>{L_NO_NOTIFICATIONS}</strong></p>
+			<!-- ENDIF -->
+
+		<!-- ENDIF -->
+	</div>
+</div>
+
+<!-- IF .notification_types or .notification_list -->
+<fieldset class="display-actions">
+	<input type="hidden" name="form_time" value="{FORM_TIME}" />
+	{S_HIDDEN_FIELDS}
+	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" />
+	<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
+	{S_FORM_TOKEN}
+</fieldset>
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_pm_history.html b/template/ucp_pm_history.html
index 88efcf9..28f217e 100644
--- a/template/ucp_pm_history.html
+++ b/template/ucp_pm_history.html
@@ -1,32 +1,51 @@
 
 <h3 id="review">
 	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-	{L_MESSAGE_HISTORY}: {HISTORY_TITLE}
+	{L_MESSAGE_HISTORY}{L_COLON}
 </h3>
 
+<!-- EVENT ucp_pm_history_review_before -->
 <div id="topicreview">
+	<script type="text/javascript">
+	// <![CDATA[
+		bbcodeEnabled = {S_BBCODE_ALLOWED};
+	// ]]>
+	</script>
 	<!-- BEGIN history_row -->
 	<div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
+		<div class="inner">
 
 		<div class="postbody" id="pr{history_row.MSG_ID}">
-			<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li>
+			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
+
+			<!-- DEFINE $SHOW_PM_HISTORY_POST_BUTTONS = (history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE) -->
+			<!-- EVENT ucp_pm_history_post_buttons_list_before -->
+			<!-- IF $SHOW_PM_HISTORY_POST_BUTTONS -->
+			<ul class="post-buttons">
+				<!-- EVENT ucp_pm_history_post_buttons_before -->
+				<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
+				<li>
+					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button icon-button quote-icon">
+						<span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
+					</a>
+				</li>
+				<!-- ENDIF -->
+				<!-- EVENT ucp_pm_history_post_buttons_after -->
 			</ul>
 			<!-- ENDIF -->
+			<!-- EVENT ucp_pm_history_post_buttons_list_after -->
 
-			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
-			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br />
+			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br />
 				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
-			<div class="content">{history_row.MESSAGE}</div>
+			<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>
 			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
 		</div>
 
-		<span class="corners-bottom"><span></span></span></div>
+		</div>
 	</div>
 	<!-- END history_row -->
 </div>
+<!-- EVENT ucp_pm_history_review_after -->
 
 <hr />
 <p><a href="#cp-main" class="top2">{L_BACK_TO_TOP}</a></p>
diff --git a/template/ucp_pm_message_header.html b/template/ucp_pm_message_header.html
index fcebab0..7be51e0 100644
--- a/template/ucp_pm_message_header.html
+++ b/template/ucp_pm_message_header.html
@@ -1,35 +1,61 @@
-<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
+<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->{L_COLON} {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
 
-<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
+<form id="viewfolder" method="post" action="{S_PM_ACTION}">
 
+<div class="panel">
+	<div class="inner">
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
 
+	<div class="action-bar top">
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
-			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
-			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM -->
+				<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button icon-button pmreply-icon">
+					{L_BUTTON_PM_REPLY}
+				</a>
+			<!-- ELSEIF U_POST_NEW_TOPIC -->
+				<a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button icon-button newpm-icon">
+					{L_BUTTON_PM_NEW}
+				</a>
+			<!-- ENDIF -->
+			<!-- IF U_FORWARD_PM -->
+				<a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button icon-button forwardpm-icon">
+					{L_BUTTON_PM_FORWARD}
+				</a>
+			<!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+				<a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button icon-button reply-all">
+					{L_BUTTON_PM_REPLY_ALL}
+				</a>
+			<!-- ENDIF -->
 		</div>
+	<!-- ENDIF -->
 
-		<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
-			<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">&raquo; {L_REPLY_TO_ALL}</a></div>
-		<!-- ENDIF -->
-
+	<!-- IF not S_IS_BOT and U_PRINT_PM -->
+		<div class="dropdown-container dropdown-button-control topic-tools">
+			<span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select button icon-button tools-icon"></span>
+			<div class="dropdown hidden">
+				<div class="pointer"><div class="pointer-inner"></div></div>
+				<ul class="dropdown-contents">
+					<!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF -->
+				</ul>
+			</div>
+		</div>
 	<!-- ENDIF -->
 
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-	<ul class="linklist pm-return-to">
-		<li class="rightside pagination">
-			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
-			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
+	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
+		<div class="pagination">
+			<!-- IF S_VIEW_MESSAGE -->
+				<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a>
+			<!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 -->
+				<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_PM_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
+				{TOTAL_MESSAGES}
+				<!-- IF .pagination -->
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE -->
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
 			<!-- ENDIF -->
-		</li>
-	</ul>
-		<!-- ENDIF -->
+		</div>
+	<!-- ENDIF -->
 	</div>
-</div>
-
-<form id="viewfolder" method="post" action="{S_PM_ACTION}">
diff --git a/template/ucp_pm_options.html b/template/ucp_pm_options.html
index a8693ac..247be8b 100644
--- a/template/ucp_pm_options.html
+++ b/template/ucp_pm_options.html
@@ -5,16 +5,16 @@
 <form id="ucp" method="post" action="{S_UCP_ACTION}">
 
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
 	<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
 	<!-- IF NOTIFICATION_MESSAGE --><p class="error">{NOTIFICATION_MESSAGE}</p><!-- ENDIF -->
-	
+
 	<h3>{L_DEFINED_RULES}</h3>
 
 	<ol class="def-rules">
 	<!-- BEGIN rule -->
-		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
+		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
 	<!-- BEGINELSE -->
 		<li><strong>{L_NO_RULES_DEFINED}</strong></li>
 	<!-- END rule -->
@@ -26,7 +26,7 @@
 
 	<!-- IF S_CHECK_DEFINED -->
 		<dl>
-			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}:</label></dt>
+			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}{L_COLON}</label></dt>
 			<dd>
 				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->
 			</dd>
@@ -81,26 +81,26 @@
 
 	<!-- IF not S_MAX_FOLDER_ZERO -->
 	<dl>
-		<dt><label for="foldername">{L_ADD_FOLDER}:</label></dt>
+		<dt><label for="foldername">{L_ADD_FOLDER}{L_COLON}</label></dt>
 		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->
 	<!-- ENDIF -->
 
-	
+
 
 	<!-- IF S_FOLDER_OPTIONS -->
 		<dl>
-			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}:</label></dt>
+			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}{L_COLON}</label></dt>
 			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd>
-			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}:</label></dt>
+			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}{L_COLON}</label></dt>
 			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>
 		</dl>
 		<hr class="dashed" />
 		<dl>
-			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}:</label></dt>
+			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}{L_COLON}</label></dt>
 			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd>
-			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}:</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
+			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
 			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>
 			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>
 		</dl>
@@ -109,23 +109,23 @@
 	<hr class="dashed" />
 
 	<dl>
-		<dt><label for="full_action1">{L_IF_FOLDER_FULL}:</label></dt>
+		<dt><label for="full_action1">{L_IF_FOLDER_FULL}{L_COLON}</label></dt>
 		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED} /> {L_DELETE_OLDEST_MESSAGES}</label></dd>
-		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}:</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>
+		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}{L_COLON}</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>
 		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED} /> {L_HOLD_NEW_MESSAGES}</label></dd>
 	</dl>
 
 
 	<dl>
-		<dt><label>{L_DEFAULT_ACTION}:</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
+		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
 		<dd>{DEFAULT_ACTION}</dd>
 		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>
 	</dl>
 	</fieldset>
 
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 	{S_FORM_TOKEN}
 </div>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_pm_popup.html b/template/ucp_pm_popup.html
deleted file mode 100644
index 325362d..0000000
--- a/template/ucp_pm_popup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-/**
-* Jump to inbox
-*/
-function jump_to_inbox(url)
-{
-	opener.document.location.href = url.replace(/&amp;/g, '&');
-	window.close();
-}
-// ]]>
-</script>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div class="content">
-		<p><!-- IF S_NOT_LOGGED_IN -->{L_LOGIN_CHECK_PM}<!-- ELSE -->{MESSAGE}<br /><br />{CLICK_TO_VIEW}<!-- ENDIF --></p>
-		<p class="small"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></p>
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
diff --git a/template/ucp_pm_viewfolder.html b/template/ucp_pm_viewfolder.html
index 7b309a7..47e4d1c 100644
--- a/template/ucp_pm_viewfolder.html
+++ b/template/ucp_pm_viewfolder.html
@@ -2,31 +2,30 @@
 
 <!-- IF not PROMPT -->
 	<!-- INCLUDE ucp_pm_message_header.html -->
-	<div class="panel pm-panel-message"><div>
 <!-- ENDIF -->
 
 <!-- IF PROMPT -->
 	<h2>{L_EXPORT_AS_CSV}</h2>
 	<form id="viewfolder" method="post" action="{S_PM_ACTION}">
 	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
+		<div class="inner">
 		<h3>{L_OPTIONS}</h3>
 		<fieldset>
 			<dl>
-				<dt><label for="delimiter">{L_DELIMITER}:</label></dt>
+				<dt><label for="delimiter">{L_DELIMITER}{L_COLON}</label></dt>
 				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value="," /></dd>
 			</dl>
 			<dl>
-				<dt><label for="enclosure">{L_ENCLOSURE}:</label></dt>
+				<dt><label for="enclosure">{L_ENCLOSURE}{L_COLON}</label></dt>
 				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value="&#034;" /></dd>
 			</dl>
 		</fieldset>
-		<span class="corners-bottom"><span></span></span></div>
+		</div>
 	</div>
 	<fieldset class="submit-buttons">
 		<input type="hidden" name="export_option" value="CSV" />
 		<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
-		<input class="button2" type="reset" value="Reset" name="reset" />&nbsp;
+		<input class="button2" type="reset" value="{L_RESET}" name="reset" />&nbsp;
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -46,20 +45,22 @@
 	<!-- ENDIF -->
 
 	<!-- IF .messagerow -->
-		<ul class="topiclist">
+		<ul class="topiclist two-columns">
 			<li class="header">
 				<dl>
-					<dt>{L_MESSAGE}</dt>
+					<dt><div class="list-inner">{L_MESSAGE}</div></dt>
 					<dd class="mark">{L_MARK}</dd>
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist pmlist">
+		<ul class="topiclist cplist pmlist responsive-show-all <!-- IF S_SHOW_RECIPIENTS -->missing-column<!-- ELSE -->two-columns<!-- ENDIF -->">
 
 		<!-- BEGIN messagerow -->
 			<li class="row<!-- IF messagerow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF messagerow.PM_CLASS --> {messagerow.PM_CLASS}<!-- ENDIF -->">
-				<dl class="icon" style="background-image: url({messagerow.FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+				<dl class="icon {messagerow.FOLDER_IMG_STYLE}">
 					<dt<!-- IF messagerow.PM_ICON_URL and S_PM_ICONS --> style="background-image: url({messagerow.PM_ICON_URL}); background-repeat: no-repeat;"<!-- ENDIF -->>
+						<!-- IF messagerow.S_PM_UNREAD and not messagerow.S_PM_DELETED --><a href="{messagerow.U_VIEW_PM}" class="icon-link"></a><!-- ENDIF -->
+						<div class="list-inner">
 
 						<!-- IF messagerow.S_PM_DELETED -->
 							<a href="{messagerow.U_REMOVE_PM}" class="topictitle">{L_DELETE_MESSAGE}</a><br />
@@ -71,10 +72,12 @@
 							<br /><em class="small">{L_PM_FROM_REMOVED_AUTHOR}</em>
 						<!-- ENDIF -->
 
-						<!-- IF messagerow.S_TOPIC_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />
+						<!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />
 						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} &raquo; {messagerow.SENT_TIME}<!-- ENDIF -->
+
+						</div>
 					</dt>
-					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}: {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->
+					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}{L_COLON} {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->
 					<!-- IF S_UNREAD --><dd class="info"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></dd><!-- ENDIF -->
 					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></dd>
 				</dl>
@@ -93,38 +96,39 @@
 	<!-- ENDIF -->
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-actions">
-		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
-		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
-	</fieldset>
-
-	<hr />
-
-	<ul class="linklist">
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-		<li class="rightside pagination">
-			<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-		<!-- ENDIF -->
-	</ul>
+		<fieldset class="display-actions">
+			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
+			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
+			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
+		</fieldset>
+	
+		<hr />
+	
+		<div class="action-bar bottom">
+			<div class="pagination">
+				{TOTAL_MESSAGES}
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
 	<!-- ENDIF -->
 
-		<span class="corners-bottom"><span></span></span></div>
+		</div>
 	</div>
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
 	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label>
+		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 	</fieldset>
 	<!-- ENDIF -->
 
 	<!-- INCLUDE ucp_pm_message_footer.html -->
 <!-- ENDIF -->
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_pm_viewmessage.html b/template/ucp_pm_viewmessage.html
index df0cf25..d92b90a 100644
--- a/template/ucp_pm_viewmessage.html
+++ b/template/ucp_pm_viewmessage.html
@@ -1,58 +1,138 @@
-	<!-- INCLUDE ucp_header.html -->
+<!-- INCLUDE ucp_header.html -->
 
 <!-- INCLUDE ucp_pm_message_header.html -->
 
+	</div>
+</div>
+
 
 <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
-	<fieldset class="display-options clearfix bg1 pm-message-nav">
-		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
-		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
+	<fieldset class="display-options clearfix">
+		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
+		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
 
-<div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
-<div>
+<div id="post-{MESSAGE_ID}" class="post pm has-profile<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
+<div class="inner">
+
+	<dl class="postprofile" id="profile{MESSAGE_ID}">
+		<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF AUTHOR_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
+			<div class="avatar-container">
+				<!-- EVENT ucp_pm_viewmessage_avatar_before -->
+				<!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF -->
+				<!-- EVENT ucp_pm_viewmessage_avatar_after -->
+			</div>
+			{MESSAGE_AUTHOR_FULL}
+		</dt>
+
+		<!-- EVENT ucp_pm_viewmessage_rank_before -->
+		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
+		<!-- EVENT ucp_pm_viewmessage_rank_after -->
+
+		<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF U_AUTHOR_POSTS != '' --><a href="{U_AUTHOR_POSTS}">{AUTHOR_POSTS}</a><!-- ELSE -->{AUTHOR_POSTS}<!-- ENDIF --></dd>
+		<!-- IF AUTHOR_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {AUTHOR_JOINED}</dd><!-- ENDIF -->
+
+		<!-- EVENT ucp_pm_viewmessage_custom_fields_before -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
+				<dd class="profile-custom-field profile-{custom_fields.PROFILE_FIELD_IDENT}"><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- ENDIF -->
+		<!-- END custom_fields -->
+		<!-- EVENT ucp_pm_viewmessage_custom_fields_after -->
+
+		<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
+		<!-- IF .contact -->
+			<dd class="profile-contact">
+				<strong>{L_CONTACT}{L_COLON}</strong>
+				<div class="dropdown-container dropdown-left">
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{CONTACT_USER}">{CONTACT_USER}</span></a>
+					<div class="dropdown hidden">
+						<div class="pointer"><div class="pointer-inner"></div></div>
+						<div class="dropdown-contents contact-icons">
+							<!-- BEGIN contact -->
+								{% set REMAINDER = contact.S_ROW_COUNT % 4 %}
+								<!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (contact.S_LAST_ROW and contact.S_NUM_ROWS < 4)) -->
+								<!-- IF REMAINDER eq 0 -->
+									<div>
+								<!-- ENDIF -->
+									<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+										<span class="contact-icon {contact.ID}-icon">{contact.NAME}</span>
+									</a>
+								<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
+									</div>
+								<!-- ENDIF -->
+							<!-- END contact -->
+						</div>
+					</div>
+				</div>
+			</dd>
+		<!-- ENDIF -->
+		<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
+	</dl>
 
 	<div class="postbody">
+		<h3 class="first">{SUBJECT}</h3>
 
-		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT -->
-		<ul class="profile-icons">
-			<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}"><span>{L_POST_EDIT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}"><span>{L_DELETE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_REPORT --><li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}"><span>{L_REPORT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_QUOTE --><li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}"><span>{L_POST_QUOTE_PM}</span></a></li><!-- ENDIF -->
+		<!-- DEFINE $SHOW_PM_POST_BUTTONS = (U_EDIT or U_DELETE or U_REPORT or U_QUOTE) -->
+		<!-- EVENT ucp_pm_viewmessage_post_buttons_list_before -->
+		<!-- IF $SHOW_PM_POST_BUTTONS -->
+		<ul class="post-buttons">
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
+			<!-- IF U_EDIT -->
+				<li>
+					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button edit-icon"><span>{L_POST_EDIT_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_DELETE -->
+				<li>
+					<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button delete-icon"><span>{L_DELETE_MESSAGE}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_REPORT -->
+				<li>
+					<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button report-icon"><span>{L_REPORT_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_QUOTE -->
+				<li>
+					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->
 		</ul>
 		<!-- ENDIF -->
-
-		<h3 class="first">{SUBJECT}</h3>
+		<!-- EVENT ucp_pm_viewmessage_post_buttons_list_after -->
 
 		<p class="author">
-			<strong>{L_SENT_AT}:</strong> {SENT_DATE}
-			<br /><strong>{L_PM_FROM}:</strong> {MESSAGE_AUTHOR_FULL}
-			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
-			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
+			<strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE}
+			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL}
+			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
+			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 		</p>
 
 
 		<div class="content">{MESSAGE}</div>
 
 		<!-- IF S_HAS_ATTACHMENTS -->
-		<dl class="attachbox">
-			<dt>{L_ATTACHMENTS}</dt>
-			<!-- BEGIN attachment -->
-			<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
-			<!-- END attachment -->
-		</dl>
+			<dl class="attachbox">
+				<dt>
+					{L_ATTACHMENTS}
+				</dt>
+				<!-- BEGIN attachment -->
+					<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
+				<!-- END attachment -->
+			</dl>
 		<!-- ENDIF -->
 
 		<!-- IF S_DISPLAY_NOTICE -->
-			<div class="rules">{L_DOWNLOAD_NOTICE}</div>
+			<div class="post-notice error">{L_DOWNLOAD_NOTICE}</div>
 		<!-- ENDIF -->
 
 		<!-- IF EDITED_MESSAGE or EDIT_REASON -->
 		<div class="notice">{EDITED_MESSAGE}
-			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->
+			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->
 		</div>
 		<!-- ENDIF -->
 
@@ -61,43 +141,18 @@
 		<!-- ENDIF -->
 	</div>
 
-	<dl class="postprofile" id="profile{MESSAGE_ID}">
-		<dt><!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}">{AUTHOR_AVATAR}</a><br /><!-- ENDIF -->{MESSAGE_AUTHOR_FULL}</dt>
-		<!-- IF RANK_TITLE --><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-		<!-- IF RANK_IMG --><dd>{RANK_IMG}</dd><!-- ENDIF -->
-		<dd>&nbsp;</dd>
-		<dd><strong>{L_POSTS}:</strong> {AUTHOR_POSTS}</dd>
-		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}:</strong> {AUTHOR_JOINED}</dd><!-- ENDIF -->
-		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}:</strong> {AUTHOR_FROM}</dd><!-- ENDIF -->
-		
-		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER -->
-		<dd>
-			<ul class="profile-icons">
-			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
-			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-			</ul>
-		</dd>
-		<!-- ENDIF -->
-	</dl>
-
 	<div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
 
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 
 <!-- IF S_VIEW_MESSAGE -->
 <fieldset class="display-options">
-	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
-	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
+	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
+	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
 
 	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
-	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
+	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
 	<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
 	<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 	<input type="hidden" name="p" value="{MSG_ID}" />
@@ -108,4 +163,4 @@
 
 <!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_pm_viewmessage_print.html b/template/ucp_pm_viewmessage_print.html
index 2f2778f..55d81b4 100644
--- a/template/ucp_pm_viewmessage_print.html
+++ b/template/ucp_pm_viewmessage_print.html
@@ -1,130 +1,48 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<title>{SITENAME} :: {PAGE_TITLE}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-body {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-}
-
-td {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-	line-height: 150%;
-}
-
-.code, .quote {
-	font-size: smaller;
-	border: black solid 1px;
-}
-
-.forum {
-	font-family: Arial,Helvetica,sans-serif;
-	font-weight: bold;
-	font-size: 18pt;
-}
-
-.topic {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-}
-
-.gensmall {
-	font-size: 8pt;
-}
-
-hr {
-	color: #888888;
-	height: 3px;
-	border-style: solid;
-}
-
-hr.sep	{
-	color: #AAAAAA;
-	height: 1px;
-	border-style: dashed;
-}
-/* ]]> */
-</style>
+<meta charset="utf-8" />
+<meta name="robots" content="noindex" />
+{META}
+<title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
+<link href="{T_THEME_PATH}/print.css" rel="stylesheet">
+<!-- EVENT ucp_pm_viewmessage_print_head_append -->
 </head>
-<body>
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td colspan="2" align="center"><span class="forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td>
-</tr>
-<tr>
-	<td colspan="2"><br /></td>
-</tr>
-<tr>
-	<td><span class="topic">{SUBJECT}</span><br /></td>
-	<td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
-</tr>
-</table>
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td width="10%" nowrap="nowrap">{L_PM_FROM}:&nbsp;</td>
-	<td><strong>{MESSAGE_AUTHOR}</strong> [ {SENT_DATE} ]</td>
-</tr>
-
-<!-- IF S_TO_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_TO}:</td>
-		<td>
-		<!-- BEGIN to_recipient -->
-			<!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp;
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_BCC}:</td>
-		<td>
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td colspan="2"><hr class="sep" />{MESSAGE}</td>
-</tr>
-</table>
-
-<hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
-</tr>
-<tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</span></td>
-</tr>
-</table>
+<body id="phpbb">
+<div id="wrap">
+	<a id="top" class="anchor" accesskey="t"></a>
+
+	<div id="page-header">
+		<h1>{SITENAME}</h1>
+		<p>{SITE_DESCRIPTION}</p>
+
+		<h2>{L_PRIVATE_MESSAGING}</h2>
+	</div>
+
+	<div id="page-body">
+		<div class="page-number">{PAGE_NUMBER}</div>
+			<div class="post">
+				<h3>{SUBJECT}</h3>
+				<div class="date">{L_SENT_AT} <strong>{SENT_DATE}</strong></div>
+				<div class="author">{L_PM_FROM} <strong>{MESSAGE_AUTHOR}</strong></div>
+				<!-- IF S_TO_RECIPIENT -->
+					<div class="author">{L_TO} <strong><!-- BEGIN to_recipient -->{to_recipient.NAME}&nbsp;<!-- END to_recipient --></strong></div>
+				<!-- ENDIF -->
+				<!-- IF S_BCC_RECIPIENT -->
+					<div class="author">{L_BCC} <strong><!-- BEGIN bcc_recipient -->{bcc_recipient.NAME}&nbsp;<!-- END bcc_recipient --></strong></div>
+				<!-- ENDIF -->
+				<hr />
+				<div class="content">{MESSAGE}</div>
+			</div>
+			<hr />
+	</div>
+
+	<div id="page-footer">
+		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
+	</div>
+</div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/ucp_prefs_personal.html b/template/ucp_prefs_personal.html
index db70ee2..c8b028f 100644
--- a/template/ucp_prefs_personal.html
+++ b/template/ucp_prefs_personal.html
@@ -9,97 +9,77 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- EVENT ucp_prefs_personal_prepend -->
 	<dl>
-		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt>
+		<dt><label for="viewemail0">{L_SHOW_EMAIL}{L_COLON}</label></dt>
 		<dd>
-			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt>
+		<dt><label for="massemail1">{L_ADMIN_EMAIL}{L_COLON}</label></dt>
 		<dd>
-			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dt><label for="allowpm1">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd>
-			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<!-- IF S_CAN_HIDE_ONLINE -->
 		<dl>
-			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
+			<dt><label for="hideonline0">{L_HIDE_ONLINE}{L_COLON}</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
 			<dd>
-				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->		
+	<!-- ENDIF -->
 	<!-- IF S_SELECT_NOTIFY -->
 		<dl>
-			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
+			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}{L_COLON}</label></dt>
 			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
 				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
 			</dd>
 		</dl>
 	<!-- ENDIF -->
-	<dl>
-		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
-		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_STYLE_OPTIONS -->
+	<!-- IF S_MORE_LANGUAGES -->
 		<dl>
-			<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
-			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>
+			<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
+			<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
+	<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
+		<dl>
+			<dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt>
+			<dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- INCLUDE timezone_option.html -->
 	<dl>
-		<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select name="tz" id="timezone" class="autowidth">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="dst1">{L_BOARD_DST}:</label></dt>
-		<dd>
-			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="dst0"><input type="radio" name="dst" id="dst0" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd>
-			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
+			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
 				{S_DATEFORMAT_OPTIONS}
 			</select>
 		</dd>
 		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd>
 	</dl>
+	<!-- EVENT ucp_prefs_personal_append -->
 	</fieldset>
 
 	</div>
 </div>
-	
+
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -113,9 +93,9 @@
 	function customDates()
 	{
 		var e = document.getElementById('dateoptions');
-	
+
 		e.selectedIndex = e.length - 1;
-	
+
 		// Loop and match date_format in menu
 		for (var i = 0; i < e.length; i++)
 		{
@@ -125,20 +105,20 @@
 				break;
 			}
 		}
-	
+
 		// Show/hide custom field
 		if (e.selectedIndex == e.length - 1)
 		{
-			dE('custom_date',1);
+			phpbb.toggleDisplay('custom_date',1);
 		}
 		else
 		{
-			dE('custom_date',-1);
+			phpbb.toggleDisplay('custom_date',-1);
 		}
 	}
 
-	customDates();
+	window.onload = customDates;
 // ]]>
 </script>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_prefs_post.html b/template/ucp_prefs_post.html
index 6b24fec..891e49a 100644
--- a/template/ucp_prefs_post.html
+++ b/template/ucp_prefs_post.html
@@ -8,34 +8,36 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- EVENT ucp_prefs_post_prepend -->
 	<dl>
-		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}:</label></dt>
+		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
 		<dd>
 			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="smilies1">{L_DEFAULT_SMILIES}:</label></dt>
+		<dt><label for="smilies1">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>
 		<dd>
 			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}:</label></dt>
+		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
 		<dd>
 			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="notify1">{L_DEFAULT_NOTIFY}:</label></dt>
+		<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
 		<dd>
 			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
+	<!-- EVENT ucp_prefs_post_append -->
 	</fieldset>
 	
 	</div>
@@ -48,4 +50,4 @@
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_prefs_view.html b/template/ucp_prefs_view.html
index 1cfe174..d7a8c31 100644
--- a/template/ucp_prefs_view.html
+++ b/template/ucp_prefs_view.html
@@ -9,36 +9,37 @@
 
 		<fieldset>
 		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		<!-- EVENT ucp_prefs_view_radio_buttons_prepend -->
 		<dl>
-			<dt><label for="images1">{L_VIEW_IMAGES}:</label></dt>
+			<dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt>
 			<dd>
-				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="flash0">{L_VIEW_FLASH}:</label></dt>
+			<dt><label for="flash0">{L_VIEW_FLASH}{L_COLON}</label></dt>
 			<dd>
-				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="smilies1">{L_VIEW_SMILIES}:</label></dt>
+			<dt><label for="smilies1">{L_VIEW_SMILIES}{L_COLON}</label></dt>
 			<dd>
-				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="sigs1">{L_VIEW_SIGS}:</label></dt>
+			<dt><label for="sigs1">{L_VIEW_SIGS}{L_COLON}</label></dt>
 			<dd>
-				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="avatars1">{L_VIEW_AVATARS}:</label></dt>
+			<dt><label for="avatars1">{L_VIEW_AVATARS}{L_COLON}</label></dt>
 			<dd>
 				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
@@ -46,39 +47,42 @@
 		</dl>
 		<!-- IF S_CHANGE_CENSORS -->
 			<dl>
-				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}:</label></dt>
+				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}{L_COLON}</label></dt>
 				<dd>
 					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 				</dd>
 			</dl>
 		<!-- ENDIF -->
+		<!-- EVENT ucp_prefs_view_radio_buttons_append -->
 		<hr />
+		<!-- EVENT ucp_prefs_view_select_menu_prepend -->
 		<dl>
-			<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
+			<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
 			<dd>{S_TOPIC_SORT_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
+			<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>
 			<dd>{S_TOPIC_SORT_KEY}</dd>
 		</dl>
 		<dl>
-			<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
+			<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>
 			<dd>{S_TOPIC_SORT_DIR}</dd>
 		</dl>
 		<hr />
 		<dl>
-			<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
+			<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>
 			<dd>{S_POST_SORT_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
+			<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>
 			<dd>{S_POST_SORT_KEY}</dd>
 		</dl>
 		<dl>
-			<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
+			<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>
 			<dd>{S_POST_SORT_DIR}</dd>
 		</dl>
+		<!-- EVENT ucp_prefs_view_select_menu_append -->
 		</fieldset>
 
 	</div>
@@ -91,4 +95,4 @@
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_profile_autologin_keys.html b/template/ucp_profile_autologin_keys.html
new file mode 100644
index 0000000..65909b7
--- /dev/null
+++ b/template/ucp_profile_autologin_keys.html
@@ -0,0 +1,45 @@
+<!-- INCLUDE ucp_header.html -->
+
+<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
+
+<h2>{L_TITLE}</h2>
+<div class="panel">
+	<div class="inner">
+		<p>{L_PROFILE_AUTOLOGIN_KEYS}</p>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		<table class="table1">
+			<thead>
+				<tr>
+					<th class="name">{L_LOGIN_KEY}</th>
+					<th class="center">{L_IP}</th>
+					<th class="center">{L_LOGIN_TIME}</th>
+					<th class="center mark">{L_MARK}</th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN sessions -->
+				<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
+					<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
+					<td class="center">{sessions.IP}</td>
+					<td class="center">{sessions.LOGIN_TIME}</td>
+					<td class="center mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
+				</tr>
+			<!-- BEGINELSE -->
+				<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
+			<!-- END sessions -->
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<!-- IF .sessions -->
+	<fieldset class="display-actions">
+		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" />
+		<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
+		{S_FORM_TOKEN}
+	</fieldset>
+<!-- ENDIF -->
+
+</form>
+
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_profile_avatar.html b/template/ucp_profile_avatar.html
index 2669ed3..8157d8c 100644
--- a/template/ucp_profile_avatar.html
+++ b/template/ucp_profile_avatar.html
@@ -6,14 +6,8 @@
 
 <!-- INCLUDE ucp_avatar_options.html -->
 
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
+{S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_profile_profile_info.html b/template/ucp_profile_profile_info.html
index b10dfc2..69eda8c 100644
--- a/template/ucp_profile_profile_info.html
+++ b/template/ucp_profile_profile_info.html
@@ -2,7 +2,7 @@
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
-<h2>{L_TITLE}</h2>
+<h2>{L_TITLE} <span class="small">[ <a href="{U_USER_PROFILE}" title="{L_VIEW_PROFILE}">{L_VIEW_PROFILE}</a> ]</span></h2>
 
 <div class="panel">
 	<div class="inner">
@@ -10,70 +10,42 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
-		<dd><input type="text" name="icq" id="icq" maxlength="15" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
-		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
-		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
-		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
-		<dd><input type="text" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
-		<dd><input type="text" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
-		<dd><input type="text" name="location" id="location" maxlength="255" value="{LOCATION}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
-		<dd><textarea name="occupation" id="occupation" class="inputbox" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
-		<dd><textarea name="interests" id="interests" class="inputbox" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
+	<!-- EVENT ucp_profile_profile_info_before -->
 	<!-- IF S_BIRTHDAYS_ENABLED -->
 		<dl>
-			<dt><label for="bday_day">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 			<dd>
-				<label for="bday_day">{L_DAY}: <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label> 
-				<label for="bday_month">{L_MONTH}: <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> 
-				<label for="bday_year">{L_YEAR}: <select name="bday_year" id="bday_year" style="width: 6em;">{S_BIRTHDAY_YEAR_OPTIONS}</select></label>
+				<label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label>
+				<label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label>
+				<label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></label>
 			</dd>
 		</dl>
 	<!-- ENDIF -->
+	<!-- IF S_JABBER_ENABLED -->
+		<dl>
+			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
+			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
+		</dl>
+	<!-- ENDIF -->
 	<!-- BEGIN profile_fields -->
 		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
 			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<!-- IF profile_fields.ERROR --><dd class="error">{profile_fields.ERROR}</dd><!-- ENDIF -->
 			<dd>{profile_fields.FIELD}</dd>
 		</dl>
 	<!-- END profile_fields -->
+	<!-- EVENT ucp_profile_profile_info_after -->
 	</fieldset>
 
 	</div>
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_profile_reg_details.html b/template/ucp_profile_reg_details.html
index f4f356a..f62d3cf 100644
--- a/template/ucp_profile_reg_details.html
+++ b/template/ucp_profile_reg_details.html
@@ -7,35 +7,31 @@
 	<div class="inner">
 
 	<!-- IF S_FORCE_PASSWORD -->
-		<p>{L_FORCE_PASSWORD_EXPLAIN}</p>
+		<p class="error">{L_FORCE_PASSWORD_EXPLAIN}</p>
 	<!-- ENDIF -->
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- EVENT ucp_profile_register_details_before -->
 	<dl>
-		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
+		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
 		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>
 	</dl>
 	<dl>
-		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-		<dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
+		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
+		<dd><!-- IF S_CHANGE_EMAIL --><input type="email" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" autocomplete="off" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
 	</dl>
-	<!-- IF S_CHANGE_EMAIL -->
-		<dl>
-			<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="email_confirm" id="email_confirm" maxlength="100" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd>
-		</dl>
-	<!-- ENDIF -->
 	<!-- IF S_CHANGE_PASSWORD -->
 		<dl>
-			<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" /></dd>
+			<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" autocomplete="off" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" /></dd>
+			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" autocomplete="off" /></dd>
 		</dl>
 	<!-- ENDIF -->
+	<!-- EVENT ucp_profile_register_details_after -->
 	</fieldset>
 	</div>
 </div>
@@ -45,8 +41,8 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span>{L_CURRENT_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>
+		<dt><label for="cur_password">{L_CURRENT_PASSWORD}{L_COLON}</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>
+		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" autocomplete="off" /></dd>
 	</dl>
 	</fieldset>
 
@@ -54,10 +50,10 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_profile_signature.html b/template/ucp_profile_signature.html
index 7e38c7e..614f6f4 100644
--- a/template/ucp_profile_signature.html
+++ b/template/ucp_profile_signature.html
@@ -4,12 +4,12 @@
 
 <h2>{L_TITLE}</h2>
 
-<!-- IF SIGNATURE_PREVIEW -->
+<!-- IF SIGNATURE_PREVIEW != '' -->
 	<div class="panel">
 		<div class="inner">
 		<h3>{L_SIGNATURE_PREVIEW}</h3>
-		<div class="postbody pm">
-			<div class="signature" style="border-top:none; margin-top: 0; ">{SIGNATURE_PREVIEW}</div>
+		<div class="postbody">
+			<div class="signature standalone">{SIGNATURE_PREVIEW}</div>
 		</div>
 		</div>
 	</div>
@@ -33,7 +33,7 @@
 		<!-- IF S_LINKS_ALLOWED -->
 			<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
 		<!-- ENDIF -->
-	
+
 	</fieldset>
 
 	</div>
@@ -41,11 +41,11 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<input type="reset" name="reset" value="{L_RESET}" class="button2" />&nbsp; 
-	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />&nbsp; 
+	<input type="reset" name="reset" value="{L_RESET}" class="button2" />&nbsp;
+	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_register.html b/template/ucp_register.html
index d814341..38413ad 100644
--- a/template/ucp_register.html
+++ b/template/ucp_register.html
@@ -7,67 +7,61 @@
 	*/
 	function change_language(lang_iso)
 	{
+		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-
-	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_REFRESH -->
-	onload_functions.push('apply_onkeypress_event()');
-	<!-- ENDIF -->
-
 // ]]>
 </script>
 
-<form method="post" action="{S_UCP_ACTION}" id="register">
+<form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
-	<h2>{SITENAME} -- {L_REGISTRATION}</h2>
+	<h2>{SITENAME} - {L_REGISTRATION}</h2>
 
 	<fieldset class="fields2">
 	<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->
 	<!-- IF L_REG_COND -->
 		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
 	<!-- ENDIF -->
+	<!-- EVENT ucp_register_credentials_before -->
 	<dl>
-		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
+		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
 		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
+		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
+		<dd><input type="email" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" autocomplete="off" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
-		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
+		<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" autocomplete="off" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
-		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
+		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label></dt>
+		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" autocomplete="off" /></dd>
 	</dl>
 
+	<!-- EVENT ucp_register_credentials_after -->
 	<hr />
 
+	<!-- EVENT ucp_register_options_before -->
 	<dl>
-		<dt><label for="lang">{L_LANGUAGE}:</label></dt>
+		<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>
 		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
 	</dl>
-	<dl>
-		<dt><label for="tz">{L_TIMEZONE}:</label></dt>
-		<dd><select name="tz" id="tz" tabindex="7" class="autowidth">{S_TZ_OPTIONS}</select></dd>
-	</dl>
 
+	<!-- INCLUDE timezone_option.html -->
+
+	<!-- EVENT ucp_register_profile_fields_before -->
 	<!-- IF .profile_fields -->
 		<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
 
 	<!-- BEGIN profile_fields -->
 		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
 			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
 			<!-- IF profile_fields.ERROR --><br /><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
@@ -75,8 +69,9 @@
 	<!-- END profile_fields -->
 	<!-- ENDIF -->
 
+	<!-- EVENT ucp_register_profile_fields_after -->
 	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- IF CAPTCHA_TEMPLATE -->
 	<!-- DEFINE $CAPTCHA_TAB_INDEX = 8 -->
@@ -84,20 +79,20 @@
 <!-- ENDIF -->
 
 <!-- IF S_COPPA -->
-
-
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
 	<h4>{L_COPPA_COMPLIANCE}</h4>
 
 	<p>{L_COPPA_EXPLAIN}</p>
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <!-- ENDIF -->
 
+<!-- EVENT ucp_register_buttons_before -->
+
 <div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
@@ -106,8 +101,8 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_remind.html b/template/ucp_remind.html
index 4bdbde3..0ab1251 100644
--- a/template/ucp_remind.html
+++ b/template/ucp_remind.html
@@ -10,12 +10,12 @@
 
 		<fieldset>
 		<dl>
-			<dt><label for="username">{L_USERNAME}:</label></dt>
+			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>
+			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
+			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
@@ -29,4 +29,4 @@
 </div>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_resend.html b/template/ucp_resend.html
index f55b197..7713efe 100644
--- a/template/ucp_resend.html
+++ b/template/ucp_resend.html
@@ -11,12 +11,12 @@
 
 		<fieldset>
 		<dl>
-			<dt><label for="username">{L_USERNAME}:</label></dt>
+			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>
+			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
+			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
@@ -29,4 +29,4 @@
 </div>
 </form>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/ucp_zebra_foes.html b/template/ucp_zebra_foes.html
index 3e0558d..2a0f6e0 100644
--- a/template/ucp_zebra_foes.html
+++ b/template/ucp_zebra_foes.html
@@ -12,7 +12,7 @@
 	<fieldset class="fields2">
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}:</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>
+		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}{L_COLON}</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>
 		<dd>
 			<!-- IF S_USERNAME_OPTIONS -->
 				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
@@ -22,7 +22,7 @@
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="add">{L_ADD_FOES}:</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>
+		<dt><label for="add">{L_ADD_FOES}{L_COLON}</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -32,10 +32,10 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/ucp_zebra_friends.html b/template/ucp_zebra_friends.html
index 9b9a1b3..e584d87 100644
--- a/template/ucp_zebra_friends.html
+++ b/template/ucp_zebra_friends.html
@@ -11,8 +11,9 @@
 
 	<fieldset class="fields2">
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<!-- EVENT ucp_friend_list_before -->
 	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}:</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>
+		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}{L_COLON}</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>
 		<dd>
 			<!-- IF S_USERNAME_OPTIONS -->
 				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
@@ -21,8 +22,9 @@
 			<!-- ENDIF -->
 		</dd>
 	</dl>
+	<!-- EVENT ucp_friend_list_after -->
 	<dl>
-		<dt><label for="add">{L_ADD_FRIENDS}:</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
+		<dt><label for="add">{L_ADD_FRIENDS}{L_COLON}</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -32,10 +34,10 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE ucp_footer.html -->
diff --git a/template/viewforum_body.html b/template/viewforum_body.html
index 903fda3..36c7084 100644
--- a/template/viewforum_body.html
+++ b/template/viewforum_body.html
@@ -1,20 +1,7 @@
 <!-- INCLUDE overall_header.html -->
-<div align="right"><!-- IF not S_IS_BOT -->
-<!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF -->
-<!-- ENDIF -->
-<!-- IF not S_IS_BOT and U_MARK_TOPICS --> &bull; <a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF --></div>
-<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
-
-<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
-<p>
-	<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
-	<!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
-	<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
-</p>
-<!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
-	<div class="rules">
+	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
 		<div class="inner">
 
 		<!-- IF U_FORUM_RULES -->
@@ -30,42 +17,50 @@
 
 <!-- IF S_HAS_SUBFORUM -->
 <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
-<ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li>
-</ul>
+	<div class="action-bar compact">
+		<a href="{U_MARK_FORUMS}" class="mark-read rightside" data-ajax="mark_forums_read">{L_MARK_SUBFORUMS_READ}</a>
+	</div>
 <!-- ENDIF -->
 	<!-- INCLUDE forumlist_body.html -->
 <!-- ENDIF -->
 
-<!-- IF S_DISPLAY_POST_INFO or PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
-	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
+<!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
+	<div class="action-bar bar-top">
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
+			<!-- EVENT viewforum_buttons_top_before -->
+
+			<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
+				<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
+			</a>
+
+			<!-- EVENT viewforum_buttons_top_after -->
 		</div>
 	<!-- ENDIF -->
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
-		<div class="search-box">
-			<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">	
+		<div class="search-box" role="search">
+			<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
-				<input class="button2" type="submit" value="{L_SEARCH}" />	
-				<input type="hidden" value="{FORUM_ID}" name="fid[]" />
+				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
+				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
+				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
+				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
-		<div class="pagination">
-			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER -->
-				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-			<!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
+	<div class="pagination">
+		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" class="mark" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+		{TOTAL_TOPICS}
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
 
 	</div>
 <!-- ENDIF -->
@@ -78,7 +73,7 @@
 		</div>
 	</div>
 
-	<!-- IF not S_USER_LOGGED_IN -->
+	<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
 
 		<form action="{S_LOGIN_ACTION}" method="post">
 
@@ -86,16 +81,16 @@
 			<div class="inner">
 
 			<div class="content">
-				<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a></h3>
-		
+				<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
+
 				<fieldset class="fields1">
 				<dl>
-					<dt><label for="username">{L_USERNAME}:</label></dt>
+					<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
 				</dl>
 				<dl>
-					<dt><label for="password">{L_PASSWORD}:</label></dt>
-					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>
+					<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
+					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" autocomplete="off" /></dd>
 					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
 					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
 				</dl>
@@ -103,18 +98,23 @@
 					<dt>&nbsp;</dt>
 					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
 				</dl>
+				{S_LOGIN_REDIRECT}
 				</fieldset>
 			</div>
 
 			</div>
 		</div>
 
+		</form>
+
 	<!-- ENDIF -->
 
 <!-- ENDIF -->
 
+<!-- EVENT viewforum_body_topic_row_before -->
+
 <!-- BEGIN topicrow -->
-	
+
 	<!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW -->
 		</ul>
 		</div>
@@ -122,12 +122,12 @@
 	<!-- ENDIF -->
 
 	<!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->
-		<div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH --> announcement<!-- ENDIF -->">
+		<div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) --> announcement<!-- ENDIF -->">
 		<div class="inner">
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon">
-					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and topicrow.S_TOPIC_TYPE gt 1 -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
+				<dl class="row-item">
+					<dt<!-- IF S_DISPLAY_ACTIVE --> id="active_topics"<!-- ENDIF -->><div class="list-inner"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -136,22 +136,68 @@
 		</ul>
 		<ul class="topiclist topics">
 	<!-- ENDIF -->
-	
-		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt style="<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;<!-- ENDIF -->" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
+
+		<!-- EVENT viewforum_body_topicrow_row_before -->
+		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
+			<!-- EVENT viewforum_body_topic_row_prepend -->
+			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
+					<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
+					<div class="list-inner">
+						<!-- EVENT topiclist_row_prepend -->
+						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
+						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+
+						<!-- IF not S_IS_BOT -->
+						<div class="responsive-show" style="display: none;">
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+						</div>
+						<!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF -->
+						<!-- ENDIF -->
+
+						<!-- IF .topicrow.pagination -->
+						<div class="pagination">
+							<ul>
+							<!-- BEGIN pagination -->
+								<!-- IF topicrow.pagination.S_IS_PREV -->
+								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li>
+								<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+								<!-- ELSE --><li><a class="button" href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
+								<!-- ENDIF -->
+							<!-- END pagination -->
+							</ul>
+						</div>
+						<!-- ENDIF -->
+
+						<div class="responsive-hide">
+							<!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+						</div>
+
+						<!-- EVENT topiclist_row_append -->
+					</div>
 				</dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
+				<dd class="lastpost">
+					<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
+						<!-- IF not S_IS_BOT -->
+							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}
+							</a>
+						<!-- ENDIF -->
+						<br />{topicrow.LAST_POST_TIME}
+					</span>
 				</dd>
 			</dl>
+			<!-- EVENT viewforum_body_topic_row_append -->
 		</li>
+		<!-- EVENT viewforum_body_topic_row_after -->
 
 	<!-- IF topicrow.S_LAST_ROW -->
 			</ul>
@@ -172,47 +218,57 @@
 <!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
 	<form method="post" action="{S_FORUM_ACTION}">
 		<fieldset class="display-options">
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> 
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
-			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+	<!-- IF not S_IS_BOT -->
+			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
+			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
+			<label>{S_SELECT_SORT_DIR}</label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+	<!-- ENDIF -->
 		</fieldset>
 	</form>
 	<hr />
 <!-- ENDIF -->
 
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
-	<div class="topic-actions">
+	<div class="action-bar bottom">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
-		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
-		</div>
+			<div class="buttons">
+				<!-- EVENT viewforum_buttons_bottom_before -->
+
+				<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
+					<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
+				</a>
+
+				<!-- EVENT viewforum_buttons_bottom_after -->
+			</div>
 		<!-- ENDIF -->
-	
-		<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
+
 		<div class="pagination">
-			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS}<!-- ENDIF -->
-			<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
-			<!-- IF PAGINATION --> &bull;  <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a>
-			 &bull;  <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+			{TOTAL_TOPICS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
 		</div>
-		<!-- ENDIF -->
 	</div>
 <!-- ENDIF -->
-<div align="center"><!-- IF not S_IS_BOT -->
-<!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF -->
-<!-- ENDIF -->
-<!-- IF not S_IS_BOT and U_MARK_TOPICS --> &bull; <a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF --></div>
+
 <!-- INCLUDE jumpbox.html -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
-	<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
-	<p>{LOGGED_IN_USER_LIST}</p>
+	<div class="stat-block online-list">
+		<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
+		<p>{LOGGED_IN_USER_LIST}</p>
+	</div>
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_POST_INFO -->
-	<h3>{L_FORUM_PERMISSIONS}</h3>
-	<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
+	<div class="stat-block permissions">
+		<h3>{L_FORUM_PERMISSIONS}</h3>
+		<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
+	</div>
 <!-- ENDIF -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/viewonline_body.html b/template/viewonline_body.html
index c29a513..dd0ca72 100644
--- a/template/viewonline_body.html
+++ b/template/viewonline_body.html
@@ -1,16 +1,22 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{TOTAL_REGISTERED_USERS_ONLINE}</h2>
+<h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>
 <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
 
-<ul class="linklist">
-	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
+<div class="action-bar bar-top">
+	<div class="pagination">
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			{PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+</div>
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner">
-	
-	<table class="table1" cellspacing="1">
+
+	<table class="table1">
 
 	<!-- IF .user_row -->
 		<thead>
@@ -23,7 +29,7 @@
 		<tbody>
 		<!-- BEGIN user_row -->
 		<tr class="<!-- IF user_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="margin-left: 30px;">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> &#187; <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF -->
+			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="float: {S_CONTENT_FLOW_END};">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> &#187; <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF -->
 				<!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td>
 			<td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td>
 			<td class="active">{user_row.LASTUPDATE}</td>
@@ -37,21 +43,21 @@
 	<!-- ENDIF -->
 	</tbody>
 	</table>
-	
+
 	</div>
 </div>
 
-<!-- IF PREVIOUS_PAGE or NEXT_PAGE -->
-<fieldset class="display-options right-box">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> &bull; <!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF -->
-</fieldset>
-<!-- ENDIF -->
+<!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->
 
-<!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF -->
-
-<ul class="linklist">
-	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
+<div class="action-bar bar-bottom">
+	<div class="pagination">
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			{PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+</div>
 
 <!-- INCLUDE jumpbox.html -->
 <!-- INCLUDE overall_footer.html -->
diff --git a/template/viewonline_whois.html b/template/viewonline_whois.html
index c5edabf..5d78049 100644
--- a/template/viewonline_whois.html
+++ b/template/viewonline_whois.html
@@ -4,13 +4,9 @@
 
 <div class="panel">
 	<div class="inner">
-
-	<div class="postbody"><div class="content">
-		<pre>{WHOIS}</pre>
-	</div></div>
-
+	   <pre>{WHOIS}</pre>
 	</div>
 </div>
 <a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
 
-<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
+<!-- INCLUDE simple_footer.html -->
diff --git a/template/viewtopic_body.html b/template/viewtopic_body.html
index 219092a..4a7ea37 100644
--- a/template/viewtopic_body.html
+++ b/template/viewtopic_body.html
@@ -1,25 +1,18 @@
 <!-- INCLUDE overall_header.html -->
-<div align="right"><!-- IF not S_IS_BOT -->
-<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- ENDIF -->
-<!-- IF U_BOOKMARK_TOPIC --> &bull; <a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- ENDIF -->
-<!-- IF U_BUMP_TOPIC --> &bull; <a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF -->
-<!-- ENDIF -->
-<!-- IF U_EMAIL_TOPIC --> &bull; <a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">Thema weiterempfehlen</a> &bull; <!-- ENDIF -->
-<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">Thema drucken</a><!-- ENDIF --></div>
-<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
-
 
-<!-- IF MODERATORS or U_MCP -->
-	<p>
-		<!-- IF MODERATORS -->
-			<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}
-		<!-- ENDIF -->
+<h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
+<!-- EVENT viewtopic_topic_title_after -->
+<!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
+<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
 
-	</p>
+<!-- IF MODERATORS -->
+<p>
+	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}
+</p>
 <!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
-	<div class="rules">
+	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
 		<div class="inner">
 
 		<!-- IF U_FORUM_RULES -->
@@ -33,78 +26,93 @@
 	</div>
 <!-- ENDIF -->
 
-<div class="topic-actions">
+<div class="action-bar top">
 
 	<div class="buttons">
+		<!-- EVENT viewtopic_buttons_top_before -->
+
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
+		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		</a>
 	<!-- ENDIF -->
+
+		<!-- EVENT viewtopic_buttons_top_after -->
 	</div>
 
+	<!-- INCLUDE viewtopic_topic_tools.html -->
+	<!-- EVENT viewtopic_dropdown_top_custom -->
+
 	<!-- IF S_DISPLAY_SEARCHBOX -->
-		<div class="search-box">
-			<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
+		<div class="search-box" role="search">
+			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="28" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
-				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{TOPIC_ID}" name="t" />
-				<input type="hidden" value="msgonly" name="sf" />
+				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
+				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
+				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
+				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF PAGINATION or TOTAL_POSTS -->
+	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
-			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
+			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				&bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
-
+	<!-- EVENT viewtopic_body_pagination_top_after -->
 </div>
-<div class="clear"></div>
+
+<!-- EVENT viewtopic_body_poll_before -->
 
 <!-- IF S_HAS_POLL -->
-	<form method="post" action="{S_POLL_ACTION}">
+	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
 
 	<div class="panel">
 		<div class="inner">
 
 		<div class="content">
-			<h2>{POLL_QUESTION}</h2>
-			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE -->{L_MAX_VOTES}<!-- ENDIF --></p>
+			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}<!-- EVENT viewtopic_body_poll_question_append --></h2>
+			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
 
 			<fieldset class="polls">
 			<!-- BEGIN poll_option -->
-				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF -->>
+				<!-- EVENT viewtopic_body_poll_option_before -->
+				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF --><!-- IF poll_option.POLL_OPTION_MOST_VOTES --> most-votes<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF --> data-alt-text="{L_POLL_VOTED_OPTION}" data-poll-option-id="{poll_option.POLL_OPTION_ID}">
 					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt>
-					<!-- IF S_CAN_VOTE --><dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF -->
-					<!-- IF S_DISPLAY_RESULTS --><dd class="resultbar"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT};">{poll_option.POLL_OPTION_RESULT}</div></dd>
-					<dd><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd><!-- ENDIF -->
+					<!-- IF S_CAN_VOTE --><dd style="width: auto;" class="poll_option_select"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF -->
+					<dd class="resultbar<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT_REL};">{poll_option.POLL_OPTION_RESULT}</div></dd>
+					<dd class="poll_option_percent<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd>
 				</dl>
+				<!-- EVENT viewtopic_body_poll_option_after -->
 			<!-- END poll_option -->
 
-			<!-- IF S_DISPLAY_RESULTS -->
-				<dl>
+				<dl class="poll_total_votes<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->">
 					<dt>&nbsp;</dt>
-					<dd class="resultbar">{L_TOTAL_VOTES} : {TOTAL_VOTES}</dd>
+					<dd class="resultbar">{L_TOTAL_VOTES}{L_COLON} <span class="poll_total_vote_cnt">{TOTAL_VOTES}</span></dd>
 				</dl>
-			<!-- ENDIF -->
 
 			<!-- IF S_CAN_VOTE -->
-				<dl style="border-top: none;">
+				<dl style="border-top: none;" class="poll_vote">
 					<dt>&nbsp;</dt>
 					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1" /></dd>
 				</dl>
 			<!-- ENDIF -->
 
 			<!-- IF not S_DISPLAY_RESULTS -->
-				<dl style="border-top: none;">
+				<dl style="border-top: none;" class="poll_view_results">
 					<dt>&nbsp;</dt>
 					<dd class="resultbar"><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></dd>
 				</dl>
 			<!-- ENDIF -->
 			</fieldset>
+			<div class="vote-submitted hidden">{L_VOTE_SUBMITTED}</div>
 		</div>
 
 		</div>
@@ -112,175 +120,297 @@
 		{S_HIDDEN_FIELDS}
 	</div>
 
-
 	</form>
 	<hr />
 <!-- ENDIF -->
 
+<!-- EVENT viewtopic_body_poll_after -->
+
 <!-- BEGIN postrow -->
-	<!-- IF postrow.S_FIRST_UNREAD --><a id="unread"></a><!-- ENDIF -->
-	<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_ONLINE --> online<!-- ENDIF -->">
+	<!-- EVENT viewtopic_body_postrow_post_before -->
+	<!-- IF postrow.S_FIRST_UNREAD -->
+		<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a>
+	<!-- ENDIF -->
+	<div id="p{postrow.POST_ID}" class="post has-profile <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->">
 		<div class="inner">
 
-		<div class="postbody">
-			<!-- IF postrow.S_IGNORE_POST -->
-				<div class="ignore">{postrow.L_IGNORE_POST}</div>
-			<!-- ELSE -->
+		<dl class="postprofile" id="profile{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>
+			<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF postrow.POSTER_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->">
+				<div class="avatar-container">
+					<!-- EVENT viewtopic_body_avatar_before -->
+					<!-- IF postrow.POSTER_AVATAR -->
+						<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="avatar">{postrow.POSTER_AVATAR}</a><!-- ELSE --><span class="avatar">{postrow.POSTER_AVATAR}</span><!-- ENDIF -->
+					<!-- ENDIF -->
+					<!-- EVENT viewtopic_body_avatar_after -->
+				</div>
+				<!-- EVENT viewtopic_body_post_author_before -->
+				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
+				<!-- EVENT viewtopic_body_post_author_after -->
+			</dt>
 
-		<!-- IF not S_IS_BOT -->
-			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE -->
-				<ul class="profile-icons">
-					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
-				</ul>
+			<!-- EVENT viewtopic_body_postrow_rank_before -->
+			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
+			<!-- EVENT viewtopic_body_postrow_rank_after -->
+
+		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF -->
+		<!-- IF postrow.POSTER_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF -->
+		<!-- IF postrow.POSTER_WARNINGS --><dd class="profile-warnings"><strong>{L_WARNINGS}{L_COLON}</strong> {postrow.POSTER_WARNINGS}</dd><!-- ENDIF -->
+
+		<!-- IF postrow.S_PROFILE_FIELD1 -->
+			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
+			<dd><strong>{postrow.PROFILE_FIELD1_NAME}{L_COLON}</strong> {postrow.PROFILE_FIELD1_VALUE}</dd>
+		<!-- ENDIF -->
+
+		<!-- EVENT viewtopic_body_postrow_custom_fields_before -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF not postrow.custom_fields.S_PROFILE_CONTACT -->
+				<dd class="profile-custom-field profile-{postrow.custom_fields.PROFILE_FIELD_IDENT}"><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
 			<!-- ENDIF -->
+		<!-- END custom_fields -->
+		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
+
+		<!-- EVENT viewtopic_body_contact_fields_before -->
+		<!-- IF not S_IS_BOT and .postrow.contact -->
+			<dd class="profile-contact">
+				<strong>{L_CONTACT}{L_COLON}</strong>
+				<div class="dropdown-container dropdown-left">
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{postrow.CONTACT_USER}">{postrow.CONTACT_USER}</span></a>
+					<div class="dropdown hidden">
+						<div class="pointer"><div class="pointer-inner"></div></div>
+						<div class="dropdown-contents contact-icons">
+							<!-- BEGIN contact -->
+								{% set REMAINDER = postrow.contact.S_ROW_COUNT % 4 %}
+								<!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (postrow.contact.S_LAST_ROW and postrow.contact.S_NUM_ROWS < 4)) -->
+								<!-- IF REMAINDER eq 0 -->
+									<div>
+								<!-- ENDIF -->
+									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+										<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span>
+									</a>
+								<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
+									</div>
+								<!-- ENDIF -->
+							<!-- END contact -->
+						</div>
+					</div>
+				</div>
+			</dd>
 		<!-- ENDIF -->
+		<!-- EVENT viewtopic_body_contact_fields_after -->
+
+		</dl>
+
+		<div class="postbody">
+			<!-- IF postrow.S_POST_HIDDEN -->
+				<!-- IF postrow.S_POST_DELETED -->
+					<div class="ignore" id="post_hidden{postrow.POST_ID}">
+						{postrow.L_POST_DELETED_MESSAGE}<br />
+						{postrow.L_POST_DISPLAY}
+					</div>
+				<!-- ELSEIF postrow.S_IGNORE_POST -->
+					<div class="ignore" id="post_hidden{postrow.POST_ID}">
+						{postrow.L_IGNORE_POST}<br />
+						{postrow.L_POST_DISPLAY}
+					</div>
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+			<div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>
 
 			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>
-			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {postrow.POST_DATE} </p>
 
-			<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
-				<p class="rules">
-					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><!-- ENDIF -->
-					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
+		<!-- DEFINE $SHOW_POST_BUTTONS = (postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE) -->
+		<!-- EVENT viewtopic_body_post_buttons_list_before -->
+		<!-- IF not S_IS_BOT -->
+			<!-- IF $SHOW_POST_BUTTONS -->
+				<ul class="post-buttons">
+					<!-- EVENT viewtopic_body_post_buttons_before -->
+					<!-- IF postrow.U_EDIT -->
+						<li>
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"><span>{L_BUTTON_EDIT}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_DELETE -->
+						<li>
+							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button delete-icon"><span>{L_DELETE_POST}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_REPORT -->
+						<li>
+							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button report-icon"><span>{L_REPORT_POST}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_WARN -->
+						<li>
+							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button warn-icon"><span>{L_WARN_USER}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_INFO -->
+						<li>
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{L_INFORMATION}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_QUOTE -->
+						<li>
+							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button quote-icon"><span>{L_QUOTE}</span></a> 
+						</li>
+					<!-- ENDIF -->
+					<!-- EVENT viewtopic_body_post_buttons_after -->
+				</ul>
+			<!-- ENDIF -->
+		<!-- ENDIF -->
+		<!-- EVENT viewtopic_body_post_buttons_list_after -->
+
+			<!-- EVENT viewtopic_body_postrow_post_details_before -->
+			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} </p>
+			<!-- EVENT viewtopic_body_postrow_post_details_after -->
+
+			<!-- IF postrow.S_POST_UNAPPROVED -->
+			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
+				<p class="post-notice unapproved">
+					<span><i class="icon fa-question icon-red fa-fw" aria-hidden="true"></i></span>
+					<strong>{L_POST_UNAPPROVED_ACTION}</strong>
+					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
+					<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
+					{S_FORM_TOKEN}
 				</p>
+			</form>
+			<!-- ELSEIF postrow.S_POST_DELETED -->
+			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
+				<p class="post-notice deleted">
+					<strong>{L_POST_DELETED_ACTION}</strong>
+					<!-- IF postrow.S_DELETE_PERMANENT -->
+						<input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" />
+					<!-- ENDIF -->
+					<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
+					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
+					{S_FORM_TOKEN}
+				</p>
+			</form>
+			<!-- ENDIF -->
+
+			<!-- IF postrow.S_POST_REPORTED -->
+			<p class="post-notice reported">
+				<a href="{postrow.U_MCP_REPORT}"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><strong>{L_POST_REPORTED}</strong></a>
+			</p>
 			<!-- ENDIF -->
 
 			<div class="content">{postrow.MESSAGE}</div>
 
 			<!-- IF postrow.S_HAS_ATTACHMENTS -->
 				<dl class="attachbox">
-					<dt>{L_ATTACHMENTS}</dt>
+					<dt>
+						{L_ATTACHMENTS}
+					</dt>
 					<!-- BEGIN attachment -->
 						<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
 					<!-- END attachment -->
 				</dl>
 			<!-- ENDIF -->
 
+			<!-- EVENT viewtopic_body_postrow_post_notices_before -->
 			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF -->
-			<!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->
-				<div class="notice">{postrow.EDITED_MESSAGE}
-					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->
+			<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON -->
+				<div class="notice post_deleted_msg">
+					{postrow.DELETED_MESSAGE}
+					<!-- IF postrow.DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF -->
+				</div>
+			<!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->
+				<div class="notice">
+					{postrow.EDITED_MESSAGE}
+					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->
 				</div>
 			<!-- ENDIF -->
 
 			<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
+			<!-- EVENT viewtopic_body_postrow_post_notices_after -->
 			<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF -->
-		<!-- ENDIF -->
-
-		</div>
-
-		<!-- IF not postrow.S_IGNORE_POST -->
-			<dl class="postprofile" id="profile{postrow.POST_ID}">
-			<dt>
-				<!-- IF postrow.POSTER_AVATAR -->
-					<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><!-- ELSE -->{postrow.POSTER_AVATAR}<!-- ENDIF --><br />
-				<!-- ENDIF -->
-				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
-			</dt>
-
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
-
-		<dd>&nbsp;</dd>
-
-		<!-- IF postrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF -->
-		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF -->
-		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF -->
-
-		<!-- IF postrow.S_PROFILE_FIELD1 -->
-			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<dd><strong>{postrow.PROFILE_FIELD1_NAME}:</strong> {postrow.PROFILE_FIELD1_VALUE}</dd>
-		<!-- ENDIF -->
-
-		<!-- BEGIN custom_fields -->
-			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}:</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
-		<!-- END custom_fields -->
 
-		<!-- IF not S_IS_BOT -->
-		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM -->
-			<dd>
-				<ul class="profile-icons">
-					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_EMAIL}"><span>{L_EMAIL}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}: {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-				</ul>
-			</dd>
-		<!-- ENDIF -->
-		<!-- ENDIF -->
+			<!-- EVENT viewtopic_body_postrow_post_content_footer -->
+			</div>
 
-		</dl>
-	<!-- ENDIF -->
+		</div>
 
-		<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
+		<div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
 
 		</div>
 	</div>
 
 	<hr class="divider" />
+	<!-- EVENT viewtopic_body_postrow_post_after -->
 <!-- END postrow -->
 
 <!-- IF S_QUICK_REPLY -->
 	<!-- INCLUDE quickreply_editor.html -->
 <!-- ENDIF -->
 
-<!-- IF S_NUM_POSTS > 1 or PREVIOUS_PAGE -->
+<!-- IF S_NUM_POSTS > 1 or .pagination -->
 	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
-
 	<fieldset class="display-options" style="margin-top: 0; ">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<!-- IF not S_IS_BOT -->
+		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
+		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
+		<!-- ENDIF -->
 	</fieldset>
-
 	</form>
 	<hr />
 <!-- ENDIF -->
 
-<div class="topic-actions">
+<!-- EVENT viewtopic_body_topic_actions_before -->
+<div class="action-bar bottom">
 	<div class="buttons">
+		<!-- EVENT viewtopic_buttons_bottom_before -->
+
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
+		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		</a>
 	<!-- ENDIF -->
+
+		<!-- EVENT viewtopic_buttons_bottom_after -->
 	</div>
 
-	<!-- IF PAGINATION or TOTAL_POSTS -->
+	<!-- INCLUDE viewtopic_topic_tools.html -->
+
+	<!-- IF .quickmod -->
+		<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
+			<span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span>
+			<div class="dropdown hidden">
+				<div class="pointer"><div class="pointer-inner"></div></div>
+				<ul class="dropdown-contents">
+				<!-- BEGIN quickmod -->
+					<!-- DEFINE $QUICKMOD_AJAX = (quickmod.VALUE in ['lock', 'unlock', 'delete_topic', 'restore_topic', 'make_normal', 'make_sticky', 'make_announce', 'make_global']) -->
+					<li><a href="{quickmod.LINK}"<!-- IF $QUICKMOD_AJAX --> data-ajax="true" data-refresh="true"<!-- ENDIF -->>{quickmod.TITLE}</a></li>
+				<!-- END quickmod -->
+				</ul>
+			</div>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- EVENT viewtopic_dropdown_bottom_custom -->
+
+	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
-{TOTAL_POSTS}
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
+			{TOTAL_POSTS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				&bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
+	<div class="clear"></div>
 </div>
-<div align="center"><!-- IF not S_IS_BOT -->
-<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- ENDIF -->
-<!-- IF U_BOOKMARK_TOPIC --> &bull; <a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- ENDIF -->
-<!-- IF U_BUMP_TOPIC --> &bull; <a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF -->
-<!-- ENDIF -->
-<!-- IF U_EMAIL_TOPIC --> &bull; <a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">Thema weiterempfehlen</a> &bull; <!-- ENDIF -->
-<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">Thema drucken</a><!-- ENDIF --></div>
-<!-- INCLUDE jumpbox.html -->
 
-<!-- IF S_TOPIC_MOD -->
-	<form method="post" action="{S_MOD_ACTION}">
-	<fieldset class="quickmod">
-		<label>{L_QUICK_MOD}:</label> {S_TOPIC_MOD} <input type="submit" value="{L_GO}" class="button2" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
+<!-- EVENT viewtopic_body_footer_before -->
+<!-- INCLUDE jumpbox.html -->
 
- 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
-	<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
-	<p>{LOGGED_IN_USER_LIST}</p>
+	<div class="stat-block online-list">
+		<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
+		<p>{LOGGED_IN_USER_LIST}</p>
+	</div>
 <!-- ENDIF -->
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/template/viewtopic_print.html b/template/viewtopic_print.html
index 669c58d..3c1ed4c 100644
--- a/template/viewtopic_print.html
+++ b/template/viewtopic_print.html
@@ -1,63 +1,45 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2002-2006 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-<meta name="robots" CONTENT="noindex" />
+<meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="robots" content="noindex" />
 {META}
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<link href="{T_THEME_PATH}/print.css" rel="stylesheet">
+<!-- EVENT viewtopic_print_head_append -->
 </head>
-
 <body id="phpbb">
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
+<div id="wrap" class="wrap">
+	<a id="top" class="top-anchor" accesskey="t"></a>
 
 	<div id="page-header">
 		<h1>{SITENAME}</h1>
 		<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
-		
+
 		<h2>{TOPIC_TITLE}</h2>
 		<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
 	</div>
 
-	<div id="page-body">
+	<div id="page-body" class="page-body">
 		<div class="page-number">{PAGE_NUMBER}</div>
 		<!-- BEGIN postrow -->
 			<div class="post">
 				<h3>{postrow.POST_SUBJECT}</h3>
-				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div>
-				<div class="author">{L_POST_BY_AUTHOR} <strong<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</strong></div>
+				<div class="date">{L_POSTED}{L_COLON} <strong>{postrow.POST_DATE}</strong></div>
+				<div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div>
 				<div class="content">{postrow.MESSAGE}</div>
 			</div>
 			<hr />
 		<!-- END postrow -->
 	</div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-	<div id="page-footer">
+	<div id="page-footer" class="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
 	</div>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/viewtopic_topic_tools.html b/template/viewtopic_topic_tools.html
new file mode 100644
index 0000000..8378e3b
--- /dev/null
+++ b/template/viewtopic_topic_tools.html
@@ -0,0 +1,25 @@
+<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) -->
+	<div class="dropdown-container dropdown-button-control topic-tools">
+		<span title="{L_TOPIC_TOOLS}" class="button icon-button tools-icon dropdown-trigger dropdown-select"></span>
+		<div class="dropdown hidden">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents">
+				<!-- EVENT viewtopic_topic_tools_before -->
+				<!-- IF U_WATCH_TOPIC -->
+					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
+						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">{S_WATCH_TOPIC_TITLE}</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF U_BOOKMARK_TOPIC -->
+					<li class="small-icon icon-bookmark">
+						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">{S_BOOKMARK_TOPIC}</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_EMAIL_TOPIC --><li class="small-icon icon-sendemail"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_PRINT_TOPIC --><li class="small-icon icon-print"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
+				<!-- EVENT viewtopic_topic_tools_after -->
+			</ul>
+		</div>
+	</div>
+<!-- ENDIF -->
diff --git a/theme/buttons.css b/theme/buttons.css
new file mode 100644
index 0000000..8a8c291
--- /dev/null
+++ b/theme/buttons.css
@@ -0,0 +1,255 @@
+/* Button Styles
+---------------------------------------- */
+
+.button {
+	cursor: pointer;
+	display: inline-block;
+	height: 18px;
+	font-size: 1.2em;
+	white-space: nowrap;
+	border: 1px solid transparent;
+	border-radius: 4px;
+	background: transparent none 0 0 repeat-x;
+	padding: 2px 8px;
+/*	font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; */
+	position: relative;
+	text-decoration: none !important;
+	outline-style: none !important;
+	vertical-align: bottom;
+}
+
+.dropdown-select {
+	padding-right: 24px;
+}
+
+.icon-button:before {
+	background: transparent 0 0 no-repeat;
+	content: '';
+	display: inline-block;
+	float: right;
+	height: 12px;
+	margin: 3px 0 0 2px;
+	width: 12px;
+}
+
+.dropdown-select.icon-button:before {
+	margin-right: 4px;
+}
+
+.dropdown-select:after {
+	background-position: -103px 10px;
+	border-left: 1px solid;
+	content: '';
+	position: absolute;
+	top: 0;
+	right: 0;
+	height: 22px;
+	width: 16px;
+}
+
+.dropdown-visible .dropdown-select:after, .nojs .dropdown-container:hover .dropdown-select:after {
+	background-position: -103px -10px;
+}
+
+.buttons, .buttons .button {
+	float: left;
+}
+
+.buttons .button, .dropdown-select {
+	margin-right: 5px;
+}
+
+#jumpbox .dropdown-select {
+	margin: 0;
+}
+
+/* Big button images */
+.reply-icon:before, .pmreply-icon:before					{ background-position: -20px 0; }
+.reply-icon:hover:before, .pmreply-icon:hover:before		{ background-position: -20px -20px; }
+
+.post-icon:before, .newpm-icon:before, .reply-all:before	{ background-position: 0 0; }
+.post-icon:hover:before,
+.newpm-icon:hover:before,
+.reply-all:hover:before										{ background-position: 0 -20px; }
+
+.locked-icon:before											{ background-position: -60px 0; }
+.locked-icon:hover:before									{ background-position: -60px -20px; }
+
+.forwardpm-icon:before										{ background-position: -40px 0; }
+.forwardpm-icon:hover:before								{ background-position: -40px -20px; }
+
+.modtools-icon {
+	font-size: 0;
+}
+
+.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before {
+	background-position: -80px 0;
+	height: 16px;
+	margin-top: 2px;
+	width: 16px;
+}
+
+.dropdown-visible .tools-icon:before,
+.nojs .dropdown-container:hover .tools-icon:before			{ background-position: -80px -20px; }
+
+.search-icon:before											{ background-position: -245px 0; }
+.search-icon:hover:before									{ background-position: -245px -20px; }
+
+.search-adv-icon:before										{ background-position: -265px 0; }
+.search-adv-icon:hover:before								{ background-position: -265px -20px; }
+
+.modtools-icon:before										{ background-position: -225px 0; }
+.dropdown-visible .modtools-icon:before,
+.nojs .dropdown-container:hover .modtools-icon:before		{ background-position: -225px -20px; }
+
+/* Icon images
+---------------------------------------- */
+.small-icon {
+	background-position: 0 50%;
+	background-repeat: no-repeat;
+	background-image: none;
+}
+
+.small-icon > a {
+	display: inline-block;
+	padding: 0 0 0 18px;
+}
+
+ul.linklist.bulletin > li.small-icon:before {
+	display: none;
+}
+
+.dropdown .small-icon > a {
+	display: block;
+}
+
+/* Poster contact icons
+----------------------------------------*/
+.contact-icons.dropdown-contents {
+	min-width: 0;
+	padding: 0;
+	font-size: 0;
+}
+
+.contact-icon {
+	background-repeat: no-repeat;
+	display: block;
+	height: 16px;
+	width: 16px;
+}
+.contact-icons a {
+	border-bottom: 1px dotted;
+	border-right: 1px dotted;
+	display: block;
+	float: left;
+	padding: 8px;
+}
+
+.contact-icons .last-cell {
+	border-right: none;
+}
+
+.contact-icons div:last-child a {
+	border-bottom: none;
+}
+
+.contact-icons div {
+	clear: left;
+}
+
+/* Profile icons */
+.pm-icon		{ background-position: 0 0; }
+.email-icon		{ background-position: -21px 0; }
+.jabber-icon	{ background-position: -80px 0; }
+.phpbb_icq-icon	{ background-position: -61px 0 ; }
+.phpbb_wlm-icon	{ background-position: -182px 0; }
+.phpbb_aol-icon	{ background-position: -244px 0; }
+.phpbb_website-icon		{ background-position: -40px 0; }
+.phpbb_youtube-icon		{ background-position: -98px 0; }
+.phpbb_facebook-icon	{ background-position: -119px 0; }
+.phpbb_googleplus-icon	{ background-position: -140px 0; }
+.phpbb_skype-icon		{ background-position: -161px 0; }
+.phpbb_twitter-icon		{ background-position: -203px 0; }
+.phpbb_yahoo-icon		{ background-position: -224px 0; }
+
+/* Post control buttons
+--------------------------------------------- */
+.post-buttons {
+	float: right;
+	list-style: none;
+	margin-top: 2px;
+}
+
+.has-profile .post-buttons {
+	float: none;
+	position: absolute;
+	margin: 0;
+	right: 0;
+	top: 5px;
+}
+
+.post-buttons > li {
+	float: left;
+	margin-right: 3px;
+}
+
+.post-buttons .icon-button {
+	padding: 0 5px;
+}
+
+.hastouch .post-buttons .icon-button {
+	padding: 2px 8px;
+}
+
+.post-buttons .icon-button span {
+	display: block;
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	width: 1px;
+}
+
+.post-buttons .icon-button:before {
+	margin-left: 0;
+}
+
+.quote-icon:before							{ /*background-position: -122px 0;*/ }
+.quote-icon:hover:before					{ /*background-position: -122px -21px;*/ }
+.edit-icon:before							{ background-position: -137px 0; }
+.edit-icon:hover:before						{ background-position: -137px -21px; }
+.warn-icon:before							{ background-position: -208px 0; }
+.warn-icon:hover:before						{ background-position: -208px -21px; }
+.delete-icon:before							{ background-position: -152px 0; }
+.delete-icon:hover:before					{ background-position: -152px -21px; }
+.report-icon:before							{ background-position: -165px 0; }
+.report-icon:hover:before					{ background-position: -165px -21px; }
+.info-icon:before							{ background-position: -175px 0; }
+.info-icon:hover:before						{ background-position: -175px -21px; }
+.button.responsive-menu-link:before			{ background-position: -191px 0; }
+.button.responsive-menu-link:hover:before	{ background-position: -191px -21px; }
+
+/* Responsive buttons in post body */
+.post-buttons .dropdown {
+	top: 18px;
+}
+
+.post-buttons .dropdown a {
+	display: block;
+	font-size: 1.2em;
+	text-align: right;
+}
+
+.hasjs .postbody .post-buttons {
+	max-width: 40%;
+}
+
+/* Browser-specific tweaks */
+button::-moz-focus-inner {
+	padding: 0;
+	border: 0
+}
+
+/*
+todo: 
+.quote-icon:after							{ padding: 40px;  margin-left: 45px; }
+*/
diff --git a/theme/colours.css b/theme/colours.css
new file mode 100644
index 0000000..513e289
--- /dev/null
+++ b/theme/colours.css
@@ -0,0 +1,1163 @@
+/*
+--------------------------------------------------------------
+Colours and backgrounds for common.css
+-------------------------------------------------------------- */
+
+html, body {
+	color: #848281;
+	background-color: #fbfbfb;
+}
+
+h1 {
+	color: #FFFFFF;
+}
+
+h2 {
+	color: #424140;
+}
+
+h3 {
+	border-bottom-color: #CCCCCC;
+	color: #6e6764;
+}
+
+hr {
+	border-color: #FFFFFF;
+	border-top-color: #CCCCCC;
+}
+
+/* Search box
+--------------------------------------------- */
+
+.search-box .inputbox,
+.search-box .inputbox:hover,
+.search-box .inputbox:focus,
+.search-box .button:hover {
+	border-color: #C7C3BF;
+}
+
+.search-header {
+	box-shadow: 0 0 10px #746867;
+}
+
+/* Round cornered boxes and backgrounds
+---------------------------------------- */
+#wrap {
+	background-color: #FFF;
+	border-color: #f3f3f3;
+}
+
+.headerbar {
+	background-color: #9e9493;
+/*	background-image: url("./images/bg_header.gif"); */
+	color: #FFFFFF;
+}
+
+.navbar {
+	background-color: #eae9e9;
+}
+
+.forabg {
+	background-color: #756867;
+/*	background-image: url("./images/bg_list.gif"); */
+}
+
+.forumbg {
+	background-color: #9e9493;
+	/*	background-image: url("./images/bg_header.gif"); */
+}
+
+.panel {
+	background-color: #f7f6f6;
+	color: #424140;
+}
+
+.post:target .content {
+	color: #000000;
+}
+
+.post:target h3 a {
+	color: #000000;
+}
+
+.bg1 {
+	background-color: #f8f8f8;
+}
+
+table.zebra-list tr:nth-child(odd) td, ul.zebra-list li:nth-child(odd) {
+	background-color: #f8f8f8;
+}
+
+.bg2 {
+	background-color: #f3f3f3;
+}
+
+table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) {
+	background-color: #f3f3f3;
+}
+
+.bg3	{
+	background-color: #eae9e9;
+}
+
+.ucprowbg {
+	background-color: #ececec;
+}
+
+.fieldsbg {
+	background-color: #f2f2f2;
+}
+
+/* Horizontal lists
+----------------------------------------*/
+
+ul.navlinks {
+	border-top-color: #FFFFFF;
+}
+
+/* Table styles
+----------------------------------------*/
+table.table1 thead th {
+	color: #FFFFFF;
+}
+
+table.table1 tbody tr {
+	border-color: #d2d2d7;
+}
+
+table.table1 tbody tr:hover, table.table1 tbody tr.hover {
+	background-color: #efeeee;
+	color: #000;
+}
+
+table.table1 td {
+	color: #848281;
+}
+
+table.table1 tbody td {
+	border-top-color: #FAFAFA;
+}
+
+table.table1 tbody th {
+	border-bottom-color: #000000;
+	color: #333333;
+	background-color: #FFFFFF;
+}
+
+table.info tbody th {
+	color: #000000;
+}
+
+/* Misc layout styles
+---------------------------------------- */
+dl.details dt {
+	color: #000000;
+}
+
+dl.details dd {
+	color: #848281;
+}
+
+.sep {
+	color: #948988;
+}
+
+/* Pagination
+---------------------------------------- */
+
+.pagination li a {
+	background-color: #f5f5f5;
+	border-color: #d1d1d0;
+	color: #8e8c8c;
+}
+
+.pagination li.ellipsis span {
+	background-color: transparent;
+	color:	#000000;
+}
+
+.pagination li.active span {
+	background-color: #9f9a9a;
+	border-color: #9f9a9a;
+	color: #FFFFFF;
+}
+
+.pagination li a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger {
+	background-color: #a29c9a;
+	border-color: #a29c9a;
+	color: #FFFFFF;
+}
+
+.pagination li.next a, .pagination li.previous a, .pagination li.page-jump a {
+	background-image: url("./images/icons_pagination.png");
+}
+
+/* Pagination in viewforum for multipage topics */
+.row .pagination {
+	background-image: url("./images/icon_pages.gif");
+}
+
+/* Miscellaneous styles
+---------------------------------------- */
+
+.copyright {
+	color: #555555;
+}
+
+.error {
+	color: #bc2a30;
+}
+
+.reported {
+	background-color: #f7eced;
+}
+
+li.reported:hover {
+	background-color: #ecd7d5 !important;
+}
+.sticky, .announce {
+	/* you can add a background for stickies and announcements*/
+}
+
+div.rules {
+	background-color: #ecd7d5;
+	color: #bc2a30;
+}
+
+p.post-notice {
+	background-color: #ecd7d5;
+	background-image: none;
+}
+
+p.post-notice.deleted:before {
+	background-image: url("./images/icon_topic_deleted.png");
+}
+
+p.post-notice.unapproved:before {
+	background-image: url("./images/icon_topic_unapproved.gif");
+}
+
+p.post-notice.reported:before, p.post-notice.error:before {
+	background-image: url("./images/icon_topic_reported.gif");
+}
+
+/*
+--------------------------------------------------------------
+Colours and backgrounds for links.css
+-------------------------------------------------------------- */
+
+a { color: #645d5b; }
+a:hover	{ color: #d3111a; }
+
+/* Links on gradient backgrounds */
+.forumbg .header a, .forabg .header a, th a {
+	color: #FFFFFF;
+}
+
+.forumbg .header a:hover, .forabg .header a:hover, th a:hover {
+	color: #e6e3e3;
+}
+
+/* Notification mark read link */
+.dropdown-extended a.mark_read {
+	background-color: #FFFFFF;
+}
+
+/* Post body links */
+.postlink {
+	border-bottom-color: #a29c9a;
+	color: #a29c9a;
+}
+
+.postlink:visited {
+	border-bottom-color: #aaa6a5;
+	color: #aaa6a5;
+}
+
+.postlink:hover {
+	background-color: #f0eeee;
+	color: #544e4d;
+}
+
+.signature a, .signature a:hover {
+	background-color: transparent;
+}
+
+/* Back to top of page */
+a.top {
+	background-image: url("./images/icon_back_top.gif");
+}
+
+a.top2 {
+	background-image: url("./images/icon_back_top.gif");
+}
+
+/* Arrow links  */
+a.arrow-up			{ background-image: url("./images/arrow_up.gif"); }
+a.arrow-down		{ background-image: url("./images/arrow_down.gif"); }
+a.arrow-left		{ background-image: url("./images/arrow_left.gif"); }
+a.arrow-right		{ background-image: url("./images/arrow_right.gif"); }
+
+a.arrow-up:hover {
+	background-color: transparent;
+}
+
+a.arrow-left:hover {
+	color: #a29c9a;
+}
+
+a.arrow-right:hover {
+	color: #a29c9a;
+}
+
+/*
+--------------------------------------------------------------
+Colours and backgrounds for content.css
+-------------------------------------------------------------- */
+
+ul.forums {
+	background-color: #f9f9f9;
+/*	background-image: url("./images/gradient.gif"); */
+}
+
+ul.topiclist li {
+	color: #7a7877;
+}
+
+ul.topiclist dd {
+	border-left-color: #FFFFFF;
+}
+
+.rtl ul.topiclist dd {
+	border-right-color: #fff;
+	border-left-color: transparent;
+}
+
+ul.topiclist li.row dt a.subforum.read {
+	background-image: url("./images/subforum_read.gif");
+}
+
+ul.topiclist li.row dt a.subforum.unread {
+	background-image: url("./images/subforum_unread.gif");
+}
+
+li.row {
+	border-top-color:  #FFFFFF;
+	border-bottom-color: #5f5554;
+}
+
+li.row strong {
+	color: #000000;
+}
+
+li.row:hover {
+	background-color: #e1dedd;
+}
+
+li.row:hover dd {
+	border-left-color: #CCCCCC;
+}
+
+.rtl li.row:hover dd {
+	border-right-color: #CCCCCC;
+	border-left-color: transparent;
+}
+
+li.header dt, li.header dd {
+	color: #FFFFFF;
+}
+
+/* Post body styles
+----------------------------------------*/
+.postbody {
+	color: #333333;
+}
+
+/* Content container styles
+----------------------------------------*/
+.content {
+	color: #333333;
+}
+
+.content h2, .panel h2 {
+	color: #6e6764;
+	border-bottom-color:  #CCCCCC;
+}
+
+dl.faq dt {
+	color: #333333;
+}
+
+.posthilit {
+	background-color: #f3bfc2;
+	color: #bc2a30;
+}
+
+.announce, .unreadpost {
+	/* Highlight the announcements & unread posts box */
+}
+
+/* Post signature */
+.signature {
+	border-top-color: #CCCCCC;
+}
+
+/* Post noticies */
+.notice {
+	border-top-color:  #CCCCCC;
+}
+
+/* BB Code styles
+----------------------------------------*/
+/* Quote block */
+blockquote {
+	background-color: #e1e0df;
+	background-image: url("./images/quote.gif");
+	border-color:#cfcece;
+}
+
+.rtl blockquote {
+	background-image: url("./images/quote_rtl.gif");
+}
+
+blockquote blockquote {
+	/* Nested quotes */
+	background-color:#e1e0df;
+}
+
+blockquote blockquote blockquote {
+	/* Nested quotes */
+	background-color: #e1e0df;
+}
+
+/* Code block */
+.codebox {
+	background-color: #FFFFFF;
+	border-color: #e2e2e2;
+}
+
+.codebox p {
+	border-bottom-color:  #CCCCCC;
+}
+
+.codebox code {
+	color: #2E8B57;
+}
+
+.syntaxbg		{ color: #FFFFFF; }
+.syntaxcomment	{ color: #FF8000; }
+.syntaxdefault	{ color: #32319b; }
+.syntaxhtml		{ color: #000000; }
+.syntaxkeyword	{ color: #007700; }
+.syntaxstring	{ color: #dd2300; }
+
+/* Attachments
+----------------------------------------*/
+.attachbox {
+	background-color: #FFFFFF;
+	border-color:  #e2e2e2;
+}
+
+.pm-message .attachbox {
+	background-color: #f6f6f6;
+}
+
+.attachbox dd {
+	border-top-color: #e2e2e2;
+}
+
+.attachbox p {
+	color: #666666;
+}
+
+.attachbox p.stats {
+	color: #666666;
+}
+
+.attach-image img {
+	border-color: #999999;
+}
+
+/* Inline image thumbnails */
+
+dl.file dd {
+	color: #666666;
+}
+
+dl.thumbnail img {
+	border-color: #666666;
+	background-color: #FFFFFF;
+}
+
+dl.thumbnail dd {
+	color: #666666;
+}
+
+dl.thumbnail dt a:hover {
+	background-color: #EEEEEE;
+}
+
+dl.thumbnail dt a:hover img {
+	border-color: #a29c9a;
+}
+
+/* Post poll styles
+----------------------------------------*/
+
+fieldset.polls dl {
+	border-top-color: #ececec;
+	color: #666666;
+}
+
+fieldset.polls dl.voted {
+	color: #000000;
+}
+
+fieldset.polls dd div {
+	color: #FFFFFF;
+}
+
+.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 {
+	border-right-color: transparent;
+}
+
+.pollbar1 {
+	background-color: #aa232b;
+	border-bottom-color: #741619;
+	border-right-color: #741619;
+}
+
+.rtl .pollbar1 {
+	border-left-color: #741619;
+}
+
+.pollbar2 {
+	background-color: #be1e2a;
+	border-bottom-color: #8c1c22;
+	border-right-color: #8c1c22;
+}
+
+.rtl .pollbar2 {
+	border-left-color: #8c1c22;
+}
+
+.pollbar3 {
+	background-color: #d11a29;
+	border-bottom-color: #aa232b;
+	border-right-color: #aa232b;
+}
+
+.rtl .pollbar3 {
+	border-left-color: #aa232b;
+}
+
+.pollbar4 {
+	background-color: #e4162a;
+	border-bottom-color: #be1e2a;
+	border-right-color: #be1e2a;
+}
+
+.rtl .pollbar4 {
+	border-left-color: #be1e2a;
+}
+
+.pollbar5 {
+	background-color: #f81129;
+	border-bottom-color: #d11a29;
+	border-right-color: #d11a29;
+}
+
+.rtl .pollbar5 {
+	border-left-color: #d11a29;
+}
+
+/* Poster profile block
+----------------------------------------*/
+.postprofile {
+	color: #666666;
+	border-color: #FFFFFF;
+}
+
+.pm .postprofile {
+	border-color: #DDDDDD;
+}
+
+.postprofile strong {
+	color: #000000;
+}
+
+.online {
+	background-image: url("./en/icon_user_online.gif");
+}
+
+dd.profile-warnings {
+	color: #bc2a30;
+}
+
+/*
+--------------------------------------------------------------
+Colours and backgrounds for buttons.css
+-------------------------------------------------------------- */
+.button {
+	border-color: #C7C3BF;
+	background-color: #FFFFFF;
+	background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: -webkit-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: -o-linear-gradient(top, #FFFFFF, #E9E9E9);
+	background-image: linear-gradient(to bottom, #FFFFFF, #E9E9E9);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#FFFFFF', EndColorStr='#E9E9E9')";
+	box-shadow: 0 0 0 1px #FFFFFF inset;
+	-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
+	color: #d3111a;
+}
+
+.dropdown-select {
+	color: #848281;
+}
+
+.button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select {
+	border-color: #8c807f;
+	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: -o-linear-gradient(top, #E9E9E9, #FFFFFF);
+	background-image: linear-gradient(to bottom, #E9E9E9, #FFFFFF);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#E9E9E9', EndColorStr='#FFFFFF')";
+	text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 48,  0.2);
+}
+
+.dropdown-select:after	{ border-color: #DADADA; }
+.dropdown-select:hover	{ border-color: #C7C3BF; }
+
+.dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select {
+	border-color: #c9c8c8;
+	color: #645d5b;
+}
+
+.contact-icons a		{ border-color: #DCDCDC; }
+.contact-icons a:hover	{ background-color: #fafafa; }
+
+/* Icon images
+---------------------------------------- */
+.icon-acp					{ background-image: url("./images/icon_acp.gif"); }
+.icon-bookmark				{ background-image: url("./images/icon_bookmark.gif"); }
+.icon-bump					{ background-image: url("./images/icon_bump.gif"); }
+.icon-contact				{ background-image: url("./images/icon_pm.gif"); }
+.icon-delete-cookies		{ background-image: url("./images/icon_delete_cookies.gif"); }
+.icon-download				{ background-image: url("./images/icon_download.gif"); }
+.icon-faq					{ background-image: url("./images/icon_faq.gif"); }
+.icon-home					{ background-image: url("./images/icon_home.gif"); }
+.icon-logout				{ background-image: url("./images/icon_logout.gif"); }
+.icon-mark					{ background-image: url("./images/icon_mark.gif"); }
+.icon-mcp					{ background-image: url("./images/icon_mcp.gif"); }
+.icon-members				{ background-image: url("./images/icon_members.gif"); }
+.icon-notification			{ background-image: url("./images/icon_notification.gif"); }
+.icon-pages					{ background-image: url("./images/icon_pages.gif"); }
+.icon-pm					{ background-image: url("./images/icon_pm.gif"); }
+.icon-print					{ background-image: url("./images/icon_print.gif"); }
+.icon-profile				{ background-image: url("./images/icon_profile.gif"); }
+.icon-register				{ background-image: url("./images/icon_register.gif"); }
+.icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
+.icon-search-active			{ background-image: url("./images/subforum_read.gif"); }
+.icon-search-new			{ background-image: url("./images/subforum_unread.gif"); }
+.icon-search-self			{ background-image: url("./images/icon_topic_latest.gif"); }
+.icon-search-unanswered		{ background-image: url("./images/icon_post_target.gif"); }
+.icon-search-unread			{ background-image: url("./images/subforum_unread.gif"); }
+.icon-sendemail				{ background-image: url("./images/icon_sendemail.gif"); }
+.icon-subscribe				{ background-image: url("./images/icon_subscribe.gif"); }
+.icon-team					{ background-image: url("./images/icon_team.gif"); }
+.icon-ucp					{ background-image: url("./images/icon_ucp.gif"); }
+.icon-unsubscribe			{ background-image: url("./images/icon_unsubscribe.gif"); }
+
+/* Profile & navigation icons */
+.contact-icon													{ background-image: url("./images/icons_contact.png"); }
+.icon-button:before, .dropdown-select:after						{ background-image: url("./images/icons_button.png"); }
+
+/* Forum icons & Topic icons */
+.global_read													{ background-image: url("./images/announce_read.gif"); }
+.global_read_mine												{ background-image: url("./images/announce_read_mine.gif"); }
+.global_read_locked												{ background-image: url("./images/announce_read_locked.gif"); }
+.global_read_locked_mine										{ background-image: url("./images/announce_read_locked_mine.gif"); }
+.global_unread													{ background-image: url("./images/announce_unread.gif"); }
+.global_unread_mine												{ background-image: url("./images/announce_unread_mine.gif"); }
+.global_unread_locked											{ background-image: url("./images/announce_unread_locked.gif"); }
+.global_unread_locked_mine										{ background-image: url("./images/announce_unread_locked_mine.gif"); }
+
+.announce_read													{ background-image: url("./images/announce_read.gif"); }
+.announce_read_mine												{ background-image: url("./images/announce_read_mine.gif"); }
+.announce_read_locked											{ background-image: url("./images/announce_read_locked.gif"); }
+.announce_read_locked_mine										{ background-image: url("./images/announce_read_locked_mine.gif"); }
+.announce_unread												{ background-image: url("./images/announce_unread.gif"); }
+.announce_unread_mine											{ background-image: url("./images/announce_unread_mine.gif"); }
+.announce_unread_locked											{ background-image: url("./images/announce_unread_locked.gif"); }
+.announce_unread_locked_mine									{ background-image: url("./images/announce_unread_locked_mine.gif"); }
+
+.forum_link														{ background-image: url("./images/forum_link.gif"); }
+.forum_read														{ background-image: url("./images/forum_read.gif"); }
+.forum_read_locked												{ background-image: url("./images/forum_read_locked.gif"); }
+.forum_read_subforum											{ background-image: url("./images/forum_read_subforum.gif"); }
+.forum_unread													{ background-image: url("./images/forum_unread.gif"); }
+.forum_unread_locked											{ background-image: url("./images/forum_unread_locked.gif"); }
+.forum_unread_subforum											{ background-image: url("./images/forum_unread_subforum.gif"); }
+
+.sticky_read													{ background-image: url("./images/sticky_read.gif"); }
+.sticky_read_mine												{ background-image: url("./images/sticky_read_mine.gif"); }
+.sticky_read_locked												{ background-image: url("./images/sticky_read_locked.gif"); }
+.sticky_read_locked_mine										{ background-image: url("./images/sticky_read_locked_mine.gif"); }
+.sticky_unread													{ background-image: url("./images/sticky_unread.gif"); }
+.sticky_unread_mine												{ background-image: url("./images/sticky_unread_mine.gif"); }
+.sticky_unread_locked											{ background-image: url("./images/sticky_unread_locked.gif"); }
+.sticky_unread_locked_mine										{ background-image: url("./images/sticky_unread_locked_mine.gif"); }
+
+.topic_moved													{ background-image: url("./images/topic_moved.gif"); }
+.topic_read														{ background-image: url("./images/topic_read.gif"); }
+.topic_read_mine												{ background-image: url("./images/topic_read_mine.gif"); }
+.topic_read_hot													{ background-image: url("./images/topic_read_hot.gif"); }
+.topic_read_hot_mine											{ background-image: url("./images/topic_read_hot_mine.gif"); }
+.topic_read_locked												{ background-image: url("./images/topic_read_locked.gif"); }
+.topic_read_locked_mine											{ background-image: url("./images/topic_read_locked_mine.gif"); }
+.topic_unread													{ background-image: url("./images/topic_unread.gif"); }
+.topic_unread_mine												{ background-image: url("./images/topic_unread_mine.gif"); }
+.topic_unread_hot												{ background-image: url("./images/topic_unread_hot.gif"); }
+.topic_unread_hot_mine											{ background-image: url("./images/topic_unread_hot_mine.gif"); }
+.topic_unread_locked											{ background-image: url("./images/topic_unread_locked.gif"); }
+.topic_unread_locked_mine										{ background-image: url("./images/topic_unread_locked_mine.gif"); }
+
+.pm_read														{ background-image: url("./images/topic_read.gif"); }
+.pm_unread														{ background-image: url("./images/topic_unread.gif"); }
+
+/*
+--------------------------------------------------------------
+Colours and backgrounds for cp.css
+-------------------------------------------------------------- */
+
+/* Main CP box
+----------------------------------------*/
+
+.panel-container h3, .panel-container hr, #cp-menu hr {
+	border-color: #cac9c9;
+}
+
+.panel-container .panel li.row {
+	border-bottom-color: #d6d5d5;
+	border-top-color: #F9F9F9;
+}
+
+ul.cplist {
+	border-top-color: #d6d5d5;
+}
+
+.panel-container .panel li.header dd, .panel-container .panel li.header dt {
+	color: #000000;
+}
+
+.panel-container table.table1 thead th {
+	color: #333333;
+	border-bottom-color: #333333;
+}
+
+#cp-main .pm-message {
+	border-color: #ececec;
+	background-color: #FFFFFF;
+}
+
+/* CP tabbed menu
+----------------------------------------*/
+#tabs .tab > a {
+	background: #dedddc;
+	color: #848281;
+}
+
+#tabs .tab > a:hover {
+	background: #f5f4f4;
+	color: #d3111a;
+}
+
+#tabs .activetab > a,
+#tabs .activetab > a:hover {
+	background: #eae9e9;
+	background: -moz-linear-gradient(top, #f8f7f7 0%, #eae9e9 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8f7f7), color-stop(100%, #eae9e9));
+	background: -webkit-linear-gradient(top, #f8f7f7 0%, #eae9e9 100%);
+	background: -o-linear-gradient(top, #f8f7f7 0%, #eae9e9 100%);
+	background: -ms-linear-gradient(top, #f8f7f7 0%, #eae9e9 100%);
+	background: linear-gradient(to bottom, #f8f7f7 0%, #eae9e9 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f7f7', endColorstr='#eae9e9', GradientType=0 );
+	border-color: #eae9e9;
+	box-shadow: 0 1px 1px #fcfbfb inset;
+	color: #333333;
+}
+
+#tabs .activetab > a:hover {
+	color: #000000;
+}
+
+/* Mini tabbed menu used in MCP
+----------------------------------------*/
+#minitabs .tab > a {
+	background-color: #f3f3f3;
+}
+
+#minitabs .activetab > a,
+#minitabs .activetab > a:hover {
+	background-color: #F9F9F9;
+	color: #333333;
+}
+
+/* Responsive tabs
+----------------------------------------*/
+.responsive-tab .responsive-tab-link:before {
+	border-color: #848281;
+}
+
+.responsive-tab .responsive-tab-link:hover:before {
+	border-color: #d3111a;
+}
+
+/* UCP navigation menu
+----------------------------------------*/
+
+/* Link styles for the sub-section links */
+#navigation a {
+	color: #333;
+	background: #d8d7d7;
+	background: -moz-linear-gradient(left, #d8d7d7 50%, #eae9e9 100%);
+	background: -webkit-gradient(left top, right top, color-stop(50%, #d8d7d7), color-stop(100%, #eae9e9));
+	background: -webkit-linear-gradient(left, #d8d7d7 50%, #eae9e9 100%);
+	background: -o-linear-gradient(left, #d8d7d7 50%, #eae9e9 100%);
+	background: -ms-linear-gradient(left, #d8d7d7 50%, #eae9e9 100%);
+	background: linear-gradient(to right, #d8d7d7 50%, #eae9e9 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d8d7d7', endColorstr='#eae9e9', GradientType=1 );
+}
+
+.rtl #navigation a {
+	background: #d8d7d7;
+	background: -moz-linear-gradient(left, #eae9e9 0%, #d8d7d7 50%);
+	background: -webkit-gradient(left top, right top, color-stop(0%, #eae9e9), color-stop(50%, #d8d7d7));
+	background: -webkit-linear-gradient(left, #eae9e9 0%, #d8d7d7 50%);
+	background: -o-linear-gradient(left, #eae9e9 0%, #d8d7d7 50%);
+	background: -ms-linear-gradient(left, #eae9e9 0%, #d8d7d7 50%);
+	background: linear-gradient(to right, #eae9e9 0%, #d8d7d7 50%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eae9e9', endColorstr='#d8d7d7', GradientType=1 );
+}
+
+#navigation a:hover {
+	background: #d0cfce;
+	color: #bc2a30;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+#navigation #active-subsection a {
+	background: #F9F9F9;
+	color: #d3111a;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+#navigation #active-subsection a:hover {
+	color: #d3111a;
+}
+
+@media only screen and (max-width: 900px), only screen and (max-device-width: 900px)
+{
+	#navigation a, .rtl #navigation a {
+		background: #d7d6d5;
+	}
+}
+
+/* Preferences pane layout
+----------------------------------------*/
+.panel-container h2 {
+	color: #333333;
+}
+
+.panel-container .panel {
+	background-color: #F9F9F9;
+}
+
+#cp-main .pm {
+	background-color: #FFFFFF;
+}
+
+/* Friends list */
+.cp-mini {
+	background-color: #f9f9f9;
+}
+
+dl.mini dt {
+	color: #6b6968;
+}
+
+/* PM Styles
+----------------------------------------*/
+/* PM Message history */
+.current {
+	color: #000000 !important;
+}
+
+/* PM marking colours */
+.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
+	border-left-color: #bc2a30;
+	border-right-color: #bc2a30;
+}
+
+.pmlist li.pm_marked_colour, .pm_marked_colour {
+	border-color: #FF6600;
+}
+
+.pmlist li.pm_replied_colour, .pm_replied_colour {
+	border-color: #cdcdcc;
+}
+
+.pmlist li.pm_friend_colour, .pm_friend_colour {
+	border-color: #aaa6a5;
+}
+
+.pmlist li.pm_foe_colour, .pm_foe_colour {
+	border-color: #000000;
+}
+
+/* Avatar gallery */
+#gallery label {
+	background: #FFFFFF;
+	border-color: #CCC;
+}
+
+#gallery label:hover {
+	background-color: #EEE;
+}
+
+/*
+--------------------------------------------------------------
+Colours and backgrounds for forms.css
+-------------------------------------------------------------- */
+
+/* General form styles
+----------------------------------------*/
+select {
+	border-color: #666666;
+	background-color: #FAFAFA;
+	color: #000;
+}
+
+label {
+	color: #6b6968;
+}
+
+option.disabled-option {
+	color: graytext;
+}
+
+/* Definition list layout for forms
+---------------------------------------- */
+dd label {
+	color: #333;
+}
+
+fieldset.fields1 {
+	background-color: transparent;
+}
+
+/* Hover effects */
+fieldset dl:hover dt label {
+	color: #000000;
+}
+
+fieldset.fields2 dl:hover dt label {
+	color: inherit;
+}
+
+/* Quick-login on index page */
+fieldset.quick-login input.inputbox {
+	background-color: #f6f6f6;
+}
+
+/* Posting page styles
+----------------------------------------*/
+
+#message-box textarea {
+	color: #333333;
+}
+
+#message-box textarea.drag-n-drop {
+	outline-color: rgba(102, 102, 102, 0.5);
+}
+
+#message-box textarea.drag-n-drop-highlight {
+	outline-color: rgba(157, 147, 146,  0.5);
+}
+
+/* Input field styles
+---------------------------------------- */
+.inputbox {
+	background-color: #FFFFFF;
+	border-color: #d1d1d0;
+	color: #333333;
+}
+
+.inputbox:-moz-placeholder {
+	color: #333333;
+}
+
+.inputbox::-webkit-input-placeholder {
+	color: #333333;
+}
+
+.inputbox:hover {
+	border-color: #9d9392;
+}
+
+.inputbox:focus {
+	border-color: #9d9392;
+	color: #625c59;
+}
+
+.inputbox:focus:-moz-placeholder {
+	color: transparent;
+}
+
+.inputbox:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+
+/* Form button styles
+---------------------------------------- */
+
+a.button1, input.button1, input.button3, a.button2, input.button2 {
+	color: #000;
+	background-color: #FAFAFA;
+	background-image: url("./images/bg_button.gif");
+}
+
+a.button1, input.button1 {
+	border-color: #666666;
+}
+
+input.button3 {
+	background-image: none;
+}
+
+/* Alternative button */
+a.button2, input.button2, input.button3 {
+	border-color: #666666;
+}
+
+/* <a> button in the style of the form buttons */
+a.button1, a.button2 {
+	color: #000000;
+}
+
+/* Hover states */
+a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
+	border-color: #bc2a30;
+	color: #bc2a30;
+}
+
+/* Focus states */
+input.button1:focus, input.button2:focus, input.button3:focus {
+	border-color: #9d9392;
+	color: #625c59;
+}
+
+input.search {
+	background-image: url("./images/icon_textbox_search.gif");
+}
+
+input.disabled {
+	color: #666666;
+}
+
+/* jQuery popups
+---------------------------------------- */
+.phpbb_alert {
+	background-color: #FFFFFF;
+	border-color: #999999;
+}
+.phpbb_alert .alert_close {
+	background-image: url("./images/alert_close.png");
+}
+#darken {
+	background-color: #000000;
+}
+
+#loading_indicator {
+	background-color: #000000;
+	background-image: url("./images/loading.gif");
+}
+
+.dropdown-extended ul li {
+	border-top-color: #B9B9B9;
+}
+
+.dropdown-extended ul li:hover {
+	background-color: #efeeee;
+	color: #000000;
+}
+
+.dropdown-extended .header, .dropdown-extended .footer {
+	border-color: #B9B9B9;
+	color: #000000;
+}
+
+.dropdown-extended .footer {
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.dropdown-extended .header {
+	background: #fcfbfb;
+	background: -moz-linear-gradient(top, #fcfbfb 0%, #eae9e9 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fcfbfb), color-stop(100%, #eae9e9));
+	background: -webkit-linear-gradient(top, #fcfbfb 0%, #eae9e9 100%);
+	background: -o-linear-gradient(top, #fcfbfb 0%, #eae9e9 100%);
+	background: -ms-linear-gradient(top, #fcfbfb 0%, #eae9e9 100%);
+	background: linear-gradient(to bottom, #fcfbfb 0%, #eae9e9 100%);
+}
+
+.dropdown .pointer {
+	border-color: #B9B9B9 transparent;
+}
+
+.dropdown .pointer-inner {
+	border-color: #FFF transparent;
+}
+
+.dropdown-extended .pointer-inner {
+	border-color: #fcfbfb transparent;
+}
+
+ul.linklist li.responsive-menu a.responsive-menu-link:before {
+	border-color: #645d5b;
+}
+
+ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist li.responsive-menu.visible a.responsive-menu-link:before {
+	border-color: #d3111a;
+}
+
+.dropdown .dropdown-contents {
+	background: #fff;
+	border-color: #b9b9b9;
+	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
+}
+
+.dropdown-up .dropdown-contents {
+	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
+}
+
+.dropdown li, .dropdown li li {
+	border-color: #DCDCDC;
+}
+
+.dropdown li.separator {
+	border-color: #DCDCDC;
+}
+
+/* Notifications
+---------------------------------------- */
+
+.notification_list p.notification-time {
+	color: #7a7877;
+}
+
+li.notification-reported strong, li.notification-disapproved strong {
+	color: #d3111a;
+}
diff --git a/theme/common.css b/theme/common.css
new file mode 100644
index 0000000..ca262cb
--- /dev/null
+++ b/theme/common.css
@@ -0,0 +1,1297 @@
+/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126
+---------------------------------------- */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 2000;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+abbr {
+	text-decoration: none;
+}
+
+/* General Markup Styles
+---------------------------------------- */
+html {
+	font-size: 100%;
+	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */
+	height: 101%;
+}
+
+body {
+	font-family: Arial,sans-serif,"Lucida Grande","Trebuchet MS",Helvetica,Verdana;
+	font-size: 12px;
+	line-height: normal;
+	margin: 0;
+	padding: 12px 0;
+	word-wrap: break-word;
+	-webkit-print-color-adjust: exact;
+}
+
+h1 {
+	/* Forum name */
+	margin-right: 200px;
+	margin-top: 15px;
+	font-weight: bold;
+	font-size: 2em;
+}
+
+h2 {
+	/* Forum header titles */
+	font-weight: normal;
+	font-size: 2em;
+	margin: 0.8em 0 0.2em 0;
+}
+
+h2.solo {
+	margin-bottom: 1em;
+}
+
+h3 {
+	/* Sub-headers (also used as post headers, but defined later) */
+/*	font-family: Arial, Helvetica, sans-serif; */
+	font-weight: bold;
+	text-transform: uppercase;
+	border-bottom: 1px solid transparent;
+	margin-bottom: 3px;
+	padding-bottom: 2px;
+	font-size: 1.05em;
+	margin-top: 20px;
+}
+
+h4 {
+	/* Forum and topic list titles */
+/*	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, Sans-serif; */
+	font-size: 1.3em;
+}
+
+p {
+	line-height: 1.3em;
+	font-size: 1.1em;
+	margin-bottom: 1.5em;
+}
+
+img {
+	border-width: 0;
+}
+
+hr {
+	border: 0 solid transparent;
+	border-top-width: 1px;
+	height: 1px;
+	margin: 5px 0;
+	display: block;
+	clear: both;
+}
+
+hr.dashed {
+	border-top-style: dashed;
+	margin: 10px 0;
+}
+
+hr.divider {
+	display: none;
+}
+
+p.right {
+	text-align: right;
+}
+
+p.jumpbox-return {
+	margin-top: 1em;
+}
+
+b, strong {
+	font-weight: bold;
+}
+
+i, em {
+	font-style: italic;
+}
+
+u {
+	text-decoration: underline;
+}
+
+ul {
+	list-style-type: disc;
+}
+
+ol {
+	list-style-type: decimal;
+}
+
+li {
+	display: list-item;
+}
+
+ul ul, ol ul {
+	list-style-type: circle;
+}
+
+ol ol ul, ol ul ul, ul ol ul, ul ul ul {
+	list-style-type: square;
+}
+
+
+/* Main blocks
+---------------------------------------- */
+#wrap {
+	border: 1px solid transparent;
+	border-radius: 8px;
+	margin: 0 auto;
+	max-width: 1152px;
+	min-width: 625px;
+	padding: 15px;
+}
+
+@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) {
+	#wrap {
+		margin: 0 12px;
+	}
+}
+
+#page-body {
+	margin: 4px 0;
+	clear: both;
+}
+
+#page-footer {
+	clear: both;
+}
+
+#page-footer h3 {
+	margin-top: 20px;
+}
+
+.logo {
+	float: left;
+	width: auto;
+	padding: 10px 13px 0 10px;
+}
+
+.logo:hover {
+	text-decoration: none;
+}
+
+/* Site description and logo */
+#site-description {
+	float: left;
+	width: 65%;
+}
+
+#site-description h1 {
+	margin-right: 0;
+}
+
+/* Round cornered boxes and backgrounds
+---------------------------------------- */
+.headerbar {
+	background: transparent none repeat-x 0 0;
+	margin-bottom: 4px;
+	padding: 5px;
+	border-radius: 7px;
+}
+
+.navbar {
+	padding: 3px 10px;
+	border-radius: 7px;
+}
+
+.forabg {
+	background: transparent none repeat-x 0 0;
+	margin-bottom: 4px;
+	padding: 5px;
+	clear: both;
+	border-radius: 7px;
+}
+
+.forumbg {
+	background: transparent none repeat-x 0 0;
+	margin-bottom: 4px;
+	padding: 5px;
+	clear: both;
+	border-radius: 7px;
+}
+
+.panel {
+	margin-bottom: 4px;
+	padding: 5px 10px;
+	border-radius: 7px;
+}
+
+.post {
+	padding: 5px 10px;
+	margin-bottom: 4px;
+	background-repeat: no-repeat;
+	background-position: 100% 0;
+	border-radius: 7px;
+	position: relative;
+}
+
+.rowbg {
+	margin: 5px 5px 2px 5px;
+}
+
+/* Horizontal lists
+----------------------------------------*/
+.navbar ul.linklist {
+	padding: 2px 0;
+}
+
+ul.linklist {
+	display: block;
+	margin: 0;
+}
+
+#cp-main .panel {
+	padding: 5px 10px;
+}
+
+ul.linklist > li {
+	float: left;
+	font-size: 1.1em;
+	line-height: 2.2em;
+	list-style-type: none;
+	margin-right: 7px;
+	padding-top: 1px;
+	width: auto;
+}
+
+ul.linklist > li.rightside, p.rightside, a.rightside {
+	float: right;
+	margin-right: 0;
+	margin-left: 7px;
+	text-align: right;
+}
+
+ul.navlinks {
+	border-top: 1px solid transparent;
+}
+
+ul.leftside {
+	float: left;
+	margin-left: 0;
+	margin-right: 5px;
+	text-align: left;
+}
+
+ul.rightside {
+	float: right;
+	margin-left: 5px;
+	margin-right: -5px;
+	text-align: right;
+}
+
+ul.linklist li.responsive-menu {
+	position: relative;
+	margin: 0 5px;
+}
+
+ul.linklist li.responsive-menu a.responsive-menu-link {
+	display: inline-block;
+	margin: 0 5px;
+	font-size: 1.455em;
+	position: relative;
+	width: 16px;
+	line-height: 1.2em;
+	text-decoration: none;
+}
+
+ul.linklist li.responsive-menu a.responsive-menu-link:before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 7px;
+	height: .125em;
+	width: 14px;
+	border-bottom: 0.125em solid transparent;
+	border-top: 0.375em double transparent;
+}
+
+.hasjs ul.linklist.leftside, .hasjs ul.linklist.rightside {
+	max-width: 48%;
+}
+
+.hasjs ul.linklist.fullwidth {
+	max-width: none;
+}
+
+li.responsive-menu.dropdown-right .dropdown {
+	left: -9px;
+}
+
+li.responsive-menu.dropdown-left .dropdown {
+	right: -6px;
+}
+
+ul.linklist .dropdown {
+	top: 22px;
+}
+
+ul.linklist .dropdown-up .dropdown {
+	bottom: 18px;
+	top: auto;
+}
+
+/* Bulletin icons for list items
+----------------------------------------*/
+ul.linklist.bulletin > li:before {
+	display: inline-block;
+	content: "\2022";
+	font-size: inherit;
+	line-height: inherit;
+	padding-right: 4px;
+}
+
+ul.linklist.bulletin > li:first-child:before,
+ul.linklist.bulletin > li.rightside:last-child:before {
+	content: none;
+}
+
+ul.linklist.bulletin > li.no-bulletin:before {
+	content: none;
+}
+
+.responsive-menu:before {
+	display: none !important;
+}
+
+/* Profile in overall_header.html */
+.header-profile {
+	display: inline-block;
+	vertical-align: top;
+}
+
+.header-avatar:hover {
+	text-decoration: none;
+}
+
+.header-avatar img {
+	margin-bottom: 2px;
+	max-height: 20px;
+	vertical-align: middle;
+	width: auto;
+}
+
+.header-avatar span:after {
+	content: '\25BC';
+	display: inline-block;
+	font-size: 9px;
+	float: right;
+	padding-left: 2px;
+	opacity: 0.7;
+}
+
+/* Dropdown menu
+----------------------------------------*/
+.dropdown-container {
+	position: relative;
+}
+
+.dropdown-container-right {
+	float: right;
+}
+
+.dropdown-container-left {
+	float: left;
+}
+
+.nojs .dropdown-container:hover .dropdown {
+	display: block !important;
+}
+
+.dropdown {
+	position: absolute;
+	left: 0;
+	top: 1.2em;
+	z-index: 2;
+	border: 1px solid transparent;
+	border-radius: 5px;
+	padding: 9px 0 0;
+	margin-right: -500px;
+}
+
+.dropdown.live-search {
+	top: auto;
+}
+
+.dropdown-container.topic-tools {
+	float: left;
+}
+
+.dropdown-up .dropdown {
+	top: auto;
+	bottom: 1.2em;
+	padding: 0 0 9px;
+}
+
+.dropdown-left .dropdown, .nojs .rightside .dropdown {
+	left: auto;
+	right: 0;
+	margin-left: -500px;
+	margin-right: 0;
+}
+
+.dropdown-button-control .dropdown {
+	top: 24px;
+}
+
+.dropdown-button-control.dropdown-up .dropdown {
+	top: auto;
+	bottom: 24px;
+}
+
+.dropdown .pointer, .dropdown .pointer-inner {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-top-width: 0;
+	border-bottom: 10px solid transparent;
+	border-left: 10px dashed transparent;
+	border-right: 10px dashed transparent;
+	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
+	display: block;
+}
+
+.dropdown-up .pointer, .dropdown-up .pointer-inner {
+	border-bottom-width: 0;
+	border-top: 10px solid transparent;
+}
+
+.dropdown .pointer {
+	right: auto;
+	left: 10px;
+	top: 0;
+	z-index: 3;
+}
+
+.dropdown-up .pointer {
+	bottom: 0;
+	top: auto;
+}
+
+.dropdown-left .dropdown .pointer, .nojs .rightside .dropdown .pointer {
+	left: auto;
+	right: 10px;
+}
+
+.dropdown .pointer-inner {
+	top: auto;
+	bottom: -11px;
+	left: -10px;
+}
+
+.dropdown-up .pointer-inner {
+	bottom: auto;
+	top: -11px;
+}
+
+.dropdown .dropdown-contents {
+	z-index: 2;
+	overflow: hidden;
+	overflow-y: auto;
+	border: 1px solid transparent;
+	border-radius: 5px;
+	padding: 5px;
+	position: relative;
+	min-width: 40px;
+	max-height: 300px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.dropdown li {
+	border-top: 1px dotted transparent;
+	float: none !important;
+	line-height: normal !important;
+	font-size: 1em !important;
+	list-style: none;
+	margin: 0;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	white-space: nowrap;
+	text-align: left;
+}
+
+.dropdown-contents > li {
+	padding-right: 15px;
+}
+
+.dropdown-nonscroll > li {
+	padding-right: 0;
+}
+
+.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
+	border-top: 0;
+}
+
+.dropdown li li:first-child {
+	margin-top: 4px;
+}
+
+.dropdown li li:last-child {
+	padding-bottom: 0;
+}
+
+.dropdown li li {
+	border-top: 1px dotted transparent;
+	padding-left: 18px;
+}
+
+.wrap .dropdown li, .dropdown.wrap li, .dropdown-extended li {
+	white-space: normal;
+}
+
+.dropdown li.separator {
+	border-top: 1px solid transparent;
+	margin: 4px 0;
+	padding: 0;
+}
+
+.dropdown li.separator:first-child, .dropdown li.separator:last-child {
+	display: none !important;
+}
+
+/* Responsive breadcrumbs
+----------------------------------------*/
+.breadcrumbs .crumb {
+	float: left;
+	font-weight: bold;
+	word-wrap: normal;
+}
+
+.breadcrumbs .crumb:before {
+	content: '\2039';
+	font-weight: bold;
+	padding: 0 0.5em;
+}
+
+.breadcrumbs .crumb:first-child:before {
+	content: none;
+}
+
+.breadcrumbs .crumb a {
+	display: inline-block;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	vertical-align: bottom;
+	overflow: hidden;
+}
+
+.breadcrumbs.wrapped .crumb a { letter-spacing: -.3px; }
+.breadcrumbs.wrapped .crumb.wrapped-medium a { letter-spacing: -.4px; }
+.breadcrumbs.wrapped .crumb.wrapped-tiny a { letter-spacing: -.5px; }
+
+.breadcrumbs .crumb.wrapped-max a { max-width: 120px; }
+.breadcrumbs .crumb.wrapped-wide a { max-width: 100px; }
+.breadcrumbs .crumb.wrapped-medium a { max-width: 80px; }
+.breadcrumbs .crumb.wrapped-small a { max-width: 60px; }
+.breadcrumbs .crumb.wrapped-tiny a { max-width: 40px; }
+
+/* Table styles
+----------------------------------------*/
+table.table1 {
+	width: 100%;
+}
+
+#ucp-main table.table1 {
+	padding: 2px;
+}
+
+table.table1 thead th {
+	font-weight: normal;
+	text-transform: uppercase;
+	line-height: 1.3em;
+	font-size: 1em;
+	padding: 0 0 4px 3px;
+}
+
+table.table1 thead th span {
+	padding-left: 7px;
+}
+
+table.table1 tbody tr {
+	border: 1px solid transparent;
+}
+
+table.table1 td {
+	font-size: 1.1em;
+}
+
+table.table1 tbody td {
+	padding: 5px;
+	border-top: 1px solid transparent;
+}
+
+table.table1 tbody th {
+	padding: 5px;
+	border-bottom: 1px solid transparent;
+	text-align: left;
+}
+
+/* Specific column styles */
+table.table1 .name		{ text-align: left; }
+table.table1 .center		{ text-align: center; }
+table.table1 .reportby	{ width: 15%; }
+table.table1 .posts		{ text-align: center; width: 7%; }
+table.table1 .joined	{ text-align: left; width: 15%; }
+table.table1 .active	{ text-align: left; width: 15%; }
+table.table1 .mark		{ text-align: center; width: 7%; }
+table.table1 .info		{ text-align: left; width: 30%; }
+table.table1 .info div	{ width: 100%; white-space: normal; overflow: hidden; }
+table.table1 .autocol	{ line-height: 2em; white-space: nowrap; }
+table.table1 thead .autocol { padding-left: 1em; }
+
+table.table1 span.rank-img {
+	float: right;
+	width: auto;
+}
+
+table.info td {
+	padding: 3px;
+}
+
+table.info tbody th {
+	padding: 3px;
+	text-align: right;
+	vertical-align: top;
+	font-weight: normal;
+}
+
+.forumbg table.table1 {
+	margin: 0;
+}
+
+.forumbg-table > .inner {
+	margin: 0 -1px;
+}
+
+#color_palette_placeholder table {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
+/* Misc layout styles
+---------------------------------------- */
+/* column[1-2] styles are containers for two column layouts */
+.column1 {
+	float: left;
+	clear: left;
+	width: 49%;
+}
+
+.column2 {
+	float: right;
+	clear: right;
+	width: 49%;
+}
+
+/* General classes for placing floating blocks */
+.left-box {
+	float: left;
+	width: auto;
+	text-align: left;
+	max-width: 100%;
+}
+
+.left-box.profile-details {
+	width: 80%;
+}
+
+.right-box {
+	float: right;
+	width: auto;
+	text-align: right;
+	max-width: 100%;
+}
+
+dl.details {
+	/*font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;*/
+	font-size: 1.1em;
+}
+
+dl.details dt {
+	float: left;
+	clear: left;
+	width: 30%;
+	text-align: right;
+	display: block;
+}
+
+dl.details dd {
+	margin-left: 0;
+	padding-left: 5px;
+	margin-bottom: 5px;
+	float: left;
+	width: 65%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.clearfix, fieldset dl, ul.topiclist dl, dl.polls {
+	overflow: hidden;
+}
+
+fieldset.fields1 ul.recipients {
+	list-style-type: none;
+	line-height: 1.8;
+	max-height: 150px;
+	overflow-y: auto;
+}
+
+fieldset.fields1 dd.recipients {
+	clear: left;
+	margin-left: 1em;
+}
+
+fieldset.fields1 ul.recipients  input.button2{
+	font-size: 0.8em;
+	margin-right: 0;
+	padding: 0;
+}
+
+fieldset.fields1 dl.pmlist > dt {
+	width: auto !important;
+}
+
+fieldset.fields1 dl.pmlist dd.recipients {
+	margin-left: 0 !important;
+}
+
+/* Action-bars (container for post/reply buttons, pagination, etc.)
+---------------------------------------- */
+.action-bar {
+	font-size: 1.1em;
+	margin: 4px 0;
+}
+
+.forabg + .action-bar {
+	margin-top: 2em;
+}
+
+/* Pagination
+---------------------------------------- */
+.pagination {
+	float: right;
+	margin-top: 3px;
+	text-align: right;
+	width: auto;
+}
+
+.action-bar.bottom .pagination {
+	margin-top: 0;
+}
+
+.pagination > ul {
+	display: inline-block;
+	list-style: none !important;
+	margin-left: 5px;
+}
+
+.pagination > ul > li {
+	display: inline-block !important;
+	padding: 0;
+	font-size: 100%;
+	line-height: normal;
+	vertical-align: middle;
+}
+
+.pagination li a, .pagination li span {
+	border: 1px solid transparent;
+	border-radius: 2px;
+	display: block;
+	font-size: 0.9em;
+	font-weight: normal;
+	line-height: 1.4em;
+	min-width: 10px;
+	padding: 3px;
+	text-align: center;
+	text-decoration: none;
+}
+
+.pagination li.ellipsis span {
+	border: none;
+	padding: 0;
+}
+
+.pagination li.page-jump {
+	margin-right: 5px;
+}
+
+.pagination li.page-jump a, .pagination li.next a, .pagination li.previous a {
+	background-repeat: no-repeat;
+	font-size: 0;
+	height: 13px;
+	width: 11px;
+}
+
+.pagination li.page-jump a {
+	background-position: 0 2px;
+	width: 24px;
+}
+
+.pagination li.next a {
+	background-position: -50px 2px;
+}
+
+.pagination li.previous a {
+	background-position: -30px 2px;
+}
+
+.pagination li.page-jump a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background-position: 0 -18px; }
+.pagination li.next a:hover { background-position: -50px -18px; }
+.pagination li.previous a:hover { background-position: -30px -18px; }
+
+/* Pagination in viewforum for multipage topics */
+.row .pagination {
+	display: block;
+	margin-top: 0;
+	padding: 1px 0 1px 15px;
+	font-size: 0.9em;
+	background: none 0 50% no-repeat;
+}
+
+.row .pagination > ul {
+	margin: 0;
+}
+
+.row .pagination li a, .row .pagination li span {
+	border-radius: 1px;
+	padding: 1px;
+}
+
+/* jQuery popups
+---------------------------------------- */
+.phpbb_alert {
+	border: 1px solid transparent;
+	display: none;
+	left: 0;
+	padding: 0 25px 20px 25px;
+	position: fixed;
+	right: 0;
+	top: 150px;
+	z-index: 50;
+	width: 620px;
+	margin: 0 auto;
+}
+
+@media only screen and (max-height: 500px), only screen and (max-device-width: 500px)
+{
+	.phpbb_alert {
+		top: 25px;
+	}
+}
+
+.phpbb_alert .alert_close {
+	display: block;
+	float: right;
+	width: 16px;
+	height: 16px;
+	overflow: hidden;
+	text-decoration: none !important;
+	background: transparent none 0 0 no-repeat;
+	margin-top: -7px;
+	margin-right: -31px;
+}
+.phpbb_alert .alert_close:hover {
+	background-position: 0 -16px;
+}
+
+.phpbb_alert p {
+	margin: 8px 0;
+	padding-bottom: 8px;
+}
+
+.phpbb_alert label {
+	display: block;
+	margin: 8px 0;
+	padding-bottom: 8px;
+}
+
+.phpbb_alert div.alert_text > p,
+.phpbb_alert div.alert_text > label,
+.phpbb_alert div.alert_text > select,
+.phpbb_alert div.alert_text > textarea,
+.phpbb_alert div.alert_text > input {
+	font-size: 1.1em;
+}
+
+#darkenwrapper {
+	display: none;
+	position: relative;
+	z-index: 44;
+}
+
+#darken {
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0.5;
+	z-index: 45;
+}
+
+#loading_indicator {
+	background: center center no-repeat;
+	border-radius: 5px;
+	display: none;
+	opacity: 0.8;
+	margin-top: -50px;
+	margin-left: -50px;
+	height: 50px;
+	width: 50px;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	z-index: 51;
+}
+
+/* Miscellaneous styles
+---------------------------------------- */
+#forum-permissions {
+	float: right;
+	width: auto;
+	padding-left: 5px;
+	margin-left: 5px;
+	margin-top: 10px;
+	text-align: right;
+}
+
+.copyright {
+	padding: 5px;
+	text-align: center;
+}
+
+.small {
+	font-size: 0.9em !important;
+}
+
+.titlespace {
+	margin-bottom: 15px;
+}
+
+.headerspace {
+	margin-top: 20px;
+}
+
+.error {
+	font-weight: bold;
+	font-size: 1em;
+}
+
+div.rules {
+	margin: 10px 0;
+	font-size: 1.1em;
+	padding: 5px 10px;
+	border-radius: 7px;
+}
+
+div.rules ul, div.rules ol {
+	margin-left: 20px;
+}
+
+p.post-notice {
+	position: relative;
+	padding: 5px;
+	padding-left: 26px;
+	min-height: 14px;
+	margin-bottom: 1em;
+}
+
+p.post-notice:before {
+	content: '';
+	display: block;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 28px;
+	background: transparent none 50% 50% no-repeat;
+	pointer-events: none;
+}
+
+form > p.post-notice strong {
+	line-height: 20px;
+}
+
+#jumpbox {
+	margin: 5px 0;
+}
+
+.stat-block {
+	clear: both;
+}
+
+#top {
+	position: absolute;
+	top: -20px;
+}
+
+.clear {
+	display: block;
+	clear: both;
+	font-size: 1px;
+	line-height: 1px;
+	background: transparent;
+}
+
+/* Inner box-model clearing */
+.inner:after,
+ul.linklist:after,
+.action-bar:after,
+.notification_text:after,
+.tabs-container:after,
+#tabs > ul:after,
+#minitabs > ul:after,
+.postprofile .avatar-container:after {
+	clear: both;
+	content: '';
+	display: block;
+}
+
+.hidden {
+	display: none;
+}
+
+.smilies {
+	vertical-align: text-bottom;
+}
+
+.icon-notification {
+	position: relative;
+}
+
+.member-search {
+	float: left;
+	margin: 0;
+	padding: 6px 10px;
+}
+
+.member-search strong {
+	font-size: 0.95em;
+}
+
+.dropdown-extended {
+	display: none;
+	z-index: 1;
+}
+
+.dropdown-extended ul {
+	max-height: 350px;
+	overflow-y: auto;
+	overflow-x: hidden;
+	clear: both;
+}
+
+.dropdown-extended ul li {
+	padding: 0;
+	margin: 0 !important;
+	float: none;
+	border-top: 1px solid;
+	list-style-type: none;
+	font-size: 0.95em;
+	clear: both;
+	position: relative;
+}
+
+.dropdown-extended ul li:first-child {
+	border-top: none;
+}
+
+.dropdown-extended ul li.no_notifications {
+	padding: 10px;
+}
+
+.dropdown-extended .dropdown-contents {
+	max-height: none;
+	padding: 0;
+	position: absolute;
+	width: 340px;
+}
+
+.nojs .dropdown-extended .dropdown-contents {
+	position: relative;
+}
+
+.dropdown-extended .header {
+	padding: 0 10px;
+	/* font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif; */
+	font-weight: bold;
+	text-align: left;
+	text-shadow: 1px 1px 1px white;
+	text-transform: uppercase;
+	line-height: 3em;
+	border-bottom: 1px solid;
+	border-radius: 5px 5px 0 0;
+}
+
+.dropdown-extended .header .header_settings {
+	float: right;
+	font-weight: normal;
+	text-transform: none;
+}
+
+.dropdown-extended .footer {
+	text-align: center;
+	font-size: 1.1em;
+}
+
+.dropdown-extended ul li a, .dropdown-extended ul li.no-url {
+	padding: 8px;
+}
+
+.dropdown-extended .footer > a {
+	padding: 5px 0;
+}
+
+.dropdown-extended ul li a, .notification_list dt > a, .dropdown-extended .footer > a {
+	display: block;
+	text-decoration: none;
+}
+
+.notification_list ul li img {
+	float: left;
+	max-height: 50px;
+	max-width: 50px;
+	width: auto !important;
+	height: auto !important;
+	margin-right: 5px;
+}
+
+.notification_list ul li p {
+	margin-bottom: 4px;
+	font-size: 1em;
+}
+
+.notification_list p.notification-reference,
+.notification_list p.notification-location,
+.notification_list li a p.notification-reason {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.notification_list p.notification-time {
+	font-size: 0.9em;
+	margin: 0;
+	text-align: right;
+}
+
+.notification_list div.notifications {
+	margin-left: 50px;
+	padding: 5px;
+}
+
+.notification_list div.notifications a {
+	display: block;
+}
+
+.notification_list p.notifications_title {
+	font-size: 1.2em !important;
+}
+
+.notification_list p.notifications_title strong {
+	font-weight: bold;
+}
+
+.notification_list p.notifications_time {
+	font-size: 0.9em !important;
+}
+
+.notification_text {
+	margin-left: 58px;
+}
+
+/* Navbar specific list items
+----------------------------------------*/
+
+#quick-links {
+	margin: 0 7px 0 0;
+}
+
+#quick-links a.responsive-menu-link {
+	display: block;
+	font-size: inherit;
+	line-height: inherit;
+	margin: 0;
+	width: auto;
+}
+
+#quick-links a.responsive-menu-link:before {
+	font-size: 1.455em;
+	line-height: 16.5px;
+}
+
+.compact #quick-links a.responsive-menu-link {
+	width: 0;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+.compact .icon-notification > a > span, .compact .icon-pm > a > span {
+	display: none;
+}
+
+.compact .icon-notification > a > strong, .compact .icon-pm > a > strong {
+	padding-left: 2px;
+}
+
+.dropdown-page-jump .dropdown {
+	top: 20px;
+}
+
+.dropdown-page-jump.dropdown-up .dropdown {
+	bottom: 20px;
+}
+
+.dropdown-page-jump input.tiny {
+	width: 50px;
+}
+
+.dropdown .clone.hidden + li.separator {
+	display: none;
+}
+
+.dropdown .clone.hidden + li {
+	border-top: none;
+}
diff --git a/theme/content.css b/theme/content.css
new file mode 100644
index 0000000..bd2ebd8
--- /dev/null
+++ b/theme/content.css
@@ -0,0 +1,831 @@
+/* Content Styles
+---------------------------------------- */
+
+ul.topiclist {
+	display: block;
+	list-style-type: none;
+	margin: 0;
+}
+
+ul.forums {
+	background: transparent none repeat-x 0 0;
+}
+
+ul.topiclist li {
+	display: block;
+	list-style-type: none;
+	margin: 0;
+}
+
+ul.topiclist dl {
+	position: relative;
+}
+
+ul.topiclist li.row dl {
+	padding: 2px 0;
+}
+
+ul.topiclist dt, ul.topiclist dd {
+	display: block;
+	float: left;
+}
+
+ul.topiclist dt {
+	width: 100%;
+	margin-right: -440px;
+	font-size: 1.1em;
+}
+
+ul.topiclist.missing-column dt {
+	margin-right: -345px;
+}
+
+ul.topiclist.two-long-columns dt {
+	margin-right: -250px;
+}
+
+ul.topiclist.two-columns dt {
+	margin-right: -80px;
+}
+
+ul.topiclist dt .list-inner {
+	margin-right: 440px;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+ul.topiclist.missing-column dt .list-inner {
+	margin-right: 345px;
+}
+
+ul.topiclist.two-long-columns dt .list-inner {
+	margin-right: 250px;
+}
+
+ul.topiclist.two-columns dt .list-inner {
+	margin-right: 80px;
+}
+
+ul.topiclist dd {
+	border-left: 1px solid transparent;
+	padding: 4px 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+ul.topiclist dfn {
+	/* Labels for post/view counts */
+	position: absolute;
+	left: -999px;
+	width: 990px;
+}
+
+ul.topiclist li.row dt a.subforum {
+	background-image: none;
+	background-position: 0 50%;
+	background-repeat: no-repeat;
+	position: relative;
+	white-space: nowrap;
+	padding: 0 0 0 12px;
+}
+
+.forum-image {
+	float: left;
+	padding-top: 5px;
+	margin-right: 5px;
+}
+
+li.row {
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
+}
+
+li.row strong {
+	font-weight: normal;
+}
+
+li.header dt, li.header dd {
+	line-height: 1em;
+	border-left-width: 0;
+	margin: 2px 0 4px 0;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	font-size: 1em;
+	text-transform: uppercase;
+}
+
+li.header dt {
+	font-weight: bold;
+	width: 100%;
+	margin-right: -440px;
+}
+
+li.header dt .list-inner {
+	margin-right: 440px;
+}
+
+li.header dd {
+	padding-left: 1px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+li.header dl.icon dt, li.header dl.icon dd {
+	min-height: 0;
+}
+
+li.header dl.icon dt .list-inner {
+	/* Tweak for headers alignment when folder icon used */
+	padding-left: 0;
+	padding-right: 50px;
+}
+
+/* Forum list column styles */
+dl.icon {
+	background-position: 10px 50%;		/* Position of folder icon */
+	background-repeat: no-repeat;
+}
+
+dl.icon dt {
+	background-repeat: no-repeat;
+	background-position: 5px 95%;		/* Position of topic icon */
+}
+
+dl.icon dt .list-inner {
+	padding-left: 45px;					/* Space for folder icon */
+}
+
+dl.icon dt, dl.icon dd {
+	min-height: 35px;
+}
+
+dl a.icon-link {						/* topic row icon links */
+	display: block;
+	width: 30px;
+	height: 30px;
+	padding: 0;
+	position: absolute;
+	top: 50%;
+	left: 0;
+	margin-top: -15px;
+	margin-left: 9px;
+}
+
+dd.posts, dd.topics, dd.views, dd.extra, dd.mark {
+	width: 80px;
+	text-align: center;
+	line-height: 2.2em;
+	font-size: 1.2em;
+}
+
+dd.posts, dd.topics, dd.views {
+	width: 95px;
+}
+
+/* List in forum description */
+dl.icon dt ol,
+dl.icon dt ul {
+	list-style-position: inside;
+	margin-left: 1em;
+}
+
+dl.icon dt li {
+	display: list-item;
+	list-style-type: inherit;
+}
+
+dd.lastpost, dd.redirect, dd.moderation, dd.time, dd.info {
+	width: 250px;
+	font-size: 1.1em;
+}
+
+dd.redirect {
+	line-height: 2.5em;
+}
+
+dd.time {
+	line-height: 200%;
+}
+
+dd.lastpost > span, ul.topiclist dd.info > span, ul.topiclist dd.time > span, dd.redirect > span, dd.moderation > span {
+	display: block;
+	padding-left: 5px;
+}
+
+dd.extra, dd.mark {
+	line-height: 200%;
+}
+
+dd.option {
+	width: 125px;
+	line-height: 200%;
+	text-align: center;
+	font-size: 1.1em;
+}
+
+/* Post body styles
+----------------------------------------*/
+.postbody {
+	padding: 0;
+	line-height: 1.48em;
+	width: 76%;
+	float: left;
+	position: relative;
+}
+
+.postbody .ignore {
+	font-size: 1.1em;
+}
+
+.postbody h3.first {
+	/* The first post on the page uses this */
+	font-size: 1.7em;
+}
+
+.postbody h3 {
+	/* Postbody requires a different h3 format - so change it here */
+	float: left;
+	font-size: 1.5em;
+	padding: 2px 0 0 0;
+	margin-top: 0 !important;
+	margin-bottom: 0.3em !important;
+	text-transform: none;
+	border: none;
+	line-height: 125%;
+}
+
+.postbody h3 img {
+	vertical-align: bottom;
+}
+
+.has-profile .postbody h3 {
+	/* If there is a post-profile, we position the post-buttons differently */
+	float: none !important;
+	margin-right: 180px;
+}
+
+.postbody .content {
+	font-size: 1.3em;
+	overflow-x: auto;
+}
+
+.postbody img.postimage {
+	max-width: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.search .postbody {
+	width: 68%
+}
+
+/* Topic review panel
+----------------------------------------*/
+#review {
+	margin-top: 2em;
+}
+
+#topicreview {
+	padding-right: 5px;
+	overflow: auto;
+	height: 300px;
+}
+
+#topicreview .postbody {
+	width: auto;
+	float: none;
+	margin: 0;
+	height: auto;
+}
+
+#topicreview .post {
+	height: auto;
+}
+
+#topicreview h2 {
+	border-bottom-width: 0;
+}
+
+.post-ignore .postbody {
+	display: none;
+}
+
+/* MCP Post details
+----------------------------------------*/
+#post_details {
+	/* This will only work in IE7+, plus the others */
+	overflow: auto;
+	max-height: 300px;
+}
+
+/* Content container styles
+----------------------------------------*/
+.content {
+	clear: both;
+	min-height: 3em;
+	overflow: hidden;
+	line-height: 1.4em;
+	font-size: 1em;
+	padding-bottom: 1px;
+}
+
+.content h2, .panel h2 {
+	font-weight: normal;
+	border-bottom: 1px solid transparent;
+	font-size: 1.6em;
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+.panel h3 {
+	margin: 0.5em 0;
+}
+
+.panel p {
+	font-size: 1.2em;
+	margin-bottom: 1em;
+	line-height: 1.4em;
+}
+
+.content p {
+	font-size: 1.2em;
+	margin-bottom: 1em;
+	line-height: 1.4em;
+}
+
+dl.faq {
+	font-size: 1.1em;
+	margin-top: 1em;
+	margin-bottom: 2em;
+	line-height: 1.4em;
+}
+
+dl.faq dt {
+	font-weight: bold;
+}
+
+.content dl.faq {
+	font-size: 1.2em;
+	margin-bottom: 0.5em;
+}
+
+.content li {
+	list-style-type: inherit;
+}
+
+.content ul, .content ol {
+	margin-bottom: 1em;
+	margin-left: 3em;
+}
+
+.posthilit {
+	padding: 0 2px 1px 2px;
+}
+
+/* Post author */
+p.author {
+	margin-bottom: 0.6em;
+	padding: 0 0 5px 0;
+	font-size: 1em;
+	line-height: 1.2em;
+	clear: both;
+}
+
+/* Post signature */
+.signature {
+	margin-top: 1.5em;
+	padding-top: 0.2em;
+	font-size: 1.1em;
+	border-top: 1px solid transparent;
+	clear: left;
+	line-height: 140%;
+	overflow: hidden;
+	width: 100%;
+}
+
+.signature.standalone {
+	border-top-width: 0;
+	margin-top: 0;
+}
+
+dd .signature {
+	margin: 0;
+	padding: 0;
+	clear: none;
+	border: none;
+}
+
+.signature li {
+	list-style-type: inherit;
+}
+
+.signature ul, .signature ol {
+	margin-bottom: 1em;
+	margin-left: 3em;
+}
+
+/* Post noticies */
+.notice {
+	width: auto;
+	margin-top: 1.5em;
+	padding-top: 0.2em;
+	font-size: 1em;
+	border-top: 1px dashed transparent;
+	clear: left;
+	line-height: 130%;
+}
+
+/* Jump to post link for now */
+ul.searchresults {
+	list-style: none;
+	text-align: right;
+	clear: both;
+}
+
+/* BB Code styles
+----------------------------------------*/
+/* Quote block */
+blockquote {
+	background: transparent none 6px 8px no-repeat;
+	border: 1px solid transparent;
+	font-size: 0.95em;
+	margin: 0.5em 1px 0 25px;
+	overflow: hidden;
+	padding: 5px;
+}
+
+blockquote blockquote {
+	/* Nested quotes */
+	font-size: 1em;
+	margin: 0.5em 1px 0 15px;
+}
+
+blockquote cite {
+	/* Username/source of quoter */
+	font-style: normal;
+	font-weight: bold;
+	margin-left: 20px;
+	display: block;
+	font-size: 0.9em;
+}
+
+blockquote cite cite {
+	font-size: 1em;
+}
+
+blockquote.uncited {
+	padding-top: 25px;
+}
+
+/* Code block */
+.codebox {
+	padding: 3px;
+	border: 1px solid transparent;
+	font-size: 1em;
+}
+
+.codebox p {
+	text-transform: uppercase;
+	border-bottom: 1px solid transparent;
+	margin-bottom: 3px;
+	font-size: 0.8em !important;
+	font-weight: bold;
+	display: block;
+}
+
+blockquote .codebox {
+	margin-left: 0;
+}
+
+.codebox code {
+	overflow: auto;
+	display: block;
+	height: auto;
+	max-height: 200px;
+	white-space: normal;
+	padding-top: 5px;
+	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
+	line-height: 1.3em;
+	margin: 2px 0;
+}
+
+/* Attachments
+----------------------------------------*/
+.attachbox {
+	float: left;
+	width: auto;
+	max-width: 100%;
+	margin: 5px 5px 5px 0;
+	padding: 6px;
+	border: 1px dashed transparent;
+	clear: left;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.attachbox dt {
+	text-transform: uppercase;
+}
+
+.attachbox dd {
+	margin-top: 4px;
+	padding-top: 4px;
+	clear: left;
+	border-top: 1px solid transparent;
+	overflow-x: auto;
+}
+
+.attachbox dd dd {
+	border: none;
+}
+
+.attachbox p {
+	line-height: 110%;
+	font-weight: normal;
+	clear: left;
+}
+
+.attachbox p.stats
+{
+	line-height: 110%;
+	font-weight: normal;
+	clear: left;
+}
+
+.attach-image {
+	margin: 3px 0;
+	max-width: 100%;
+}
+
+.attach-image img {
+	border: 1px solid transparent;
+/*	cursor: move; */
+	cursor: default;
+}
+
+/* Inline image thumbnails */
+div.inline-attachment dl.thumbnail, div.inline-attachment dl.file {
+	display: block;
+	margin-bottom: 4px;
+}
+
+div.inline-attachment p {
+	font-size: 100%;
+}
+
+dl.file {
+	display: block;
+}
+
+dl.file dt {
+	text-transform: none;
+	margin: 0;
+	padding: 0;
+	font-weight: bold;
+}
+
+dl.file dd {
+	margin: 0;
+	padding: 0;
+}
+
+dl.thumbnail img {
+	padding: 3px;
+	border: 1px solid transparent;
+	box-sizing: border-box;
+}
+
+dl.thumbnail dd {
+	font-style: italic;
+}
+
+.attachbox dl.thumbnail dd {
+	font-size: 100%;
+}
+
+dl.thumbnail dt a:hover img {
+	border: 1px solid transparent;
+}
+
+/* Post poll styles
+----------------------------------------*/
+fieldset.polls {
+}
+
+fieldset.polls dl {
+	margin-top: 5px;
+	border-top: 1px solid transparent;
+	padding: 5px 0 0 0;
+	line-height: 120%;
+}
+
+fieldset.polls dl.voted {
+	font-weight: bold;
+}
+
+fieldset.polls dt {
+	text-align: left;
+	float: left;
+	display: block;
+	width: 30%;
+	border-right: none;
+	padding: 0;
+	margin: 0;
+	font-size: 1.1em;
+}
+
+fieldset.polls dd {
+	float: left;
+	width: 10%;
+	border-left: none;
+	padding: 0 5px;
+	margin-left: 0;
+	font-size: 1.1em;
+}
+
+fieldset.polls dd.resultbar {
+	width: 50%;
+}
+
+fieldset.polls dd input {
+	margin: 2px 0;
+}
+
+fieldset.polls dd div {
+	text-align: right;
+	font-weight: bold;
+	padding: 0 2px;
+	overflow: visible;
+	min-width: 8px;
+}
+
+.pollbar1, .pollbar2, .pollbar3, .pollbar4, .pollbar5 {
+	border-bottom: 1px solid transparent;
+	border-right: 1px solid transparent;
+}
+
+.vote-submitted {
+	font-size: 1.2em;
+	font-weight: bold;
+	text-align: center;
+}
+
+/* Poster profile block
+----------------------------------------*/
+.postprofile {
+	margin: 5px 0 10px 0;
+	min-height: 80px;
+	border: 1px solid transparent;
+	border-width: 0 0 0 1px;
+	width: 22%;
+	float: right;
+	display: inline;
+}
+
+.postprofile dd, .postprofile dt {
+	line-height: 1.2em;
+	margin-left: 8px;
+}
+
+.postprofile dd {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.postprofile strong {
+	font-weight: normal;
+}
+
+.postprofile dt.no-profile-rank, .postprofile dd.profile-rank, .postprofile .search-result-date {
+	margin-bottom: 10px;
+}
+
+/* Post-profile avatars */
+.postprofile .has-avatar .avatar-container {
+	margin-bottom: 3px;
+	overflow: hidden;
+}
+
+.postprofile .avatar {
+	display: block;
+	float: left;
+	max-width: 100%;
+}
+
+.postprofile .avatar img {
+	display: block;
+	height: auto !important;
+	max-width: 100%;
+}
+
+.postprofile .profile-posts a {
+	font-weight: normal;
+}
+
+dd.profile-warnings {
+	font-weight: bold;
+}
+
+dd.profile-contact {
+	overflow: visible;
+}
+
+.profile-contact .dropdown-container {
+	display: inline-block;
+}
+
+.profile-contact .icon_contact {
+	vertical-align: middle;
+}
+
+.profile-contact .dropdown {
+	margin-right: -14px;
+}
+
+.online {
+	background-image: none;
+	background-position: 100% 0;
+	background-repeat: no-repeat;
+}
+
+/* Poster profile used by search*/
+.search .postprofile {
+	width: 30%;
+}
+
+/* Profile used on view-profile */
+.profile-avatar img {
+	max-width: 100%;
+}
+
+/* pm list in compose message if mass pm is enabled */
+dl.pmlist dt {
+	width: 60% !important;
+}
+
+dl.pmlist dt textarea {
+	width: 95%;
+}
+
+dl.pmlist dd {
+	margin-left: 61% !important;
+	margin-bottom: 2px;
+}
+
+.action-bar div.dl_links {
+	padding: 10px 0 0 10px;
+}
+
+div.dl_links {
+	display: inline-block;
+	text-transform: none;
+}
+
+.dl_links strong {
+	font-weight: bold;
+}
+
+.dl_links ul {
+	list-style-type: none;
+	margin: 0;
+	display: inline-block;
+}
+
+.dl_links li {
+	display: inline-block;
+}
+
+.attachment-filename {
+	width: 100%;
+}
+
+.ellipsis-text {
+	display: inline-block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+table.fixed-width-table {
+	table-layout: fixed;
+}
+
+/* Show scrollbars for items with overflow on iOS devices
+----------------------------------------*/
+.postbody .content::-webkit-scrollbar, #topicreview::-webkit-scrollbar, #post_details::-webkit-scrollbar, .codebox code::-webkit-scrollbar, .attachbox dd::-webkit-scrollbar, .attach-image::-webkit-scrollbar, .dropdown-extended ul::-webkit-scrollbar {
+	width: 8px;
+	height: 8px;
+	-webkit-appearance: none;
+	background: rgba(0, 0, 0, .1);
+	border-radius: 3px;
+}
+
+.postbody .content::-webkit-scrollbar-thumb, #topicreview::-webkit-scrollbar-thumb, #post_details::-webkit-scrollbar-thumb, .codebox code::-webkit-scrollbar-thumb, .attachbox dd::-webkit-scrollbar-thumb, .attach-image::-webkit-scrollbar-thumb, .dropdown-extended ul::-webkit-scrollbar-thumb {
+	background: rgba(0, 0, 0, .3);
+	border-radius: 3px;
+}
diff --git a/theme/cp.css b/theme/cp.css
new file mode 100644
index 0000000..8a223f6
--- /dev/null
+++ b/theme/cp.css
@@ -0,0 +1,376 @@
+/* Control Panel Styles
+---------------------------------------- */
+
+
+/* Main CP box
+----------------------------------------*/
+#cp-menu {
+	float:left;
+	width: 19%;
+	margin-top: 1em;
+	margin-bottom: 5px;
+}
+
+#cp-main {
+	float: left;
+	width: 81%;
+}
+
+#cp-main .content {
+	padding: 0;
+}
+
+.panel-container .panel p {
+	font-size: 1.1em;
+}
+
+.panel-container .panel ol {
+	margin-left: 2em;
+	font-size: 1.1em;
+}
+
+.panel-container .panel li.row {
+	border-bottom: 1px solid transparent;
+	border-top: 1px solid transparent;
+}
+
+ul.cplist {
+	margin-bottom: 5px;
+	border-top: 1px solid transparent;
+}
+
+.panel-container .panel li.header dd, .panel-container .panel li.header dt {
+	margin-bottom: 2px;
+}
+
+.panel-container table.table1 {
+	margin-bottom: 1em;
+}
+
+.panel-container table.table1 thead th {
+	font-weight: bold;
+	border-bottom: 1px solid transparent;
+	padding: 5px;
+}
+
+.panel-container table.table1 tbody th {
+	font-style: italic;
+	background-color: transparent !important;
+	border-bottom: none;
+}
+
+#cp-main .pm-message {
+	border: 1px solid transparent;
+	margin: 10px 0;
+	width: auto;
+	float: none;
+}
+
+.pm-message h2 {
+	padding-bottom: 5px;
+}
+
+#cp-main .postbody h3, #cp-main .box2 h3 {
+	margin-top: 0;
+}
+
+.panel-container .postbody p.author {
+	font-size: 1.1em;
+}
+
+#cp-main .buttons {
+	margin-left: 0;
+}
+
+#cp-main ul.linklist {
+	margin: 0;
+}
+
+/* MCP Specific tweaks */
+.mcp-main .postbody {
+	width: 100%;
+}
+
+.tabs-container h2 {
+	float: left;
+	margin-bottom: 0px;
+}
+
+/* CP tabs shared
+----------------------------------------*/
+#tabs, #minitabs {
+	line-height: normal;
+}
+
+#tabs > ul, #minitabs > ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	position: relative;
+}
+
+#tabs .tab, #minitabs .tab {
+	display: block;
+	float: left;
+	font-size: 1em;
+	font-weight: bold;
+	line-height: 1.4em;
+}
+
+#tabs .tab > a, #minitabs .tab > a {
+	display: block;
+	padding: 5px 9px;
+	position: relative;
+	text-decoration: none;
+	white-space: nowrap;
+	cursor: pointer;
+}
+
+/* CP tabbed menu
+----------------------------------------*/
+#tabs {
+	margin: 20px 0 0 7px;
+}
+
+#tabs .tab > a {
+	border: 1px solid transparent;
+	border-radius: 4px 4px 0 0;
+	margin: 1px 1px 0 0;
+}
+
+#tabs .activetab > a {
+	margin-top: 0;
+	padding-bottom: 7px;
+}
+
+/* Mini tabbed menu used in MCP
+----------------------------------------*/
+#minitabs {
+	float: right;
+	margin: 15px 7px 0 0;
+	max-width: 50%;
+}
+
+#minitabs .tab {
+	float: right;
+}
+
+#minitabs .tab > a {
+	border-radius: 5px 5px 0 0;
+	margin-left: 2px;
+}
+
+#minitabs .tab > a:hover {
+	text-decoration: none;
+}
+
+/* Responsive tabs
+----------------------------------------*/
+.responsive-tab {
+	position: relative;
+}
+
+.responsive-tab > a.responsive-tab-link {
+	display: block;
+	font-size: 1.6em;
+	position: relative;
+	width: 16px;
+	line-height: 0.9em;
+	text-decoration: none;
+}
+
+.responsive-tab .responsive-tab-link:before {
+	content: '';
+	position: absolute;
+	left: 10px;
+	top: 7px;
+	height: .125em;
+	width: 14px;
+	border-bottom: 0.125em solid transparent;
+	border-top: 0.375em double transparent;
+}
+
+#tabs .dropdown, #minitabs .dropdown {
+	top: 20px;
+	margin-right: -2px;
+	font-size: 1.1em;
+	font-weight: normal;
+}
+
+#minitabs .dropdown {
+	margin-right: -4px;
+}
+
+#tabs .dropdown-up .dropdown, #minitabs .dropdown-up .dropdown {
+	bottom: 20px;
+	top: auto;
+}
+
+#tabs .dropdown li {
+	text-align: right;
+}
+
+#minitabs .dropdown li {
+	text-align: left;
+}
+
+/* UCP navigation menu
+----------------------------------------*/
+/* Container for sub-navigation list */
+#navigation {
+	width: 100%;
+	padding-top: 36px;
+}
+
+#navigation ul {
+	list-style: none;
+}
+
+/* Default list state */
+#navigation li {
+	display: inline;
+	font-weight: bold;
+	margin: 1px 0;
+	padding: 0;
+}
+
+/* Link styles for the sub-section links */
+#navigation a {
+	display: block;
+	padding: 5px;
+	margin: 1px 0;
+	text-decoration: none;
+}
+
+#navigation a:hover {
+	text-decoration: none;
+}
+
+/* Preferences pane layout
+----------------------------------------*/
+#cp-main h2 {
+	border-bottom: none;
+	padding: 0;
+	margin-left: 10px;
+}
+
+/* Friends list */
+.cp-mini {
+	margin: 10px 15px 10px 5px;
+	max-height: 200px;
+	overflow-y: auto;
+	padding: 5px 10px;
+	border-radius: 7px;
+}
+
+dl.mini dt {
+	font-weight: bold;
+}
+
+dl.mini dd {
+	padding-top: 4px;
+}
+
+.friend-online {
+	font-weight: bold;
+}
+
+.friend-offline {
+	font-style: italic;
+}
+
+/* PM Styles
+----------------------------------------*/
+#pm-menu {
+	line-height: 2.5em;
+}
+
+/* Defined rules list for PM options */
+ol.def-rules {
+	padding-left: 0;
+}
+
+ol.def-rules li {
+	line-height: 180%;
+	padding: 1px;
+}
+
+/* PM marking colours */
+.pmlist li.bg1 {
+	padding: 0 3px;
+}
+
+.pmlist li.bg2 {
+	padding: 0 3px;
+}
+
+.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
+	border-left-color: transparent;
+	border-right-color: transparent;
+}
+
+.pmlist li.pm_marked_colour, .pm_marked_colour,
+.pmlist li.pm_replied_colour, .pm_replied_colour,
+.pmlist li.pm_friend_colour, .pm_friend_colour,
+.pmlist li.pm_foe_colour, .pm_foe_colour {
+	padding: 0;
+	border: solid 3px transparent;
+	border-width: 0 3px;
+}
+
+.pm-legend {
+	border-left-width: 10px;
+	border-left-style: solid;
+	border-right-width: 0;
+	margin-bottom: 3px;
+	padding-left: 3px;
+}
+
+/* Avatar gallery */
+#gallery label {
+	position: relative;
+	float: left;
+	margin: 10px;
+	padding: 5px;
+	width: auto;
+	border: 1px solid transparent;
+	text-align: center;
+}
+
+/* Responsive *CP navigation
+----------------------------------------*/
+@media only screen and (max-width: 900px), only screen and (max-device-width: 900px)
+{
+	.nojs #tabs a span, .nojs #minitabs a span {
+		max-width: 40px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		letter-spacing: -.5px;
+	}
+
+	#cp-menu, #navigation, #cp-main {
+		float: none;
+		width: auto;
+		margin: 0;
+	}
+
+	#navigation {
+		padding: 0;
+		margin: 0 auto;
+		max-width: 320px;
+	}
+
+	#navigation a {
+		background-image: none;
+	}
+
+	#navigation li:first-child a {
+		border-top-left-radius: 5px;
+		border-top-right-radius: 5px;
+	}
+
+	#navigation li:last-child a {
+		border-bottom-left-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+}
diff --git a/theme/df_images.css b/theme/df_images.css
new file mode 100644
index 0000000..7451821
--- /dev/null
+++ b/theme/df_images.css
@@ -0,0 +1,43 @@
+.reply-icon span      				    { background-image: url("./images/button_topic_reply_.gif"); }
+.post-icon span     				    { background-image: url("./images/button_topic_new_.gif"); }
+.locked-icon span   				    { background-image: url("./images/button_topic_locked_.gif"); }
+.pmreply-icon span   				    { background-image: url("./images/button_pm_reply_.gif"); }
+.newpm-icon span    				    { background-image: url("./images/button_pm_new_.gif"); }
+.forwardpm-icon span  					{ background-image: url("./images/button_pm_forward_.gif"); }
+.email-icon, .email-icon a              { background-image: url("./images/icon_contact_email_.gif"); }
+.aim-icon, .aim-icon a                  { background-image: url("./images/icon_contact_aim_.gif"); }
+.yahoo-icon, .yahoo-icon a              { background-image: url("./images/icon_contact_yahoo_.gif"); }
+.web-icon, .web-icon a                  { background-image: url("./images/icon_contact_www_.gif"); }
+.msnm-icon, .msnm-icon a                { background-image: url("./images/icon_contact_msnm_.gif"); }
+.icq-icon, .icq-icon a                  { background-image: url("./images/icon_contact_icq_.gif"); }
+.jabber-icon, .jabber-icon a            { background-image: url("./images/icon_contact_jabber_.gif"); }
+.pm-icon, .pm-icon a                    { background-image: url("./images/icon_contact_pm_.gif"); }
+.quote-icon, .quote-icon a              { background-image: url("./images/icon_post_quote.gif"); }
+.report-icon, .report-icon a            { background-image: url("./images/icon_post_report.gif"); }
+.edit-icon, .edit-icon a                { background-image: url("./images/icon_post_edit_.gif"); }
+.delete-icon, .delete-icon a            { background-image: url("./images/icon_post_delete_.gif"); }
+.info-icon, .info-icon a                { background-image: url("./images/icon_post_info_.gif"); }
+.warn-icon, .warn-icon a                { background-image: url("./images/icon_user_warn_.gif"); } 
+
+/* Online image */
+.online { background-image: url("./images/icon_user_online.gif"); }
+
+.imageset.icon_user_online {
+	background-image: url("./images/icon_user_online.gif");
+	padding-left: 58px;
+	padding-top: 58px;
+}
+
+.dfzitatbutton {
+background-image: 
+url("./images/icon_post_quote.gif")
+}
+
+.dfzitatbutton:hover {
+background-image: 
+url("./images/icon_post_quote.gif")
+}
+
+/*
+ .icon-button:before, .dropdown-select:after                                           { background-image: url("./images/icons_button.png"); }
+ */
diff --git a/theme/forms.css b/theme/forms.css
new file mode 100644
index 0000000..3ca9e43
--- /dev/null
+++ b/theme/forms.css
@@ -0,0 +1,431 @@
+/* Form Styles
+---------------------------------------- */
+
+/* General form styles
+----------------------------------------*/
+fieldset {
+	border-width: 0;
+	font-size: 1.1em;
+}
+
+input {
+	font-weight: normal;
+	vertical-align: middle;
+	padding: 0 3px;
+	font-size: 1em;
+}
+
+select {
+	font-weight: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	border: 1px solid transparent;
+	padding: 1px;
+	font-size: 1em;
+}
+
+select:focus {
+	outline-style: none;
+}
+
+option {
+	padding-right: 1em;
+}
+
+select optgroup option {
+	padding-right: 1em;
+}
+
+textarea {
+	width: 60%;
+	padding: 2px;
+	font-size: 1em;
+	line-height: 1.4em;
+}
+
+label {
+	cursor: default;
+	padding-right: 5px;
+}
+
+label input {
+	vertical-align: middle;
+}
+
+label img {
+	vertical-align: middle;
+}
+
+/* Definition list layout for forms
+---------------------------------------- */
+fieldset dl {
+	padding: 4px 0;
+}
+
+fieldset dt {
+	float: left;
+	width: 40%;
+	text-align: left;
+	display: block;
+}
+
+fieldset dd {
+	margin-left: 41%;
+	vertical-align: top;
+	margin-bottom: 3px;
+}
+
+/* Specific layout 1 */
+fieldset.fields1 dt {
+	width: 15em;
+	border-right-width: 0;
+}
+
+fieldset.fields1 dd {
+	margin-left: 15em;
+	border-left-width: 0;
+}
+
+fieldset.fields1 div {
+	margin-bottom: 3px;
+}
+
+/* Set it back to 0px for the reCaptcha divs: PHPBB3-9587 */
+fieldset.fields1 #recaptcha_widget_div div, fieldset.fields1 .live-search div {
+	margin-bottom: 0;
+}
+
+/* Specific layout 2 */
+fieldset.fields2 dt {
+	width: 15em;
+	border-right-width: 0;
+}
+
+fieldset.fields2 dd {
+	margin-left: 16em;
+	border-left-width: 0;
+}
+
+/* Form elements */
+dt label {
+	font-weight: bold;
+	text-align: left;
+}
+
+dd label {
+	white-space: nowrap;
+}
+
+dd input, dd textarea {
+	margin-right: 3px;
+}
+
+dd select {
+	width: auto;
+}
+
+dd select[multiple] {
+	width: 100%;
+}
+
+dd textarea {
+	width: 85%;
+}
+
+/* Hover effects */
+#timezone {
+	width: 95%;
+}
+
+/* Quick-login on index page */
+fieldset.quick-login {
+	margin-top: 5px;
+}
+
+fieldset.quick-login input {
+	width: auto;
+}
+
+fieldset.quick-login input.inputbox {
+	width: 15%;
+	vertical-align: middle;
+	margin-right: 5px;
+}
+
+fieldset.quick-login label {
+	white-space: nowrap;
+	padding-right: 2px;
+}
+
+/* Display options on viewtopic/viewforum pages  */
+fieldset.display-options {
+	text-align: center;
+	margin: 3px 0 5px 0;
+}
+
+fieldset.display-options label {
+	white-space: nowrap;
+	padding-right: 2px;
+}
+
+fieldset.display-options a {
+	margin-top: 3px;
+}
+
+/* Display actions for ucp and mcp pages */
+fieldset.display-actions {
+	text-align: right;
+	line-height: 2em;
+	white-space: nowrap;
+	padding-right: 1em;
+}
+
+fieldset.display-actions label {
+	white-space: nowrap;
+	padding-right: 2px;
+}
+
+fieldset.sort-options {
+	line-height: 2em;
+}
+
+/* MCP forum selection*/
+fieldset.forum-selection {
+	margin: 5px 0 3px 0;
+	float: right;
+}
+
+fieldset.forum-selection2 {
+	margin: 13px 0 3px 0;
+	float: right;
+}
+
+/* Submit button fieldset */
+fieldset.submit-buttons {
+	text-align: center;
+	vertical-align: middle;
+	margin: 5px 0;
+}
+
+fieldset.submit-buttons input {
+	vertical-align: middle;
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+
+/* Posting page styles
+----------------------------------------*/
+
+/* Buttons used in the editor */
+#format-buttons {
+	margin: 15px 0 2px 0;
+}
+
+#format-buttons input, #format-buttons select {
+	vertical-align: middle;
+}
+
+/* Main message box */
+#message-box {
+	width: 80%;
+}
+
+#message-box textarea {
+	width: 450px;
+	height: 270px;
+	min-width: 100%;
+	max-width: 100%;
+	font-size: 1.2em;
+	resize: vertical;
+	outline: 3px dashed transparent;
+	outline-offset: -4px;
+	-webkit-transition: all .5s ease;
+	-moz-transition: all .5s ease;
+	-ms-transition: all .5s ease;
+	-o-transition: all .5s ease;
+	transition: all .5s ease;
+}
+
+/* Emoticons panel */
+#smiley-box {
+	width: 18%;
+	float: right;
+}
+
+#smiley-box img {
+	margin: 3px;
+}
+
+/* Input field styles
+---------------------------------------- */
+.inputbox {
+	border: 1px solid transparent;
+	padding: 2px;
+}
+
+.inputbox:hover, .inputbox:focus {
+	border: 1px solid transparent;
+	outline-style: none;
+}
+
+input.inputbox	{ width: 85%; }
+input.medium	{ width: 50%; }
+input.narrow	{ width: 25%; }
+input.tiny	{ width: 150px; }
+
+textarea.inputbox {
+	width: 85%;
+}
+
+.autowidth {
+	width: auto !important;
+}
+
+input[type="number"] {
+	-moz-padding-end: inherit;
+}
+
+input[type="search"] {
+	-webkit-appearance: textfield;
+	-webkit-box-sizing: content-box;
+}
+
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-results-button, input[type="search"]::-webkit-search-results-decoration {
+	display: none;
+}
+
+input[type="search"]::-webkit-search-cancel-button {
+	cursor: pointer;
+}
+
+/* Form button styles
+---------------------------------------- */
+input.button1, input.button2 {
+	font-size: 1em;
+}
+
+a.button1, input.button1, input.button3, a.button2, input.button2 {
+	width: auto !important;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	background: transparent none repeat-x top left;
+}
+
+a.button1, input.button1 {
+	font-weight: bold;
+	border: 1px solid transparent;
+}
+
+input.button3 {
+	padding: 0;
+	margin: 0;
+	line-height: 5px;
+	height: 12px;
+	background-image: none;
+	font-variant: small-caps;
+}
+
+input[type="button"], input[type="submit"], input[type="reset"], input[type="checkbox"], input[type="radio"] {
+	cursor: pointer;
+}
+
+/* Alternative button */
+a.button2, input.button2, input.button3 {
+	border: 1px solid transparent;
+}
+
+/* <a> button in the style of the form buttons */
+a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
+	text-decoration: none;
+	padding: 2px 8px;
+	line-height: 250%;
+	vertical-align: text-bottom;
+	background-position: 0 1px;
+}
+
+/* Hover states */
+a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
+	border: 1px solid transparent;
+	background-position: 0 100%;
+}
+
+input.disabled {
+	font-weight: normal;
+}
+
+/* Focus states */
+input.button1:focus, input.button2:focus, input.button3:focus {
+	outline-style: none;
+}
+
+/* Topic and forum Search */
+.search-box {
+	float: left;
+}
+
+.search-box .inputbox {
+	background-image: none;
+	border-right-width: 0;
+	border-radius: 4px 0 0 4px;
+	float: left;
+	height: 24px;
+	padding: 3px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.search-box button {
+	float: left;
+}
+
+.search-box button.search-icon {
+	border-radius: 0;
+	font-size: 0;
+	height: 24px;
+	margin: 0;
+	padding: 3px 5px;
+}
+
+.search-box a.button {
+	border-left-width: 0;
+	border-radius: 0 4px 4px 0;
+	font-size: 0;
+	margin: 0;
+	padding: 2px 5px 2px 3px;
+}
+
+/* Search box (header)
+--------------------------------------------- */
+.search-header {
+	border-radius: 4px;
+	display: block;
+	float: right;
+	margin-right: 5px;
+	margin-top: 30px;
+}
+
+.search-header .inputbox { border: 0; }
+
+.search-header button {
+	border-top: 0;
+	border-bottom: 0;
+}
+
+.search-header a.button {
+	border: 0;
+	border-left: 1px;
+	padding: 3px 5px 3px 4px;
+}
+
+input.search {
+	background-image: none;
+	background-repeat: no-repeat;
+	background-position: left 1px;
+	padding-left: 17px;
+}
+
+.full { width: 95%; }
+.medium { width: 50%;}
+.narrow { width: 25%;}
+.tiny { width: 10%;}
diff --git a/theme/gallery.css b/theme/gallery.css
deleted file mode 100644
index 51cf418..0000000
--- a/theme/gallery.css
+++ /dev/null
@@ -1,106 +0,0 @@
-.gallery-icon, .gallery-icon a		{ background: none top left no-repeat; }
-ul.profile-icons li.gallery-icon	{ width: 20px; height: 20px; }
-.gallery-icon, .gallery-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_gallery.gif"); }
-
-.buttons div.upload-icon	{ width: {IMG_BUTTON_UPLOAD_IMAGE_WIDTH}px; height: {IMG_BUTTON_UPLOAD_IMAGE_HEIGHT}px; }
-.upload-icon span	{ background-image: url("{IMG_BUTTON_UPLOAD_IMAGE_SRC}"); }
-
-.icon-gallery {
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	padding: 1px 0 0 17px;
-	background-image: url("{T_THEME_PATH}/images/icon_gallery.gif");
-}
-
-.rtl .icon-gallery {
-	background-position: 100% 50%;
-	padding: 1px 17px 0 0;
-}
-
-fieldset.gallery dd.simulate-dt label {
-	margin-left:	0;
-	float:			left;
-	font-weight:	bold;
-	text-align:		left;
-	color:			#425067;
-}
-.rtl fieldset.gallery dd.simulate-dt label {
-	text-align:		right;
-}
-
-fieldset.gallery dl:hover dd.simulate-dt label {
-	color:			#000000;
-}
-
-fieldset.gallery dt.simulate-dt {
-	width:			22em;
-}
-
-fieldset.gallery dt.first {
-	min-height:		16em;
-}
-
-fieldset.gallery dd.simulate-dt {
-	margin-left:	0;
-	float:			left;
-}
-
-fieldset.gallery dd.simulate-dd {
-	margin-left:	35em;
-}
-
-fieldset.gallery #format-buttons {
-	margin-top: 0;
-}
-
-fieldset.gallery input.readonly, fieldset.gallery textarea.readonly {
-	background: #DCDCDC;
-}
-
-dd.g_lastimage {
-	padding-left: 5px;
-	width: 30%;
-}
-
-dd.g_moderation {
-	width: 35%;
-}
-
-dd.g_rating, dd.g_comments {
-	width: 12%;
-	text-align: center;
-	font-size: 1.1em;
-}
-
-dd.g_status {
-	width: 15%;
-	text-align: center;
-	font-size: 1.1em;
-}
-
-span.reported-images-number {
-	color: red;
-}
-
-.g_unapproved {
-	background-position: 100% 0;
-	background-repeat: no-repeat;
-	background-image: url("{T_IMAGESET_PATH}/icon_gallery_unapproved.gif");
-}
-
-.g_locked {
-	background-position: 100% 0;
-	background-repeat: no-repeat;
-	background-image: url("{T_IMAGESET_PATH}/icon_gallery_locked.gif");
-}
-
-.g_reported {
-	background-position: 100% 0;
-	background-repeat: no-repeat;
-	background-image: url("{T_IMAGESET_PATH}/icon_gallery_reported.gif");
-}
-
-input.autowidth-gallery {
-	width: 96%;
-	max-width: 186px;
-}
diff --git a/theme/images/alert_close.png b/theme/images/alert_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..79750a013c5db627a14bf3d57edc8f8e3a477046
GIT binary patch
literal 2097
zcmaJ?YgAKL7LJ0*E65`_OVRck<S|<EgoLCC2qZ`xf;^%y_$Zg;hD6AN+^YmMAPPd1
zF`%Hez<?k+uoOfq*or&~6{HBQfdV2ys7NhP8E6FobrLIfehhQhy7!!Y*7tpTpS{1e
zt~xkqJKB7`ISPeBa{^eQ`qf(h0;VSVuY-E7L%*y;*bzvWOo$|a3JB#RkVQiPM*_w`
zp%5rYjK2>tP$(m;m=}RWa0BUlnFI$KFgT?|u4kiA3~!|z<i|n?5DmqMrA+LLI}KPs
zEMQ{8J-7s}+z%3o1CkU_SW*y=pA^fd39#N?07FUF3rHXY1eB6EDNI)~vF~*0`n};8
zj|JXAkXR=6kD?;D!GNDk0RbL3f*YSeApjI2j!1T=QmLN+Bm$9uCy?+&k{gjqCzI#|
z0`UI9>a!^XLV766|9vif#KejaL{7)!6A}_|31pm15rZevXf%TciR7k7xWS211XQ|7
zVaFu}76kJZVmTs~Ndbc*7%e-9FtPed|G0ug{y|m>zi*SiVR$7d#}jb`!<CkRT<-se
zN+ci9FcJ#=S?~W8hIxr{2p<Z;vV#h~esDrZLn=AlPXU35Ou>`M;+DD?ERrEISR|7J
zeqkN}7vzhjhWH(x%cXOqFak>X5QoLY>J@Nev4GC@B#`|*{mC94R5FpsCi<{wRDTMY
z<m*fG^P^IUOI((We^3HRktMF+Pp<p2T!R%Pa(!kNq!1s11pW${1bBC4x_J3oh|B7|
z=L(jug|sXeuP+8~80>!ydg(~-9>ey7ZS}zi<3m!t+ZB3SKgt9WQ7Gdw4$Ft9d~}4j
zFW?e{Nv?m9pHdj_97b)G@1|0l9`^7s(F1|DU%OVV^zp?&<IaaJT9o6W<3YS{-`4ZC
zzu>GlP5Zhxvso<-*BtV`j90+^+Kq+rZ^rVgVBNYDp_VD1tDjYM!MYi*vF#7t(PL0l
z)DyZYi6cAnqoAfJ+sj$iJv7vitlLk2akMevXSk}Y?AyJOkta(^u+<HB?pSDAkC&I1
zo4Pe@b{P`Vfa26QDV5i*Nn+#T(wc`G*(0+HL~n1+=;&yCWOBgi5yi6!AC*ewaK9{S
ztry>+rfgKD3$rw7cKB`MuM-owP8{DYdB?iOn(y5+F}JX2vgz#XG`}8n#b{t^MpOj~
zg+kWF*_X97H56K5&}Lh+f9sl>d^#RHFta*$?i_(mKY8nxM|XGkwh+v4o5;OgTKnnc
z(t&~Y_IBgXf1jGN&Iw?#NDM}n-5HHWV`FJ@v3LC2uj}dxI1;{9<)g_%Ez!i`;!Br|
znM`Ij^a@jO_Uv(;ZhyqJ-C%Rg;?5DqCY$?$X<m4EINR9e8=H{Zf2VY;g4?X#SQ)Pz
zkxZ!K<88EB?MhK~M9bm+{<b#Ln%dfQ^Z@BZ^+ePW7`7AMTvt(1a^r@ry}doQrLq!-
zAc(08m&<i^b+x9%eP@#sNK$K@ot>q<Jw1Ot;%L{S)13}>HO_x<qOOjCBqTU`dw+Jc
zpEyIN(aLRK9!~%Kap{q@)<pEKUAwRhiu;AYZ?f|^PgTzOd4#_H{=|U1xl&xSb}&6X
zJ=Pdg*70ghMssHCPb1kU(JnvyL!&9mo&F0x&iVXzc|C!9_Ut)N)jCZs{t8bn4zMS$
z9<B#(OUNZc%vk-~vsX>$=jU7ObcxOv{#IgZ&VT-z={VJW37mK0GC+~Yb-~OSGgC|l
zZr!!dj?z>Fuz&h~MEzxs&zgQg<3&zW3AgzLh1+4IKqzYtm@Vp3jR!(7oD}PFIVLjH
zzWr@oYYbJz;Z3@9K1=N#x1V{!$2%>0ev*Z*jE<<-YCWq=PgvMqn?3dB6pvt;H{Up{
zd7_DioBR6uGJWm)QpUF(*kV<dw&M7{Ar*RcYIF)See$(%?^grr$M?1vCl_X5)SJG@
z^y3`3(FF!}8HKZst>uz0!+ph1Beywao>^UFx1wac`1|_6g<pOk2Hvo$+Hmjs%Gjij
zo;vxYIi-V22>s6iqg>D5F;_n_sqUFU+rFJp-wFwhQkVD7JgIw13D@SeKaZ>)ZJd4<
z+yAO-gF4Z=JHFzfN8W7Hfby#=Ocj}k59M^l>lQ38kK?L8?&YOrwf8gR`5pnzrJk07
z9h>HqX7}&L$Wx~68AZB`wWs)RGd{E4H?(8tzjDos27za(tedB`w-v2!Ti0L7i8%Kg
z{pab)fVr32!GH^D*`%P6vmxhA_uiJxkAp>NlObLf(dO&-mrdKxoIaINP)J#o)3)m4
zP&-o_<!A+Z_3qbx6)iUtug7UC*>>eMz2#Z3YgxgT<C|l21-`jQlS{J>UO}hquind8
z6ZFON6Q7E3^pnjtJ7$l0Z`TYmj0WTG-oDUjK}#HF0P-Ihb32c&Kw&oWB|A*ZcNl)+
N9Ci?^(l_eZe*jUwWY7Qr

literal 0
HcmV?d00001

diff --git a/theme/images/announce_read.gif b/theme/images/announce_read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bf817cd69a836370d06905a218081eb5fe189727
GIT binary patch
literal 728
zcmV;}0w?`PNk%w1VH*G&0QCR>`R(uV?(OZ!&BDUMc6N65^z_`4oXcu=_x1Jk^YWym
zq~_w`%XNX{sj;)Ov+U^Sii(Qav$)gK(`994$X90Szs2d|;{5#l!be!{>FK;QN1dIW
z-^t7B<mB`4@YkoU`S|$evAB|wlKT4kzB)|r>gxXf{<<we?(Xj2-{1ZH{rUL$f`Wp%
zDn7tIP`D;Kw;?wA`TG9-{^sD{=eNH0^Yg?}VEg*}=;-L^<Ko+&r_*<Y`1kkn@9+Qr
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9j2vv5md1975TDQ=qvhHeXcd~_;5sp)
zPmYEn0Qk;m6`(@VaKO?N&3yBeGWbB^<^zOYUr-Df0zN7M9XT_Li#Z)VDl!5tfkh;R
zJQ+C)oC_8nDm4!|86Z9aFK<H{G(J2J7CExA2@Vq*1vwTEASNLiLktuEDkT=j$QdaU
z%qSfe9VI3J6oD^=9v#}-9S=Rs5G&jsJ{2cFIv5ByB@gcJ-aH5kAU*IU7XTO^2Rl9m
z8Q?t#Fk-+42ogL9%z!|~0WJ-EB)~(_0}lld2oQj9gCfNQKGL12AhCo=lO{IcaG+5E
zh?6Hl(nwM$L4cb#6W|z;k%0Du0yuGk6wqR%j~YP(ct{|D1q%o!lHRQ0V<rY2J`nWS
z%Js$urw(p#9g83&hKDj%Bv`w)1_}spajdApmhB3M2ht%>QGo8+6$9XIFfjl{fw~3M
z?E7)eM+^i7BAZYkLWF|>5>`Zxj37q2b5e%+Sb?B)%E}v3fGEv+MW1S`Lda0Df(MTq
zDKPUGVY_z>6&FH~Ai|-sj2kOf+yEXUx$_$)PQg$W%!L3MJ}%sd!M%Ho8y5@-AW?}3
zgBKyp7y^Fbf(jL905pJ6KFpX30I;LUzQzU#>Tob{f(r*25JCkFY(at-a71B*e=U%}
KgcD!{0RTG%V@byV

literal 0
HcmV?d00001

diff --git a/imageset/announce_read_locked.gif b/theme/images/announce_read_locked.gif
similarity index 53%
rename from imageset/announce_read_locked.gif
rename to theme/images/announce_read_locked.gif
index 361ccc63416a51962c4dd3e0c3e9fcc536183260..c7303675a09e4ad1b1008279774540783d2c6e7c 100644
GIT binary patch
delta 247
zcmV<T00{r$1>*&OM@dFFIbj<B8vyk_0Mpac{r&wY5EJn2?7J&Icyx5b!^5qttoiKj
z=HTG>^!4`i^z`%cxVX6Lzs2k3=Ig`Bii(QksIb_El4WIO>EhyqgoN$L&F$#u)Ov@V
zot>tlqRLrm>*M3|@bLKe_mYy5`uh6jvAD)fUh(hmzc)%^cWrKedVB8f?!i7#!a-Bc
zXm#%C>G}Bi#70=~&C;KNg?V0K`uY0b-{0uBzTA?W_Ve@m`}^nT=jh|&rk0rCpQ!KZ
x>N7Jl|NsC0|NkNR1OWg5KL9KM0000R02=@R2L6%Z{sR6@li>mV1p)*C06SoAn_d6_

delta 246
zcmV<S015x&1>yyNM@dFFIbj<B8vxZm0Mpac{r&wM931ZM?sIc<c6N5d!^5nst@HEq
z<KyG@_V)Gl_44xcxVX60)z#_g>DSlSii(QH#>TI&uVrOr=H}*vgoNAM+w1G=r>Cc#
zot>nlq>_@7=jZ40^78lh_>z*6`uh6J%*=|4itzC8dwY9ga&mHgeSPlk?tp-Rf`WpZ
zo15(H?D+Zlg@uLR-`|jskZf#h`TF|b-`~*C(6_g@_4W1p`}^nT=j7z(o}Qk-z`*V8
w?K3ko|NsC0|NkNR1OWg5KL9KM0000R02=@R2LF-a{sK+^li>mV1Ox#9JNoXO`2YX_

diff --git a/imageset/announce_read_locked_mine.gif b/theme/images/announce_read_locked_mine.gif
similarity index 60%
rename from imageset/announce_read_locked_mine.gif
rename to theme/images/announce_read_locked_mine.gif
index 27a8245aabcaf10ea53f8639df47e8dba8c62558..f86e562112710eefd95ef0a85ed0fc5ed6bb297d 100644
GIT binary patch
delta 261
zcmV+g0s8*&1@Q%cM@dFFIbj<B8vyk_0PyYX?8VCZ`T3TXmg(c;)6>(%OI-c^{qE`M
zC=e6qxxnY);dpd(R?TX|!^5qtth+2f_xAVs?C$sU^w@@x^z-sJlt$EfhPb%6i;Iin
zsIcqi=4EANgoK2a$DZ@>@SmTbh0~FAz<|nGX=S%^oZ_cqEyzZ9ZEk;hd%-|b=CHTF
zHb~BBbsmW?@66GkfrWWqVe#+p<KW-+^Yi=q``nS6wAZ@g^5xa_+NPG6sH3FdpQ!KZ
z>N7Jl|NsC0|NkNR1OWg5KL9KM0000R02=@R2L6%Z{sR7jli>mV6A(}^;fFsMF~S!J
LQsBggK>z?dI~tjl

delta 261
zcmV+g0s8*&1@Q%cM@dFFIbj<B8vxZm0PgPY+1c6o`TCZYmgeT>)6>(4h=~3D{p{@Q
z92^|c(b44O<aTy;zhrd7!^5nst#ovB_V@Sm^Yixh_OGw6^78bFLQbcrr?|Mdi;IiK
z#>VOC>1AbQgoK2_oTKvc@}Hld%8r@0eTR~glC5ug+N7>xwLnyIa&moreSv|2%gf7q
zdwZLkn|v!d-rnAjkdSO_Z1C{#;o;%+_4WGu`?t5Z)409x<mK_%-JYJFrlzLAz`*V8
z?K3ko|NsC0|NkNR1OWg5KL9KM0000R02=@R2LF-a{sMykli>mV6HqV?;fFsMF~S!J
LQsBggK>z?dkdvGR

diff --git a/theme/images/announce_read_mine.gif b/theme/images/announce_read_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f21f665beaa92bbcf3bd29f4737e78647a4aae6
GIT binary patch
literal 724
zcmV;_0xSJTNk%w1VH*G&0QCR>n3$OT{r%I^)9AXv@a^o_t+UK_g1IR@=HTG%$IXd}
ziQAH#!^6XPczE{o^z`!b%W8M`_4TBrr1|acFt0`9sj;-QwCw2TWo2dQ;o?!GUcyIM
z?&<0C@bEd#Qpi_kyfa24lr`$+<=@H5<g>Z>_xJkx`o20$;NRcG<H_&p>hA9D`S|(A
z@y?Fin!r9#)%Du?`TG0%`}Xtm#8F_w-^bGD)$sW7@b~fCpQq^K;^X+{Sl4Xw@9+Qr
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9EI??W1BeDG3_HFKar!eHUWUaWL0Ujw
zhlQvXs);hx5$Kbc_}=iqBxA#oTQ?hrXdSp^9RwVM1P?Mk8X<{1iX}q^8woxEJt8^?
zn3y^uGd3<B6do=xdp{%~k|i9MnHe1cGZ#7zDWM)M1VbPLJ|!0!z`+j|7yu5OArw0v
zJU9qd9}@v88E4iUC>Yw64>dMEDKI2L2a+8k=;<OCJ=zK^=mZ2%2?swp8xb-p7ybV1
zB_bd&(c_;AIU9@^@Zo^NzY7FRFaV%HK!=AMA_Rc&rGk$KgF<#FAwfZd1`1?^4EewZ
zzFi+x$dnlXfCvjGC9s$|v*q%DB$6J;lh@<HK$8sw%osYfWj&ZPdPwcDqNo6q3MfsT
zI>X1$4LN*7*eX?q1e6wHkd+$2<pz!cSUi|Jcg6|@ctx<7L6>ffjS%o@bkH{j1H2Lf
zFjzsDt^<Tl%K3;9!GYxf5-3_=Ab^Es%MoIDwFk`&iwLM|0$7bAAZpYsd`$RYKo^Ms
zaZ8j4fPym%8M=f24M5@qkr9#u$YAjscMRsxWd!h1Z^RS>FA_{w9;3VW7}6&t08yKY
z6%uYH;a)#oc7+4wsr*p$!B6`*69&*YVO>6-D-bL|LIM?daRPb%`Des_2b@5I0Z#ZA
G1OPkEDodsS

literal 0
HcmV?d00001

diff --git a/theme/images/announce_unread.gif b/theme/images/announce_unread.gif
new file mode 100644
index 0000000000000000000000000000000000000000..885d42137de77803cbae7e68bcd8ffc1b9cabdfe
GIT binary patch
literal 730
zcmV<00ww)NNk%w1VH*G&0QCR>y6M91>FKD{t?};dTB~Qo>&vR-vt_Vy^zrfc_4Ui{
z(CPE*T*z#DxP<KH=I;6LcE^FY)wt>6;`93SHi$%+$e{fE{DI1fHNQ*O>DqqFh(p3x
z(b&!E<m6+`b4|oyzudz-z)?h&Qu+A!hP;pX_xJw({`>m-=i%Vq?&19Y{Q3C#RK{j<
z(}MHx@cQ}s{{H>u;NP0xrS|jl{QLX;{ryj(T<GKCf!B`D@YK@r*FeElN5We2@9+Qr
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9j6fK>(1rnt5TDSW2J^wm00n@o^$BUB
zPtL}pc=*m})uZ6qaKO?KVB$Nu27&wlLGwKT7#C3*EIB?k0}eMajEpx9JvA^2AA&?6
z8#+EE0XHb0C=xC;Gl~HtJ_;CbLmL2_4iY!BvojSG4GA|A4kIuC8$%i%4<-Q;$jJd2
z6wQee9RVf}9+nsiJ}wR&+}#cfA`}NJ-UvPgAwL2P6Ep!1@bQo(GZ`yA@&OhPECLWX
zK4!d=H(*4B1_wZB%a;H~3kV+!_&|`SqKgS64u}wO;6%lW<_xe1QDEZ705uw<sIZa5
zh?4=#0lPMFfK8hZGQ1#Q!$$Z41UGM*Q$;dh&;c$Ifapm8(a`}jd;nu1F+q>3SZOpM
zK%l}2tY8!P5DB3Lj1>sdrk$~XD}fX%W~f!WLdC;%6I3LayF$PL0uX8lSRhwzf*Sk;
z{Gj<F!HmZ>G#ofkK?aDpk7p!!ac+l@VP;k&7;OT=0S^!qh#oz9g`aAz0KllRqC|-o
zIs|~2@xr$66*W`<;6a1~O%o?ptT<u8!VBflPnbxx>dA!<3SjuKaN>pc?=P79P@#Z_
zCF>Xfm^oCVxrG`v&O9&>2o47x9tu3rj%NHC1|P5jM;srta76(IZ1KSk=M7lI5j=$O
M0RtL10Y(r2I|+VIYybcN

literal 0
HcmV?d00001

diff --git a/imageset/announce_unread_locked.gif b/theme/images/announce_unread_locked.gif
similarity index 62%
rename from imageset/announce_unread_locked.gif
rename to theme/images/announce_unread_locked.gif
index 2e29aa710c1060975f90254d5ad80a79e7d30e4c..76dcc6ca715a0e29111b59b0cd49e5e24b87a038 100644
GIT binary patch
delta 206
zcmV;<05SjR1?dHUM@dFFIbj<B8vxZm0IaO6{r&x*gp0*SWGNFE?CtQYT5a#k)Zdz`
zuw{1BbBXK4&cQod*o2t$=j!R}?(y>UyM2r2=<MUDw)ySwdShwJT6OgG_u}R0)uple
z^7Mx^N9ec0$e5#pgoNqW+s|cw<mT$|-Qko&R`Jo<`1tun_xJeNyTX8Wc;Mpa`uqF%
z`T6ki^Xk3G?(g#X`ug0DqTk`>{QUg$^!B1pW5`f!;^XN2`T6(w`R&fu;K0YJouKOM
I@3F)s0z>4I7ytkO

delta 206
zcmV;<05SjR1?dHUM@dFFIbj<B8vxZm0IaO6{r&x&hl{pVW+oOG?(XiPWNz!v)Yqb{
zr*3!0e~RYH&aq2f&W@S#>FVt4?DO;Uw1kZ5>FV6CxA^YxcV=n5Xm<AY_U7j1&#STd
z^Ync_NaDT2!k(mqgoNkW+rn~x=jZ3{-{Fc)SMAl=`1tun_xJeKzQTWZc;n;b`uqF%
z`T6ql^5w$F@bK{Y`ufwDqvGP@{QUg&_4SxpWV&8%<mBf3`uX_y`03Kt+{DPJo}lgR
I?Xkoq0#nD5L;wH)

diff --git a/imageset/announce_unread_locked_mine.gif b/theme/images/announce_unread_locked_mine.gif
similarity index 65%
rename from imageset/announce_unread_locked_mine.gif
rename to theme/images/announce_unread_locked_mine.gif
index d0feedb7f15adb90705564022b85b84c9f11982a..53782fc3dccc219027d15bbe4c36d2787a595b40 100644
GIT binary patch
delta 206
zcmV;<05Sjb1@i@eM@dFFIbj<B8vxZm0EjY1^yliVtE>6>`l5=E>bu7M{r$0Jcg03!
zDH9m%?eNiZh^ty{?#tBPmZ#W*nCr#Qx_OB5^7X+yTj}fW<f^#LS#|T&+vn))`SJ7g
z_4ayWY548%$d{wy<>`Zjgz4AY&t-n_-Qncs>cWPU_V@Tj)upkOK~><JtlYiDfOdGu
zEmFr&Y~bSOi5@uc@$>KS^4yQ1-{I!-^!EGv{MWR+qEBPu<LL6@<^1{i@Xy!RSa#~{
I@3F)$0#@#ft^fc4

delta 206
zcmV;<05Sjb1@i@eM@dFFIbj<B8vxZm0De42^6BcVtE>6>`k#%E<iW@N{r#wJc(zq$
zCKed(?(W8YiJ@d}>d(~GpQz4_ndiyRvVn>7^YpPyUF_`a-Lbj8XLj${+v(}*`114h
z_4RjVY4`5%!kwh%=H`Qhgy-4Y!g7D^-{I%y=ev!S_xJZj&#SSEOIFyUt=PfEe|LDb
zKvcP2ZsX(Rd@DKf^78TV@za>1;^O1=_4WJv{L{F-m|0}x<mT|?<^1~j?9<oCXL#-H
I?Xko!0%eel-T(jq

diff --git a/theme/images/announce_unread_mine.gif b/theme/images/announce_unread_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bc07df0ce93e232a5aaa7cb2c0fb3d9674b29471
GIT binary patch
literal 765
zcmV<Z0s{R<Nk%w1VH*G&0M!5ht6FWsMP$G-RO!0K&ViQ0J6!DT@YJZa>Fe&~s<^Oa
zcJ=1z^7Hle_4nx1*ze8N`t$Y3Tz9y8itotMh%!dUc8lle?D*~Q)wjap<>}qQ$jF$Z
z{QUgv!_D2AtCvDonIb>r=IY9Sli1DG?%d$w#mw{6+s|Zv`1tv}hLiXA_}}5?`uqFf
z;^+SU{{H;^`1$$AP;Jw4iSY6B+>W97`uhI;{`>p<^Yr%p{r#a%V)*d#;^XM=@bdrv
z|J&Z<A^8LW002J#EC2ui02=@s000L6z@Kn9#8e`MLLgGX3}?O>arzS#Vgyg8Gw{e_
z1y4u=(u6Y9QQ$PW_}=i>h2+?gCp!m%XdUc)EHefOga!;ZJ~|)(ASWO?C_^GK4?a0P
zAv`Oan>-;64m1S<1vDmmKN<lhJ}L-2EwL>bGdVaGJPjoRyb}gP0RycT89c^3v>P81
z4IvC59}8DID^({uHV7Hp+z1X7;Ft_06Fwa#1406oGa>HpAr=N76bdlz1_n?M1wRK7
z5N;r_K(L^N9x8B<fMLKO0uDQ39H>CRM}vU|4WPgvK>>yt1}z|HU_(ZQ7zunZAjEP8
zgcJ%sd{DrGB})cA5`gKT(k6oc91=(<(~$y(PXssz1Sn9BLB4!FE;wKTK!=VJIG#Sm
zIUxy896iE@ozXypRRAu;s>R_$DN2iK!`_ep0KkSoaeFk#8KZ&>8!#9M7K~#-T>uMl
z3?2;Qg~@*qUNl$?<A4GH6>=O{FnMr;91#!vSm&cggVUcyC{VD$g9aF=PuDQl&zc+9
zr(IM~z+?mq6|rIXxNt%QumLu5z)+!rg@XenAaGz#9Y&59N{Ngh?Scgi7&mfw|4yET
z3m*>zjF>X%fejxVSk#zLzXl5qK3+TsK!C~*0s;)+h9x<0U|<e8ym3JS0`%wK4{Dsy
v!3FQZk>3R!L=eMz4@z<xg$y1H&_M!T1Q3969a3RL1WUybfe21K7z6-2@7ho9

literal 0
HcmV?d00001

diff --git a/theme/images/arrow_down.gif b/theme/images/arrow_down.gif
index e45c365ecc48ece968e99c88ebde7c2e487268c9..b7fbf7e2764e1f1c58ed0a166ec0d02eec927970 100644
GIT binary patch
delta 24
fcmXRk7IOD=v#?BLV_;)wU|=vdHfCU$7@!CMJRSsw

literal 113
zcmZ?wbhEHbWMg1sXkcV8Ha2EpU{L&LW#jB05NYR}Ur<?;nVwOiU}Rumq7agis!)(o
z;N+y>UX)*2prhcJlcNv>k}p;WN-a(;Doah#V^I9b!pOkD$e;r>31})C0|OIR4}ZeU
N)fX>VFK1w|1^|_$9lHPk

diff --git a/theme/images/arrow_left.gif b/theme/images/arrow_left.gif
index 076a5596f1e8009581a8d943af4cad96a9f15493..ac92cb49719f40ae82a284f16e3b9bca63feeded 100644
GIT binary patch
delta 24
fcmc~d6ms`;v#?BLVPIouU|=vdHfCU$7$6S-JD>!9

literal 111
zcmZ?wbhEHbWMN=qXkcV8Ha2EpU{L&LW#jB05NYR}Ur<?;nVwOiU}Rumq7agis!)(o
z;N+y>UX)*2prhcJlcNv>k}p;WN-a(;Doah#V^I9b!pOkD$e;r>i2-CT0~3c2L)(hX
J=K+ii)&Nry91Z{g

diff --git a/theme/images/arrow_right.gif b/theme/images/arrow_right.gif
index c5827a401f4d9796b0c94f52ff7173d01564efad..3a080ffdfe21b646239778d71fa09e843351a63f 100644
GIT binary patch
delta 24
fcmc~d6ms`;v#?BLVPIouU|=vdHfCU$7$6S-JD>!9

literal 111
zcmZ?wbhEHbWMN=qXkcV8Ha2EpU{L&LW#jB05NYR}Ur<?;nVwOiU}Rumq7agis!)(o
z;N+y>UX)*2prhcJlcNv>k}p;WN-a(;Doah#V^I9b!pOkD$e;r>i2-CT0}}^}P}_>k
J=K+ii)&NlC8`uB<

diff --git a/theme/images/arrow_up.gif b/theme/images/arrow_up.gif
index 38b5a62c171be2186622b4b06f92443cbda37e3f..0ff587218205e6ad32bde7ba0e65d7d4eeff98b8 100644
GIT binary patch
delta 24
fcmXRk7IOD=v#?BLV_;)wU|=vdHfCU$7@!CMJRSsw

literal 113
zcmZ?wbhEHbWMg1sXkcV8Ha2EpU{L&LW#jB05NYR}Ur<?;nVwOiU}Rumq7agis!)(o
z;N+y>UX)*2prhcJlcNv>k}p;WN-a(;Doah#V^I9b!pOkD$e;r>31})C0|OIRPd>wn
NoeQOERxmJF0|1h+9W(#{

diff --git a/theme/images/bg_button.gif b/theme/images/bg_button.gif
index 5775af216b029a0a960af4a7edd101198f354f49..03172ff5c674ae95000d265bff3e5068cab73af0 100644
GIT binary patch
delta 83
zcmWl{(FuSc5CBkxhG>*ppa`evyJ=dc2^!(-ehf5EJxFhci1!YCXfrR<Fs_~I)u|LB
nJ~4uYCM_j;Yc0&V<luvd5G4Rx_!qoqW+HO#M!ZCth23l)uM0eB

delta 83
zcmWl{(FuSc5CBkxhG>*ppa`evyJ=d+2^zuceiGD9Jt%L6i1)0v+RV!|jBBTQbtr|1
nDcufSla@0*&s!^(T4IPIk|~3O%D)%`GZT@&JmM+R0Cux|uG&0n

diff --git a/theme/images/bg_button.gif.1.gif b/theme/images/bg_button.gif.1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5775af216b029a0a960af4a7edd101198f354f49
GIT binary patch
literal 182
zcmV;n07?HxNk%w1VFUme0K@<Q*VotL;^WlS)a~x=<>ln->+I*}=;r6<;o#x!?(XH}
z<<->H=ji9?=jh?#;OOY+<mBYt+}+pL*6!}@)z#G8+}z;c;Oy+|=H}+(<KxoO(%;|T
z>gwv++S>pB|L^bbA^8LV00000EC2ui00aOS000FupeK4-sVxFUNfH2ba934PwB4Iy
kAy$z63IYUzDIOk-hJnN66fV%gBr*9|uh^`1%MAelJFgRNM*si-

literal 0
HcmV?d00001

diff --git a/theme/images/bg_header.gif b/theme/images/bg_header.gif
new file mode 100644
index 0000000000000000000000000000000000000000..035a64d2284b33a245e26388e6a6d837702d864c
GIT binary patch
literal 226
zcmZ?wbhEHbWMzn9Xc1zludi=zZf<F5X>V`u?Ck97>gws~nK*IclqplDPMtb^`t%ty
zX3Uv0Xa4;8ix)3mx^(Hvl`Bu5KK-9)pu+$JAiEe?(-Ty>93t5=R;|mq%~hboUy^&j
zV%>X}_x}$p*buHE)$g$+@nnt_|AiGLR<052Z>$lU{i14rLTiPO-gNO7TdMY^?YRG;
st;TQt?f2#Fb?4vz{@+l;-`vvL*51(}(B0G9*FRz6q{&kzDKc0C0RL`+-2eap

literal 0
HcmV?d00001

diff --git a/theme/images/bg_list.gif b/theme/images/bg_list.gif
new file mode 100644
index 0000000000000000000000000000000000000000..341a9f38ff17955ec741bc1e8516f656b114be2c
GIT binary patch
literal 374
zcmZ?wbhEHbWMzn9SgOJ>!N6dmfx%=0gDHlF(+mx#8yU?sGMZ&<Jjd90u8GNfQ_}^e
zri;wX7MqzZH8)>oZob08Vx@(}Y72`smX_<StTtI&Z?>`7Zfm>4)^?Yj-EKR(efIVT
z932lhJ0Em$Iq2qg$iw51r{`gB@4GW*{HFoXVE_V<Ul`bCAD9@Rp(W;gVoA|X7R$Nw
zSCqV38D<@!lYaVb-oE(Wh&h_G&(A3NbtrGQZb3z=-}>Np-#hEhzxV#v&?wm4(%L4_
z(b?7A)5YIEVItq;DO0CSpUOLH_MEvq^A{}SUc8uV+42=DIajY)%dvjL#!c*7wr<<L
zW9JsOJ$v`<XFYi6@DY|{$4{I*b^0{(x$_q;GF`sRc<uU)o40P?xqFl0!2?GIYXIY_
B*0TTr

literal 0
HcmV?d00001

diff --git a/theme/images/bg_menu.gif b/theme/images/bg_menu.gif
deleted file mode 100644
index 707cb8e71f8de34e79c430be9c69027e20bb109e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 354
zcmZ?wbhEHboXWt$aD;*3(xpqMPoKVa?b^|!M=xHyc>DJ4^XJbWK79Ddks~Kho;-Ex
z)XkeWFI>2A<Hijj`^uFoK*3|jjsX=PKYskgi4#Buki2#4*12=%faU<DfZ}J)oB?V-
zd-g2Q9L1k33?QHbB0zRBu-<>5-uI+@PVA~>9@=|@RKuNR@9tRkI@mtfK_S&+qeOqF
zO3KO%E18)qOoSgqtPk%mTYa=*Z<|4~j|TI(7wu8H8M|3~e<bbOapP@kO=i8-nlN1s
z14Cm|W(!MeDLZ>dX%|;_H&0G)0befv;Gocmh?to8grt<TjP&fB{M<s`lG1YVO4e%C
z+Ip?VW@8hx4#BQ&yS{#xNt3;N`~qf&%$vU;c2Oc*GEXYY@)avruPG|oxT$KZ^7b9F
wyA1ZU?LW}fb7aDCu_@DL%sM;wyv)T*@mH>G$Yh@I%F*27{<D_ZqD&0d0OPB&umAu6

diff --git a/theme/images/bg_tabs1.gif b/theme/images/bg_tabs1.gif
deleted file mode 100644
index 3ff70e0f6b58461f95f31cb81ef68b67e947239a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmW+xX;6~~5RDa)5lRs)G7QC79Y8>!9*9&cmR6#oWz-SIQM8qjQ=rvBhp`GC1R(-m
zfP!)aAtZqSi3GU>f=M6=2?F5?<W9caUr5M7fb_HP$IkA~dvD)HpEw?V=+A_8DX>Wx
zOrz0=#bSv>A`*!J0FX+hJRWauZf<^lUM7<%l}e~lC=`PK!RPZA78Z0m9SDL92E%H#
z>h*ev14-m^IV9I=wFZNM!{JO!OpJ|<L2g_w7uwitHlxwFxVQ*8K;|<uGqba^&>jM0
z4)LKFlarIs5f+ODjnmW9P%5a0&Os_j0{OGqY@tvH@uAUfw~vgBsMYEnRtMNu1br=E
ze}XyM`x7#+{dKySUjNT<dPFq`bL(XDMZz>bo1w`e9`Q~-P*=eQNI9&GZa&y~_Y7f9
zXX&}e)``#U4-44!{o{OO!IQ!w)YIaU(r3?KynIzwUh(=(WmUPKr+aN3y8eAbBc=(9
z!#B4OTHD%*qz@hB&JG{g=H9+f{R4xPq0dwreRzbyWR0>pV_(K6z8r#0&&<y8<`?(^
zp-3!|%H)7TsZwjSI_*zK4aOyt*<xL`t*oxuVe2<}BU)<)9y)Cahyjk}QIKvsPgWt?
z>OL2F?n~v-+t9QUcvPYHiS}K?t}bV>mxkNlGs;7+jZ~c=Hn1wgZz_4i#74HgI`V!t
zJd%VNLnB@UTpl4cjW@=kPrg0*0XvC{C#KG0Cx3rHxJoJf;Zz5HhL}8#z0Bxno+D?8
zN8X+yx6F6JHv#huGJ*docfGSuOlPZ*Qm`d3f!Wz6rj_oDD%(-hE@f2gOIu)mB+A(}
zQAIwdyGV+0%sE^FE9XEVto0h>-RbTQ&0ObA)dH)VtmF4Tbl!fZr&BMcX1c_W_IxzR
zIp|Z>XL`GqRMW&X{%CKvStp<reRsb$&uRe1aaY)Vy*4u_W>o+2sc+S0F{t?LPe<)u
zt`7c!TnCS2L7tN@M)1HT3=lkYJMJ%hwDm%=@Udq?{NQ@;Y``u=!t?z_1-r_UMNj-2
zFrvbs4nR~CO7$0`_V&RBo`%aX;^M<5KwJ{(xLZ>Cn@5V|8N#<o@;oL?k@zA44wt?>
ze<4NsD*k$twCqy0LRx+`f48h6u`EUQI=SJA%*C0ckX2?;cgw48aZ}`P@5q|u@9vru
z^6Fg20HEfP>vG<@0$(gphYC{y=+ff>iu#uqQWftju45GqRoO~K<GXuV{h0c)RAm#U
z0jtE~JCsUXD>XocCvj6%&7CrAT8k$rP!aka1J$iV9%<?}x-U-M&J0tjiJaqs8q&mt
zQ#TyB*KwK-Ubad@7UTy8w@nwPX+HuDIJ>q>eYQKQ8>9y6dW_sk{05T@r|VlW1@7rv
za|{Ce9T?7815SQ;aL~S24N}~q?q&^bjZ1Iq-Esx5r+OnR|E9r_LG8rtCFzU9{s#Ea
zNDx`Q$Oxqc8JPR0(haO|Io>dO*sM0NBRB3bx^2r6P{t5`&BiY=2Q|j=*yue=6X)Y@
zEKSBIH7{{5-PU~I9`RgVnocagVVX&9Y&OlNhx~hNE{nFu%)2#pgFF?=Yc?<3HEYcL
z+>OB&!J};%7GZ&3i$#PwsI`boql2xImvI?ZX+=_tRaSLdYn9g^gO`E&@{DB#rm<yN
zi6?89RjssOo0>G0VYg{I<t;XCk6CNe^=}MW0f)9_uITB0gq20+LEVah6CJW@oQTVW
zA|(-4O}yK>RkHvYvSyK#XIeNwBVlb>P1dd1KuXB3PF_KY_En3VU|(A?>+E(DaBLNZ
z=>NtG%yo*X`DU~GgAEa2o*Syh!4D|$hy@>bGHV<U(g$2~z=v>`TBm5lp!*x}k$+6>
zra1bbM;G`w6jkezgrIoMg8AXhTG!ijiqA5LjC84ULn4NL^wJj~V(Q$>=|jE|`X{ld
zx~+|f&jA<ph4IWf4>J98aE`v{stekahM?|!qemsjpuMK()UYo7(<~I)TaKVb%zmpc
SzQaWOnCY}%7DAn1KmP}?vbGce

diff --git a/theme/images/bg_tabs2.gif b/theme/images/bg_tabs2.gif
deleted file mode 100644
index a33af092c29fb0f2591e8ceba30b25dfb21daf59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmZ?wbhEHbWM{}^xXQrr=FOW^r%v6zef$6a|F2%Xdhz1L%a<>oJ$v@}@#D8|-`>4@
z_rZe)K=R3xCr_U~y?5{4ojZ4cB0!ao9zD8$|2|OT`}glZeE4wT!i9J5-T~DBbzQu8
z5y%A^1vKRI=g&WX{`~myBam_B%9YcnPyhb?8)yhnBhWM;dHwqJTeofjMS%8RyLRo<
zr%z|ko&}OX_0OL_fB5hrkbCv&)f+c%0J%Uxprv2Fe1U6G{K>)q0y-c9<R=EUg9m~*
zo0)jo77D!ozKGXFX@;NJ?AUeJW6mFXs%Fu-L4sLhw&A2LvywA*d$#VFQ?lZAe&3$D
zt1o^Rax^yS2)DLrad&pv3HJ7BicFkj%|CUTDc8(draW`!$qOu8Bqh3ZnH1B?RhFw(
z$*o<veuLfyCYG(+H|$)yd)3~R`?u|IKjO}KTvpfZ_!(K|GiTH<95=gs?fQ+Iw{G9L
zd++{(hmRgVxpnkNnxwKCb6Tq8+jk7gpBSXS{`mRp_n*K2{xdLh$#`r~IH15_4FI!H
B53T?J

diff --git a/imageset/de/button_topic_new.gif b/theme/images/button_topic_new.gif
similarity index 100%
rename from imageset/de/button_topic_new.gif
rename to theme/images/button_topic_new.gif
diff --git a/theme/images/button_topic_new_r.gif b/theme/images/button_topic_new_r.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f42efc0c87bd560243db27c42e564952fb92953
GIT binary patch
literal 1921
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
aTMuU(H5IXUPXsf^N{aWOZ`h*25B~$}p&TIq

literal 0
HcmV?d00001

diff --git a/theme/images/button_topic_new_w.gif b/theme/images/button_topic_new_w.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e51e9a2570e05997b0ebeb2e224ef460a7fcb836
GIT binary patch
literal 1869
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

literal 0
HcmV?d00001

diff --git a/imageset/de/button_topic_reply.gif b/theme/images/button_topic_reply.gif
similarity index 100%
rename from imageset/de/button_topic_reply.gif
rename to theme/images/button_topic_reply.gif
diff --git a/imageset/de/button_pm_reply.gif b/theme/images/button_topic_reply.gif.1.gif
similarity index 99%
rename from imageset/de/button_pm_reply.gif
rename to theme/images/button_topic_reply.gif.1.gif
index 34d8309577ef29c6e5025abdf5714c2228046f05..71b83c4f1ae541826173925234878931b151edd9 100644
GIT binary patch
delta 18
ZcmbPGJ)wF7Co8L=g_V)zW<J&?3jjKT1!w>O

delta 18
ZcmbPGJ)wF7Co8Lwft88DW<J&?3jjJC1zG?A

diff --git a/imageset/de/button_topic_locked.gif b/theme/images/button_topic_reply.gif.2.gif
similarity index 84%
rename from imageset/de/button_topic_locked.gif
rename to theme/images/button_topic_reply.gif.2.gif
index be914ee0c7f2dc835835c13820aee6c6af9bb056..71b83c4f1ae541826173925234878931b151edd9 100644
GIT binary patch
delta 2208
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

delta 1988
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
W!@v@lCy?J6_`nEGaDoLA5CA*4`@d=c

diff --git a/imageset/debian.png b/theme/images/debian.png
similarity index 100%
rename from imageset/debian.png
rename to theme/images/debian.png
diff --git a/imageset/debian_hell.png b/theme/images/debian_hell.png
similarity index 100%
rename from imageset/debian_hell.png
rename to theme/images/debian_hell.png
diff --git a/theme/images/feed.gif b/theme/images/feed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ff199058747128b999ddba87622625f1ff435d2e
GIT binary patch
literal 1089
zcmc)J`A<^^0KoCbMhG5Rm>Oh@Lzo32v_NU0?YLfBP#8*Zas)OB8Z_9k5d#ARx%wza
z=>e2tDUfva7{_oj$-?HcJVx9hgSbhFFc&H9E3fpX$7>(7UEDvh&tLHU<$E^w44rW~
z1PB4JHNZ2<(D$)5ZJ?t+#nn&L3t0%n+#65R-;7h=0?{7Ub}w_Q1w^_)T(j!vPxeTO
z*118)0M%<lyf&TBj_T?Xb={yrl)WR&Li?CVElCT3W{9+2ata@3xaV6?0n2u$3Lj%w
zdy{RvxLpBN%dfO{#yIX@)pjuL-}if_KHmSC=NO=w=4DPf8=o#SG{<6(8gRHv-$?Yn
zg8jI2TT)~apTh(v@#haU+)RAF-nuw#8!55D6J{aXGf{#zB>Me6r+|P@6nKV7x^CuX
zQ-&8=G5jF6^nGCDlCcNZ@ezvi*RR}9WX=Ja&uPTIYxb_s;iC+Mf59cC>3B?!@+@*A
z-YreqD2ddzp4$~9I>lt9osK>3#a3o884dj+9u*g;>*+ROs`Hl#*C0(-L(qLrFmuVS
zVVYH%VI9hF%jkxdq#ZGPN5t}))u^Npd+`+Q&U60p$kY~()I|9_F3Z!oZ9Ws}1ht)@
zcW2G{cwq14!mgs+K9uoyX*f2TiPlD0p=fOl(T`cQ9pIjN$<B+|TN?8^&1Q(QRZT)Z
zi!?z=n(L=5@O_iAVY3<3^b}~gptU>U)zvs`khJkhEXrr1qVujHic3oOEQ<CO89uw-
zYf;<!lC4n8t}w-Li)?^WEl`{W%Jc24Vluj=o$ycjNuS&9RWI5l>04DXUe~S$Vw%UU
z8I?^h%cISUlU|F)Eo1B}(v9#P$84**^8M{rrdyusnJmNa<!i;o_!!-Nn~slAEfdZ9
z@g^&u>Xf9I+K86lzumX!%n*6KD14j8GPYCv{{j9#k)FT+09XTvuM=KB0R;PjnRH5h
z-cd!+@lf}l1r=|JF0J96vvAOWpo;KO?%S#*egb{?K{YJ7#tV*)`H5P~4uX5$R5ThF
zie{p}iAfCp@eOOFNPhSPM;rD$r+E2bdc+BK%4T7E=Bm6dC+pL~NlsQ-T@y?k<OZz-
ztKJFZ!VgQ6Cl$)OoOh2D$8w4f9n<s(IsM#-uqzcEy{!E3^ON<^3*ewi@%6fLOLFKy
zc3sttqUF`-3RU%i>8Oan;R5PZ7=!wyJR<Pf6vBU^0FH+yOX){0E-&0oQ?-YE2%avT
z%~sXJ_ywU@8LTqb<zDGpJsL@QhL+wl4iXZU@*6pbW;q}+YU8)?*o(1Yr!W1LHg@x}
Z>Gpev1CCXa;T!-8lqHd7LqmYne*wqU8j%11

literal 0
HcmV?d00001

diff --git a/theme/images/forum_link.gif b/theme/images/forum_link.gif
new file mode 100644
index 0000000000000000000000000000000000000000..50a3ac12b2b4e0bb400521069fe71a136acac659
GIT binary patch
literal 708
zcmV;#0z3UjNk%w1VH*G&0QCR>>dMZ+Nm=*w^y}v4{{8;=_V(b-&hqc?%XWd%jg`q-
zY1)&X^5y3H`ugeP<8^g)`}X(w`1tJS=kwg)<h{YVDLwJ*?BB}Fwj43((bMkO+TqjG
z>B7gjB{}>0`|IW9@z>k*@bLQh_{LXe$X{*5Qen<zbihMZ$Y^%RW^>15ap>XU@a^pK
z@9y#L?)LNZw;(nA`~36p@aEv(0001)nVIzQ@%s7t@9OIH^788B<dY^e(l$))>FH)>
zX4~H5A^8LW002J#EC2ui02=@s000L5z@Km^G$cwDOtMl+7>H1)fz(kfI3Nayvru$M
z&nOWAGfg0bbSzDPOiVC@SeQBi*0FrdqhEUfCn#blBNGIBH;Iahd;}mPf@3Ejh$134
z9+{dRiF_a@azYyz03IR{1qC7vJFTue4FwS*e;6A=DkKm$1p>YztvtfRBEAJT5F{!;
z1|1-=zQz&L5yLzY(FF}49R>&_0tGKQ<mKVP!Ug3oy(9<$3&l3`^z6X}>GU=NA`1Z>
z93t2_K#*V#0l|Fj;31&k0UHrGbbz6ufD9KHF}?`)!p24(FEYB2Q9uKX3K|5oV8N25
zj2t|2$Y7CUhs>5NS_sfkfuiC73pj!beRv=!QK3OC?1a&QLIDdsqDq}gb*fSd72v(F
zAfanl8Z;h=ec-jM1Pd?xAy7b2!hp8}eAJjb7p`3i1Qj5-P$5H(9y$UG9!xlJj~p2)
zT=<czMT-v(B7^loxiXE&4n8<mCJF|H5IA(K7)`n~X&pFnP_Q)wfgKq=9L%6mxps{i
z4tmG{6lw^H5*ZG#5Iv)~@fj<0usD#RL?kG6C|Eeq12XB%Jq}o)a3aN=A7n^mVBolg
q1;;KJWFQgedyx?xMkJuXAp-yk3E+<i<Gx6O081zlfD>~B0RTG!SU&y$

literal 0
HcmV?d00001

diff --git a/imageset/forum_link.png b/theme/images/forum_link.png
similarity index 100%
rename from imageset/forum_link.png
rename to theme/images/forum_link.png
diff --git a/theme/images/forum_read.gif b/theme/images/forum_read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..989282d083c799c945612c7166d9be609cab9871
GIT binary patch
literal 662
zcmV;H0%`q6Nk%w1VH*G&0QCR>_Ui20m7e6i!u|aH*|E0Ec7gHi?7>D??&;~rR%Ytt
z<h(RT-^t6$VsPE0tNZ%;`1khr^z^<vP5Jow>%__1tg_gkr|jqF_44w`ZF%h6-u(Og
zx-37#P+#G&w)61t`uX~~DLw7W(9(5+=;7h<<mTYFz2&jExF$OJ_V?zty|*DY=i%Vy
z;NNw1b?D;Z?%?6niIUf+t-wD~^6&5I<Kye*=JxdT@a^pJ?(XmE>h$sP0001)nVDv0
zX4~H5A^8LW002J#EC2ui02=@s000L5z@Kn9tYkV1&Z3hc5TDRrAv7BWR1{U9G2;}X
zPsSoa0SwOQ0YH#gFu+od$~@TE@0&B=g!)1YGa_{l4<LqzAcS@lGk!xR3xXRU6P1>i
z6CjHyZ$k?w8xIo@5Ij6Cs4k?d6NM)WLj?%{533M9J-NBIs}BGPekc^RH^s)s$i)y3
z0vtaU2LKZ{7}Xf2KH1tl))+Sv00%M|BNGuj=;`X~>JTXn88Z$k7&P|wJlgs__x2bm
z0S?H4up@`Tg9sBM+yTMEf)D~A(7-{lqQ#3AX+RJVf`bVNIdq5|NwOr#91Ry72mlg+
zOPAQRy_|_4M}&YG8eqtAp=Y#DT)KMr99k0tJZL3$Ah5x-sne%S5$q@-?gt717<AZB
zz%`~m9$XdJ(1F2(GbtTle7I1ft=qS7FYJH;%u@v#1{9DWkxyT?9(xt!py2@45C&I2
z;85^_h2zJMUns!wLBNVmu_OpEXoCcc7N9}1AYlWqfCY|-6hPqsMh*iPY`C>?!2k^n
w7FMJVv&4f20||9#@X$d5W;g{nNN5nlfd>mQ8c6U0CklZh(<Lx*0wxFmJ4G-!Q2+n{

literal 0
HcmV?d00001

diff --git a/imageset/forum_read.png b/theme/images/forum_read.png
similarity index 100%
rename from imageset/forum_read.png
rename to theme/images/forum_read.png
diff --git a/theme/images/forum_read_locked.gif b/theme/images/forum_read_locked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4412e2adda0c81f8b66c781a6639fb14380d4796
GIT binary patch
literal 681
zcmV;a0#^M;Nk%w1VH*G&0QCR>-^t49<KxO`b@1)%%*e;(yTEmIb<A~ul$4aQu&~>v
zt>dz|xhXx1ii+#T%kAjs*OQ#>-QNEF{<}3t*srwf=H^&fSiwbBy>ffz;NbiE`o~sf
z_UY^R_x9o2+xPVJ)z8n^)6=+2Tlx6;@9OIE@9*{U^8EY!UteE>f`Y?PUqnMh`0MT7
z*xCB|`t$Jc@#N;dJx=-e_rbfn)S{^N^Yg$zQIC#}#K6Gz^z`)c@$v5NnVFepW@Z2Y
z0NdW<A^8LW002J#EC2ui02=@s000L5z@Kn9qzF_K#zZBc5TDTBfnhs93XTOtU}GGj
zPrzj3U`fvC6RWV90Kig4!7Mr1@24|s;f)?H4t5$EE`^3JgLV#8PX!YW5`-g@l$9ec
ziVSZ<6ALFAGNC>`2Bij}s4|2L6GI0Z92y<79X&j^x3sz%92;Lh3=W_<#Kp$P#Hs}h
zKQtFCGBqaCCZj#q*gn)IH8LC*3IYcsA3Eme=;`PmG6Gx*GA1SS^FG-3JoNJ>G7uMX
zGIZ=1NU)&6f;wcd0$5^z!-o(_ka$p`;sc2#IxJ(bpu-M{AVX3Nkimn=3;`Yt$ieCY
zjSo8>$dtKa1rG$bJcIx-s^`am5B}Vlh&l5?g9J#Cf*^1W*EJpPoWamRv7*(A0a_5i
zVQVIj9x%WGD`0{|g#c)4HfV68Edn1ry!zlH<ba9@RMF}s=>Y_e8TMxO@ZpP-f)YE>
zW>~SdaRVNsaE)p}1c00u14w4rtdjuXuh&qZNa5qjffxk_p5+|kFWj3q8l)f%Wr~6b
zh$&_WvDF6x(H4RmC=Er7iUkn{#N185$J*JZi2Gp>LjVK_6d+(g(X;ysI6{mdQ6d5Z
P4G`!-glOSGNDu%!zuZTG

literal 0
HcmV?d00001

diff --git a/imageset/forum_read_locked.png b/theme/images/forum_read_locked.png
similarity index 100%
rename from imageset/forum_read_locked.png
rename to theme/images/forum_read_locked.png
diff --git a/theme/images/forum_read_subforum.gif b/theme/images/forum_read_subforum.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a3a35da9bf7d8c9debdbb609133ccfe2e6a16ba
GIT binary patch
literal 725
zcmV;`0xJDSNk%w1VH*G&0QCR>$!T}#<Kxq#sj*sSjfRHb%FN@u!S3nl@$K!{m7dzv
z)T&5U{{8*#+uY>U*5k9eytug9rmWF<hS{&QyD~+<M_8z*rgw95>*nUkc7gKl?#5ba
z`1khv`ugk4(f9WC_UY^S`1!glK**Y)>&43W?C$*g{L|0QxhXyR`TF_y_w(iE^Y8D(
zP++toH^#re&V`P;I7;N;-@iUkxF$O4z{avPMg05w_44xY?d<mS^z`xZ0001)nVDv0
zX4~H5A^8LW002J#EC2ui02=@s000L5z@Kn9oB&!B5v2u~5TDRr1~ro;3^hXnFcW2>
z&jMvb0x`~L6R6gT6~I!_qjWae@1}F<LHj~86&?&GHytU5h$$U6b|f=?Lk1Kcgef7H
zn3*9dj3hK~Llh5%Dy2L;7pWJetSW{NF+&*}ARQdH96mj}ySTm`ARB%(H61EC$jQpf
z$SNrYB0mBZCC50|IHx|_+&tJgIw~L)5dab)A3N&n?CtE~09+9&I2!i$Jly&{_x3m{
z2`Zp4pkfDtg9s7k$Z-IJ!vi@E?%?o%!axoh7HZVkP=*WzCj`KV-~fXL4hB%j;eg<P
z%a;uUI5_cQgNqgtHlS$XKu7b%3JF-kJdnzQg&qVbNI-L@hSGrXaI|#j&;kSqM@2NS
zbE9jX5@P^NTd|`d)c`V1Kp2pLPzV(qN-e4(BEk<E25`g-5a5Cj0vBAYNWtNhDh`K4
z7?9E;01FI!(JH_yq7)8Yye6suFhWR-2rLlrm2m;-g%})kAlSHYq68R13gBgtgYQfT
zJy0Oap^e)P9RL!@nqdHe1`HoxSeS$(2i1qyP=FGWfkuP|w9~Eypw29Y11xsH*Z`$K
zj1~_XAXi&K0*m*?!+VepCWD9>8(@qWkzoPxdmdy!!E|64(S{2)EU-WfE>Pe?3;-xF
HL=XTwyzop4

literal 0
HcmV?d00001

diff --git a/imageset/forum_read_subforum.png b/theme/images/forum_read_subforum.png
similarity index 100%
rename from imageset/forum_read_subforum.png
rename to theme/images/forum_read_subforum.png
diff --git a/theme/images/forum_unread.gif b/theme/images/forum_unread.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a397cb21697b8e1cf170c79895099c149422eb0
GIT binary patch
literal 667
zcmV;M0%ZM1Nk%w1VH*G&0M!5h*_NlqTz2j5@yvjg{r>*x>+ZfaR^;aD_U!NM%hTe*
z%gTI_*v-|!Lt?~CY2v%a_4fDNpRfA*`|85X^!4}6Zie{z`N?;U=jrV7^YzPPedV^o
z@bUA&JY4JH=G?Bj+^Dwc-s9A^!o^Z=@8;>@<mleE!s)xl!bfHBZ;pxyDB$Af`TF|%
z{QTeH=FCfK_xJeIuDkQ}_WS$$(x|rK<LK}3^5f;{=IHD6_4e%T@b2&N>g@0F^7Oqt
zTif2_A^8LW002J#EC2ui02=@s000L6z@Kn96kP(1P9ty;5uecCz%Uv_PLmU$;^+*b
zPewzNKoHJo0%D?RFu>Bz$xLY3@2xXpWB5WBBMEgg5-f&?ED|#<GYJlULkbOoGb|RD
zn3)zViwOpALk%Y_5*9EpDk?9lFQ={+5)vB?LjxKJEHDteJ}JJwyTK4J5(pZ81_=@{
zInB<`(9JLw6CFP^0SGWM8QmGFKH=gj-Wf6$2qQ5U0~QoL@bU8V^1~Gu4j>j8HvRo7
z;sU1d*DnK%2qWac=&_@r!-o(b_JA?Vzyt_3bZFeju_H$t5GEMt@BqRN9w<|)T&Z#g
z1QQKLM4+&vfK8j=#NFIkU<U=bgcm9>#6Xm2uU{#OD(%_h9*q$sdKADxwW`&tR15SV
zq3(wP1sQnYI6yXMKow*U;NX$rfi)=sJoLbDqpsb%cro<wa4ggZ8v+iLC;>2FxD<mA
zH2i>q2!pR2bR4L$qOxVnH4f<Dpy1P!0S**2#8F~}i_@o9l)wR45+ov1K7;^_0f${2
z7zEe|0iq8a1}FlU2q6HXju0jSH~<AFj)MvSK$rlr1%;R9P>cjX;UoA0Ct!jA06RN%
BL<|4`

literal 0
HcmV?d00001

diff --git a/imageset/forum_unread.png b/theme/images/forum_unread.png
similarity index 100%
rename from imageset/forum_unread.png
rename to theme/images/forum_unread.png
diff --git a/theme/images/forum_unread_locked.gif b/theme/images/forum_unread_locked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..34f1d46ad76d7826d739a5bbb7d772e1d2bb488c
GIT binary patch
literal 677
zcmV;W0$Tk?Nk%w1VH*G&0M$PLs5Mc@OKIrp?fLoo)79A3tGMO4#KgwR*qf{4=IK>c
zRqt+%h=_>h!p!UK@OgQ8#awp%{{GK^mgeZ|)V09%>+bB!)8XUiMMXu}&DHhx_uAdy
z^!4}4V||sCmC1LF^7Hl1(bmg<l+JF3@bU9qU0uLDT<YNE#ZqqX=IP(z<-ESZ@9^@9
z2`Kyg{QCO)^Yr%j_xQbYhrvT)`0en_&Cu4t%e{e-^!4`f^7QWS@x44-W@cuYnVA3p
z0NdW<A^8LW002J#EC2ui02=@s000L6z@Kn9q<kPV(+u*V5TDSWXcv$m3>E`o6flXR
z&&;f2p+(MU7p>8mWx!IC!R)Hr>t~w58x^4}5iT!-goSkj7ARjtHZy>N1Cf%G121(J
zJ8wfX29Pl^EiD0~0iULoF$Ob3A{`YkF&eTv3$?Yeva&HR6&;H^7O*(O#5l6W#k&nA
zKLsci127=dAfY?g*e%o`Fas4R1s@Uv969Fa=;`PhF(V(~134`7^DWr-3-t3KF$fTH
zF>>e_NU)&6f;m#n*wH`(3kMJ*N^~GVz=Vqx9k9^QV22zHIwnf2m_WsblPVGjZ~#LU
z3Irf4%Cv@U1A!Voa^`fv0Rf7_4<iK1tVqk&f)EFI@aVx*X%2VJQsl6BvFgPOH<R{|
z*@H(4a6cG=a4;c(S(-ZlsP(b6Vh<mCgouD}VyfA@2`+3vy21w!nLK>>+En0S-V64y
zseQ|qX-)=2GMH#U!olGSdI=op+f`|a5)6Di5fPxlzzLX5@@?#af$ImNNAD<bf`tx?
zDm3@?@VSHn1+b%tfneaoKmk~Bx@Pd8d2ldO0*pX_fC7RWC3I@X07r-sBs-SKC=jB2
L2m&XC1OWg$f%;0n

literal 0
HcmV?d00001

diff --git a/imageset/forum_unread_locked.png b/theme/images/forum_unread_locked.png
similarity index 100%
rename from imageset/forum_unread_locked.png
rename to theme/images/forum_unread_locked.png
diff --git a/theme/images/forum_unread_subforum.gif b/theme/images/forum_unread_subforum.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e9558870202c090a80837c7878a33e17ded43cc7
GIT binary patch
literal 725
zcmV;`0xJDSNk%w1VH*G&0M!5h;<v-bNN4lw?bofj`T6?JjGoS%tGzW=>Fe&}<>}?s
z+p@E^r&MXjTzA*i+ULQ`sF<ItXL<ep{>*BE?(gyD=<Dg*;n&X9?aR})e2ew=_sL{^
z_4W7f@bbxbjleuy^7Hk*Lt$QEVeaAP@bUA`&(h0)mG|xN#8Ph7!p!&g_~7B?@#X2?
z;pN-i;NG9F@NbU$`}_R-{PXno_3`x9f0e<(#n95$yS%^8Z-?yd@Vz`+^!4`f^7H@z
z0NdW<A^8LW002J#EC2ui02=@s000L6z@Kn99C#X`PpIJm5TDSW>42)e9@tkduro!U
zm(T`tlE@@x^Xah(UB1!}plp`e@8=WX;Dwq{7-lg9goTAMb{HsqLn$GFgNBlaG8hMM
zLm>b%geodNJ^`Wuo}~nX03kyr8z(U;8nHVtw6w6Xu_`eF8+`{DuROxT#Kpq84<A1R
zC?_g2AkiS8JJr@c(jYSg0w_i`1ROo%<mKk&8Y(#+-YOs+@bEs?^f2-8ASy2?9}g-$
z6aoqqs6z*W3J4Jtq|ie}ssj%=bSOxX;=vUz99$SsV1NPy6f`_IAV&iQ1SnG;OyHt~
zjRsUEpg7P#0gqHDUYJygK!k|$0wyv<*fC**00Jjiy!cRHpNAX(4<@u?pg@KlbL=2W
z^kIVsW-NM0MOdNbf(WfRmC_Ys>3|;)L99%Wz-NRA5D9z=B}zk#5j#>yX)uCB1-c1Z
z+`s{0#|Q#FX4UGUfkp!ZLIMovK!NTG5keX4V8Mez#ezL(Oei4a0z?uz=(c2hz`_h2
z)U5RoaCudL2LUT6#<5_>01!IJChTG15|JqbMoe5$;%oy8V#y*P!D7M$C>H`W0AQg4
zbsQ)rC?G+C0=yA>9DFgcBfx3{1~P;Q@j`+B0Tb+i2^;_%5yB23Fu*_v2kdY_2p-5M
HL=XTwA2m*W

literal 0
HcmV?d00001

diff --git a/imageset/forum_unread_subforum.png b/theme/images/forum_unread_subforum.png
similarity index 100%
rename from imageset/forum_unread_subforum.png
rename to theme/images/forum_unread_subforum.png
diff --git a/theme/images/gradient.gif b/theme/images/gradient.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d3be0d8441214d3e3db40cfec71091f8a942e5b
GIT binary patch
literal 549
zcmV+=0^0pYNk%w1VFduk0QCR>^yKIG>+bH^-S+6}^5Em_)7SXy@A>WT@ZI3@-{SP+
z=J4C!_UY{H)!6jq=<nO!_UG#M=<E0C>+<2`@!#V0<>>L<;Pm9^?bg}v+1&Z<@bly5
z@7mq-;pFbu+xP43_v`NU=jrm`<n!a_@!sI@+~D`=?C#jy_2=sI;^gz<<@oLJ?bq7y
z+~4uu;q2Af`0VcQ+TQKf+WGGB?%3P)=IQIw*7xe|>(kck)Ykw2000000000000000
z00000A^8LV00000EC2ui00jWY000L5K$~z#EE<nOoN~!*I-k#ibV{vObJ(nQ%k6r<
zudsMbE{_}Nw0ezcyWg_7d`_>=S@^tu&)0kYfPplFgoTEOh=V7Kivo_1kdcuYl$Dko
zn3<X}oSmMZpq>w-q@|_{sHv)}Ev>Gvu(7Wtw6qAfxVgF(yuH38z`!oU#Kp$P#T3fR
z%*_eU(9zNa)YaD4*CN{6+!Nm4;NczP<mD;n=PK&!?CtLC8}ah<BlYzP`1$(#0R8^|
z00CYYNU)%Tg9sBUtiZ6L!-q8@N}NcsqQ!_IGHTq2qGLx0AVZ2AIiRG;lPFO}Sjn=b
zO9n7w%A6^orp=o;P3Y8lqo+g9pFo2O75bs5(W4-eDqR|&sne%Wp~9F-wW`&tRSjs}
n%C&3P6=1`P9ZOd1fwO4Ss#U9@t=qRV;>w*%x31l|K>z?dJ~mbQ

literal 0
HcmV?d00001

diff --git a/theme/images/icon_acp.gif b/theme/images/icon_acp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..61e18bb76dab67f84e2efb9844d30e380c7ad913
GIT binary patch
literal 389
zcmZ?wbhEHb6ky<E_^QhA|KI<;JyY(VI=3t~dzz`|>1Au)Jb3i;%h#Lx4$bq9xix>)
z*1C>ErLCV|y<V4Bxiz+MwQth7?iojBEquIw$E8i%S9rvoYMQXvF6`OW8<!@|-Cxi+
zQ`i0F&V#)YCOcBfuFqV$E-3xe$@9B2sy0RBJXpE;!jo?dR0WDZSr{1@R2g(Yrh@#$
zz_#eXqymc`0X-Jpz!Q}QE#i#_1S+`fMLiT3F!Hj9I4c@z`U-WhHh2j#a4<S-{i4C}
z?#Fw^4GmK)ShAQ{n0a}bh4@&Rxk}0y_ykMK`6T&!RVDfI7)7O-*f}^^IF%Kh1o_H2
z*cf<OBqZ2{l$>}9B^cP**jd?xI5>Ko1UO|Gn4~#H*gJTOorDEs#RXMFIe3fYyuHP^
RnIFu!>nz6g%*m0#8UUtWa4i4;

literal 0
HcmV?d00001

diff --git a/theme/images/icon_back_top.gif b/theme/images/icon_back_top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d2b8f3822d5978aefb03a255d6c726bb8222b25
GIT binary patch
literal 204
zcmZ?wbhEHb<YwSzI3mWde*5lY=Ps??y6e!1)1SY5-F5KjnTuD}Z{M?V=f0mme;qq>
z{^;3DK%osg_C9<2@%H2APv3l4y?Mvo2ancl+4=wf|CJlJz5Du;0XI<m$->CMAjY5r
zQUbD*fz@+CswH=jVvlmv`H;Quzw|JzInX40fZ6mw<1uZg1p-Rz*)}CDu;6u8RCu^V
lg<<NkML`oP_O_m4den4KO(5*2jj*Fc`>Do>+gcbHtO1Z@Tm=9C

literal 0
HcmV?d00001

diff --git a/theme/images/icon_bookmark.gif b/theme/images/icon_bookmark.gif
index 380168bab9f2c35d0fd3d24af2a758487ae21ff4..2fe99c4676fca909ee455bcfa2bd929c2ebc5500 100644
GIT binary patch
delta 135
zcmV;20C@k}0onn7M@dFFIbje04gmBY0M0Hv|NsA{GCkeh-PoF-;qK${@$ur~;+4Xj
z?d|Q~-{0c3y2Rwk#puf{h&w!$OGd?7)k;+!g)ec^fhxQ~@b~c_jWEL8#l+&t9DFM%
pvp=`wzVP<(Rmo>MjYrDd>mm6B0RR9W04x9i000mG4gdg=e_I>LMhO4_

delta 135
zcmV;20C@k}0onn7M@dFFIbje04gka-0I*D4|NsAxNK@V2-OQ$}?&jg~@$ur~;=-qu
z?d|Q~-{0B3!{pJ#=+woCQY@8WJjHrOyJT^NNgmRfalB?K_w(?LOds6L!s5}yd_x?w
pVJPIuxAyb!$%IvnTsq~@)gk!=0RR9W04x9i000mG4gdg=e_MTvN1^}#

diff --git a/theme/images/icon_bump.gif b/theme/images/icon_bump.gif
index 0eedba581fd28797a900736acc2c88099d619ba8..6414ed357e20d349af4e8fb780096909285f6191 100644
GIT binary patch
delta 54
zcmV-60LlN90h9qQM@dFFIbje04gm8C0Q>v<vvGLNE<C0(J>A{i+<b=O;^Nqvpwfkm
MtR^zb-0P7pW^%V0zyJUM

delta 54
zcmV-60LlN90h9qQM@dFFIbje04gj+X0Q>v<rhbI5Ok9viQ{CO&%8r=g;^NGvtizO>
MlRr)6(AAMHW^&yd0{{R3

diff --git a/theme/images/icon_contact.png b/theme/images/icon_contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..04e4d9ad17661fd41a5fb216b62128269f545015
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9Db50q$YKTtZeb8+WSBKa0w~Cm
z?&#~tz_78e=6B#^AYUQbBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~g
zN8NyGPkFjHhE&{2nzJ`=yDc;G;Sz;wDGIzX?2mjJ7?K!;wAXySqVhzg#q-kN7e}Md
zE}ovZmVrY-O<{J*Sp|lx%8UXIK0G2!4GfEJFklc&k{`ajeEnS|yX93Smw>~9k_kmG
z{`96gL<vMT8rbtUcdcP*o-{>c#{UO5v)gX_#~JPU`9X3SONtYh1B2ne|NrGz^A=xw
zZ^#_9`%G!b563@~!{61g1kKZI)H^=$DkF=4AM*s>#-h6ov-}sXX5=tni27}MGN#ju
Q6X+`jPgg&ebxsLQ0QSyyp8x;=

literal 0
HcmV?d00001

diff --git a/imageset/icon_contact_aim.gif b/theme/images/icon_contact_aim.gif
similarity index 100%
rename from imageset/icon_contact_aim.gif
rename to theme/images/icon_contact_aim.gif
diff --git a/imageset/icon_contact_email.gif b/theme/images/icon_contact_email.gif
similarity index 100%
rename from imageset/icon_contact_email.gif
rename to theme/images/icon_contact_email.gif
diff --git a/imageset/icon_contact_gallery.gif b/theme/images/icon_contact_gallery.gif
similarity index 100%
rename from imageset/icon_contact_gallery.gif
rename to theme/images/icon_contact_gallery.gif
diff --git a/imageset/icon_contact_icq.gif b/theme/images/icon_contact_icq.gif
similarity index 100%
rename from imageset/icon_contact_icq.gif
rename to theme/images/icon_contact_icq.gif
diff --git a/imageset/icon_contact_jabber.gif b/theme/images/icon_contact_jabber.gif
similarity index 100%
rename from imageset/icon_contact_jabber.gif
rename to theme/images/icon_contact_jabber.gif
diff --git a/imageset/icon_contact_msnm.gif b/theme/images/icon_contact_msnm.gif
similarity index 100%
rename from imageset/icon_contact_msnm.gif
rename to theme/images/icon_contact_msnm.gif
diff --git a/imageset/icon_contact_www.gif b/theme/images/icon_contact_www.gif
similarity index 100%
rename from imageset/icon_contact_www.gif
rename to theme/images/icon_contact_www.gif
diff --git a/imageset/icon_contact_yahoo.gif b/theme/images/icon_contact_yahoo.gif
similarity index 100%
rename from imageset/icon_contact_yahoo.gif
rename to theme/images/icon_contact_yahoo.gif
diff --git a/theme/images/icon_delete_cookies.gif b/theme/images/icon_delete_cookies.gif
new file mode 100644
index 0000000000000000000000000000000000000000..df2a09330e6618f063441783797aec2f73a93896
GIT binary patch
literal 108
zcmZ?wbhEHb6ky<E_{74n$SLy2$It)&|Ns2_<%K8T7+^s0CkrD30}F!=NC2dkf!WYw
z*PV3=``E&24YNJnf7~w!Y)qJS@C3t3h8>#M_N~b}yMg!NR-fk*{2B_gax5mRC^9lw
F0{}*MCo}*6

literal 0
HcmV?d00001

diff --git a/theme/images/icon_download.gif b/theme/images/icon_download.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8488d29d3560985f464371df93d03eccefa5ca0
GIT binary patch
literal 198
zcmZ?wbhEHb<YnMt_`(1J|NsBr#cXmewB+Bve}Dh}{qyI~@87?F{rdI&`}c3(zJ2}r
z^~;wppFVwh`}Xa#XV324yLb2Q-5WP<y!recteXI#_>+Z^fkBu-2c!;UCj+bV0~21S
zOs-}PF2~nwO;#HNV-Fi?zqPiT#@G?S;k+@bKSe08VImVxd&n(?1$8V(lV%sJn%CZZ
UP`i5DI-`ribHg^fDl%9D0DtyUSpWb4

literal 0
HcmV?d00001

diff --git a/theme/images/icon_faq.gif b/theme/images/icon_faq.gif
index 9bd3f1d5793962f934b745d0ee71070a0c3e0987..d9b7cf171aa1506278adfee4c597209f24654ad5 100644
GIT binary patch
delta 135
zcmV;20C@lZ0sjGiM@dFFIbje04gmBY0M3%0?9|wtHc!Wln)Bo4#)OjNyur0#a=C7Q
z+NZCSB|!M`^P@yts!wFxx4^JkZmLpe(~FVSsk6Xvec!aam@Y`acZboLq|=?Ky-{1;
pueY)^K#dqQtR^!5|NqL|>mm6B0RR9W04x9i000mG4gdg=e}D*uLskF)

delta 135
zcmV;20C@lZ0sjGiM@dFFIbje04gka-0K=W9=h@teNnN~`qwwbFxsjaQ!^ov@f2(|o
z(6P9GI#2iV^pRF*nP73%zQv$wdYNN$#hIYZvAVH;i`TrvghE!ag_6dkt;wgcsAh1~
pxW1Z9Sa&W(lRr)W|NrIC)gk!=0RR9W04x9i000mG4gdg=e}G0zM05ZE

diff --git a/theme/images/icon_fontsize.gif b/theme/images/icon_fontsize.gif
deleted file mode 100644
index 1c7d83527c4d2fc19b338b0359c3b4f7089a0d2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 559
zcmV+~0?_?ONk%w1VI2S@0M$PL(c<ofve3ZR=bysbb*aj+&EdJy<j30T$=mA1+3D@`
z_>Q>L!`SG!(d2!t&B)v8yVK>S#@)!>>W;Y6hO*K3`uu*b&hhs8smR{m>hrbF<Kpb}
zz0~Gpp2W7$<DkOZinY?t;O(Kr+}P&ut;^rH(d3uC*XZ!}%iZgdy4Aka=G*D<!Pn^Q
z^Y_c%?6S?`%iimEsmt8x@vF(-wb0_P%;Cn{>hJaW@b>w>*5<m><(j|Qzt-o%*XaNM
z|H|C!A^8LW002J#EC2ui0384%000L6z@KnPEE<o<q;kn@I-kfy#&=;Dd%oUNcUk#Z
z2qM;(Z60jCiDIM`jyvSGQXo?}B$bkzOrQ|rSaN|v1{E+SG(IQ?KLtJn0|o<s1&(E7
z1wRQPJ|!3;J{u~H3j<m`0}GWFWCmmwnGh#rv_3otJqCihsDFH>2su6^F#!$}J^*q@
zy^p3pJpeu;9~coJEjSHJs1(mX95)I(S`RZ4J}!((xorp@3m`QQged_LR!}_}8u^+H
zFCeUgLa?C0g9sBUEI4T4m@-YIQ1J(i3>=6{xOf4x=aHW{OU|TO)5Z}bNtBk*v4cks
zsb{EEEh%&;(IRNNhO|?%sne%SP@|GGtf)m+Ei$)~SUN?fK(JxOjwM@GqyQ@)u6)3X
xHm%yVY}=4D`z0XUxN_&x4ZJeRS&w(|=GD7Lk*&8j`}z$@08k*eoC$*f06Re~Aff;O

diff --git a/theme/images/icon_gallery.gif b/theme/images/icon_gallery.gif
deleted file mode 100644
index 95a3c52361b9aa2cac5d82aca35035a2f3ee4336..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcma)5O=uHQ5FVkFR#bWs6$&E79$Np%2u3}$AZS()D~MS1&{BAKEMg(Y`jZlrLaY+<
z4wXej)`PGL)*L)66?L@(2E7D9h!LdVC7wi4#&5QI_dVw4&F?p}?6Kfz{@`REZKChA
zc9`rEF+=_(a@mCu3WG5@Foy^{*@3|TABf1~Iymrh?5&h%@}?QH2Z-5&Wl4y4$Z(nP
zsOz0G9|Ej^cf7Ay%NJ`zl3mIdLl$5VXVEZP26A8%rqS7uSv)$yZeYAH7iL2=x0c=)
z$`Ltaft(SEI2tQQP5@dMb^{M1pRGh_4<G<IQHh<P3+!&97GJ2vg3<uw1&xW6#Q$R$
zLA+s6KtOv^%&Y(fD=VV#Fv0`1A*aK7F|3nfg=$lYcUI44a->QoVa@zV0z6e)jzXP{
z5?Nb}2+)JToB}Gmt{f+%UTq7wXqIV!;8lSa@X%hd8xSm9iBl}Vh7_sQQ?KZYI$+oV
z0$f;cgh>OF+1R3D@Sx&&!DvEJ(qI)#%kXBJ32SYH84R4DCL|(UoHo~z#Q>oNDgm(-
zQ)o&_qor6DT*_&)rARj&04*OtnyppDAqTYD>7X{upiT$e4nEKSoE<;9))9T6T^4Nr
z#AweVJ?ZT)#NpD&>Bfs22d26YUE(wuI5K!=G+6)n(eW!+-#jdRYs?H6=B@`r=h7q>
z&A;CeEH9V7zI^bydii7fchG)y^7-80`0oDl@cC!cBc=G(nT4HuawAV$xhOY~R+fMD
z+`iwb2K^gLV>g%j7MF@s3zg07zPsCl6W7M?P0p;m-FC5b$`6fgo!|TJ@y}2DzpQMj
KmV3Lq=<pv?yvND_

diff --git a/imageset/icon_gallery_locked.gif b/theme/images/icon_gallery_locked.gif
similarity index 100%
rename from imageset/icon_gallery_locked.gif
rename to theme/images/icon_gallery_locked.gif
diff --git a/imageset/icon_gallery_reported.gif b/theme/images/icon_gallery_reported.gif
similarity index 100%
rename from imageset/icon_gallery_reported.gif
rename to theme/images/icon_gallery_reported.gif
diff --git a/imageset/icon_gallery_unapproved.gif b/theme/images/icon_gallery_unapproved.gif
similarity index 100%
rename from imageset/icon_gallery_unapproved.gif
rename to theme/images/icon_gallery_unapproved.gif
diff --git a/theme/images/icon_home.gif b/theme/images/icon_home.gif
index e539dc3e59381978f371307eea7c2f855ee88b40..8f743a2284de759ed6e82dde28ccbcf613d0662c 100644
GIT binary patch
literal 204
zcmZ?wbhEHb<YnMtXpv@^X=HRNA>rkoJ#UU5e|zG@yEA9rpFjWM^5u_Lu6(+A^YiW7
zpYPoH^6=r;M~}WedGh`F^Y1TS{CM^1$LrTW-@W_w;lr<wAAf)T{O9Y}Ki|Lq{qf`9
z-@pG+f#OdVMlJ?<1|0?<0NKgF>iIyui&3CQgEJ#-RaQawv;v{|>z{F)`FnAeN25W-
zov>M+OpO*2O70Fz4@PJR2{+`3b~?!MiDiW@^idP~m@)Naf}Yq`FYoEC3=Gx)>AH4z

literal 306
zcmZ?wbhEHb<YnMtxT?VL>C>k_fBt;<@ZsCHZ(qNDee>qcj~_o?ym;~U?c49)zyJLC
z^WMFCpFe+o`0(MCD_35<diC++$M^5w|N8ao?%lgzzI=K5^y%;4zwg|+^W@2sckkXk
ze*F05%a_leKi{6yGF{E*|Ns9_FI;7yB~bjy!pOj&z@P)N1mq_MHh+f+0XIIDw0SIg
zp6sJ#e?e^%hpkKhdH*AUJDOI=A4n<^jF~>4ae3246NdDD#=wdkK9>HHlMD_ll0F{Z
ZY@Ez2B2CWTjErJJTwPvOQ-T~BtN~gBdAk4r

diff --git a/theme/images/icon_logout.gif b/theme/images/icon_logout.gif
index 39d35bfa93d732cbb7fa3db7d0f1513f3c8a789f..1f59911ed269af32592995781f0550a6a50af7f1 100644
GIT binary patch
delta 135
zcmV;20C@k~0owt8M@dFFIbje04gmBY0P4uijvF`3kDRk(cE^R2%Z-|uFiN**d5|4B
z%$TIHU2vqNq@+Y!)1|P;hm`5l*yF~`>Bh^sa)i2Ve#w%coj6d<k)FkalE{#ryL5%Z
peT#*Kh1T2L(uIuw|NqL|>mm6B0RR9W04x9i000mG4gdg=e_Tw%L)QQR

delta 135
zcmV;20C@k~0owt8M@dFFIbje04gka-0OZcocri!7o28_3fx42NznP?kL|CYIg?ckd
z!lJC9ZG5Dpq>@%>%C5G&lb+?*+uh93;?2>le~qhriNBnuic4O?oTs>uo4uQ*u7QuW
pik5|ih1}cL!<3u<|NrIC)gk!=0RR9W04x9i000mG4gdg=e_Vq#M6Cb-

diff --git a/theme/images/icon_mark.gif b/theme/images/icon_mark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aeef65f212691997e656e8100f0a4ad8748360dc
GIT binary patch
literal 360
zcmZ?wbhEHb<Y(Y#_{snR|NsC0_vg>w-@iXRd~$o+z6tWyvvl2O7<ewQ58GAJy050^
z%=9Ifmu>v<{Pji#{muMVTSXmqNI375blxTBu}#ixx1!fU<B09<DHk(aF6FdeE$!cw
zQgNeh+O@XXkLGW9v~bhAV;5c?JOAa*qi+wNzrFq7=i3jDmu`EydiU?o-~Rsm1+*RP
z3Ni`BpDc_F4B8AjApIaeF|f5Bm|74Tpu)rHnrNY-W6^tQ!IcL(9KI~h0x!x~dzw9V
zBvhPd3}$uGD%kPj%hQh?8d8Ope;Ylg?9!B0XH+gOk#lEe)DYnp;}fcuXZEO9Y!jZu
zsOnk4s3lp=FCWY6l^-WtvV@UI#yd4#N+FJi+leKrATEI;VuycVaA>%XldHR@x3eRI
FH2@<pgH`|l

literal 0
HcmV?d00001

diff --git a/theme/images/icon_mcp.gif b/theme/images/icon_mcp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8a6f6cbc78ad35deb38f344bd1e8d26c4fa5c2d5
GIT binary patch
literal 342
zcmZ?wbhEHb6ky<E_-fAZ|NsAkC9TuVebxn~@9mrR=HcVnhF;6#bMK!%w<WgV&!0b^
zKYf1x{{7AUN9Oy)E_IH2cJ1Z@tH9ff*1p<(=+&!NKfivxJZ0hi+qc){SO5C;Yh6Lj
z(b<bG^v^lHeC?BsyI$V8f3k7H_N3Cc2aeyEv*OvaXK&xWef;?GBt@HLaXFt~zj<}<
z!Jh8PPo6xvb@SFVP3PU2)w{bUZ>(&2`SRtH$4~CuzH{^D&FA+YTzK-00S8e0$->CM
zV9uZek_Y*Tfvxz!?1C8<s%<BhJPA<bnRMYG8$*FpJ2O**%4)U+`qQTcW>4i}d#V^3
zxglfvjK|$uGFFIO=J_bmxk#Hw#7u*imz}A^gV}&vKu}PCfwePGf=_{;gKP3sPcb=j
g876tj$(i9!j7(Zw87rMv%g)<iF03f*<j7zR05Ha({{R30

literal 0
HcmV?d00001

diff --git a/theme/images/icon_members.gif b/theme/images/icon_members.gif
index be91d2606eb6ffea32e5cf65e8d2f2543615992a..60819e8c27ddd1cd3ac7f5847dd07bfb9b197236 100644
GIT binary patch
delta 135
zcmV;20C@k10*C^CM@dFFIbje04gmBY0JUj+?c3kGbA!&5pxMyU*Q&FVB|qD<yW_ye
z=FHOJ;NhG%PpegGr%GVQh?R~SH^6+1$BvuOnx*N*%c4P7pgdEvVsz@r&G+x|^5o~p
ppQ*cwmGAHG>FMeJ|NqL|>mm6B0RR9W04x9i000mG4gdg=e~E$ANag?l

delta 135
zcmV;20C@k10*C^CM@dFFIbje04gka-0H=3`>fYk5fsVtUsn^of&a=9HI#1KP!Q98p
z;nCIL;Ngi%U7KZgm0WGRl%IGoN3)5RyqTlMq^{!3(U4PRjZa~uae(B`)AjN4@8{{j
pr>?S-obT`N>FMeJ|NrIC)gk!=0RR9W04x9i000mG4gdg=e~GO0NtFNq

diff --git a/theme/images/icon_notification.gif b/theme/images/icon_notification.gif
new file mode 100644
index 0000000000000000000000000000000000000000..01dedf65a5825b33873999e48b3efcb0376b0ca4
GIT binary patch
literal 551
zcmZ?wbhEHb6ky<E_~y>ACB1T)cj7YNqzfxHzJ2?4ikjmhpTw1c>1U=dIkR%pzPjGi
z(-z;_d-%wVMf+-crfInxS+H_~tmU(_m-n<yy0~!73jdV*`;MJju<H8S?T4BtJveY;
zLqhTMr%zV}rJrBEafx@r=jShvc22*tV$=0Q$Cvvi-QIqnU&ef?Phzj6+2)L@r5<s&
zx9yv25%BcX#d}9j-`aa*eQd$&>vyJUyS{(%>cz$D=hkk$vFGraCF_>^CBM3Qdw+f3
z3cr*!;W^LGU72qaeCOctWnKxpyQeP=&G`KJ^S^)pe*gac=g*)2V8AdGfZ|UUMg|5C
z1|5)NL2<&s-qPUF)GWrTW7*u<sj4O5Xd~3s$>(Is!on*kGRZ?pO~%>P)mfR}c9H?7
zvzv>{VqwWiqGqn{+t!&gOk(G8+qTV3ZdaGA{=WTg%!fN2^o}1m)uqd7?6Tk8&0eL`
u#9G|-+I|;j4Ml|}b~be;3r#C7X+|b_HpV#;+#K3-x}=Qk3{_Z}7_0#`F1R`X

literal 0
HcmV?d00001

diff --git a/theme/images/icon_offline.gif b/theme/images/icon_offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5dc4212e9fb77a3cc786423aff56e74adf20d00d
GIT binary patch
literal 322
zcmZ?wbhEHb<YwSzxXQrr|NsAg|NedY^y%;4zaKw-{Qdj)uV24*?b_AX*Z21A+y4Ik
z9Xobhy?XWY=g$od4JS{YJay{S+O=yRJa};Y`0;Dku4QLu&zUo4_3G7CRaGxuyr`?I
z+puB7)2C059zFW!&!4!sxScz9?%ut7-n@Bl-n`kmb?cckXMX<t`RLK34<A01m6a`C
zym-r&EiYfboIij5!-o&gpFiK(+4=qZ_cd$Q02MG00Th3-FfuS0Gw6WSg8an57JuMo
zj{t)NGt0v>0t+TYO%FO?Ak4xy;bKFn0540!^&=klT6(mYBm*W`^l<R+RImu`={jQK
x_P{2{jayKIQ&NwI%ZP!OjYCY9huc6(jn|l!S%FVpLYtY@D=dYP$;pwy8UU%{mc9T0

literal 0
HcmV?d00001

diff --git a/theme/images/icon_online.gif b/theme/images/icon_online.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e015910c17b567b16d414b49cc250b434c1fc55
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VG95Y0QCR>|NsB~{{Hgv^8Nk&`uh5gj*kCofBXCU)mdu)ZiC`q
za=N;@wY9bXa)$Bo@$>WZfPjGeXnnZ2xbb9ptgNiXU2Dl(YoDK=c6N6EcZ=;~ceqz&
z|A3N@T4K-7&zxj!<zI6DkDvXGoz~XY|Av_Hi<y3Yers!MkB^V{XM60HqNAgux`K<~
zW_Mm*Ui^HI>4%m7d5rpKeTi6K`T6<iV06cspvs@6dU|^8aDvRt%&l#8uyA?uWqJQ~
ziSY37A^8LW002J#EC2ui01E&M000JPz~9di02l)f;g1j)F)kEcfbbIp7B`g$#<~my
z0FNz1;=~%fg>hBlWEzP`3t}w1d<jFOr#Kl=IR-K*6Cf5CMiM&{8Z`<C9TWf$1O*=z
d2pcmdG!H)q0}Bu?I1B>^N>)Yy0Rlon06QBwo+SVP

literal 0
HcmV?d00001

diff --git a/theme/images/icon_pages.gif b/theme/images/icon_pages.gif
index 44cc34500ec4fb84b2ea7289fadd2d312d143491..20b2fe9f81188990aa2c46a12592e41c8d1e56a2 100644
GIT binary patch
delta 22
dcmZ3^n91Yr>1JV>$j!jRu!vzIkJQ8zX8=9>1#SQU

delta 83
zcmc~?&dB5L>1JV>$j!jRu!wCUkCe?nD;sD3fJi&%{DR7&%=C;B1tS9k6NQkBRE2_!
k0w*U0_oDpL0v!d%oE(K9kbJR1P-<~%QCVt=-b58w0Q=t=+yDRo

diff --git a/theme/images/icon_pastebin.gif b/theme/images/icon_pastebin.gif
deleted file mode 100644
index eb8867005b24ca33c21a706e18fd0354aa403266..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1006
zcmW+#ZD`GL6h3P!Op}n5<)wTOY9CJ7v@}wNBtEbYNWw|EB5kQjUgiUdLbFbGXYxg1
znwy)q)|!~LpSLt`+r>1tB`(`t_u73qp5Om`JDqc$^E}V_{VLb4E?c&93QeUXk@;|D
zY9?lEMm}@SoSGAJY>s?UovE6NDVvh-6=$L*V!|fmN7)&xu^6*40m;Z2sgW455fWen
z8dw-cH~Bq2)H!jEog=>%nW|H9%1+6%KvC3*IAJH`Nuih3u{dVO1dbSWq>jW9JHl45
z1{g?#C1|0B#lQwMurN$skk1jK%Btk`VJ$Kd6;>fH7c5X@QD$X=dXPe|k|?nf<iQWn
z#5C-Hevp7dum%`NgC$zQ1B-zTXkd|d&X<uRScJTh(1*3in1u<xLM~XKD8xeW5l+JZ
z@IpI`hFVw&KR^@HumhYR7z)7}U?7c2&;k!E1~#C{pU8Kkj2uC@7>tBItVPD;ABXof
zxVJ9`C-gQ4SMj}p(cbmIJ3kuO;g1j~^hg0|f0KZR2M(a|9B?I=2Tj4MToBnzHuv-I
z*tg+dtBy2mI(M_`QtO7g@Yeds4vp@-a({RD;ofU)doJEMeXH$hPi*srmcz}F@T0EQ
z=Wjm_3}v(9*=#12O7?x|$fT2*@r30vxol>zKem3stY_hieJkczF83!MPp8v~L;_EL
z{=b4e2&E<9K>knA#BQ=lnW~q4?REKGM<-XWDegG+rMlov!_bunCkG01(>vE)tz4P8
zJ9c)kq-kZ%$jET_i36Y8_V?26#mV^WXec!;_GHVQaCvR~S<mCHS96bF|Ma6Le_nNC
z^!moUgQKM-y=8~`zTO+1*|M#i`ro~Xl)l_nL9y4Z`x<`lt*9MsS010SXlZCyfBp9f
z?Q@pWu}I$Kwdac~LW3R4x4&<RE!$t)`85A^YT={m*rziys?Nuwq2}~hceJRfqNcF(
S#PnoQ<Gz~PU1ugwr1JlKSrRA!

diff --git a/theme/images/icon_pm.gif b/theme/images/icon_pm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..909de277d057c61ff40e5a72fb30683768e4bc1a
GIT binary patch
literal 576
zcmZ?wbhEHb6ky<E_!h?S_s^f1b^+_cQ!ih>yeTH<)#Im=ZM-iXKJn+*uf5fsb6r9{
zfB5+K&)<uOj{o}k>%)tehZinAuxR<a*RQ|6|M>d;!!PeXEN|(0`RM75(-*$JefQzj
z>-*;~Jv?_|@BAgNpT7A0<Hz-rXMg_q@$1{S3C1oj9z6Q<>-Qp$@I@YxC%5hX@#V|=
zr_YWpTlMhr)wj=IP7O(V_xjDMpyXwKF@Jvk>@#-#`tJS9dk>a2w4L9!>*T6+KfnF>
z_y7O0vYMR}roMghWK~e&gR|$Sh9tas{&M%E>0g2F{QKwfk&|COe){+4@B3G;KE3~V
zYW=1qezDK*KYIWA)$boaPj20Hdc&5}>o&f9_3Ffl6a97p8$;6mg8{<;0mYvzj0_Cn
z3_2kDL2<&sKDQyfskx=Kt-Xaaw7aLbhclcdZ1R+;Q&_^87>uS(^<!WPH?S0u;hDx^
zuO)96?#*Ljq3t|{Um#G}-7s7&j6+gZ%r?x_Oi)xcOg)@yvaY|EjkS}xhT~+eaK<n<
zc5zMV039V(Ue7Sba5g?y)-Y}lUny=YId(<1aAOG{7yTdxMlS{jrXwBN4l6WbP82Nc
T)@EMjF~_6uQG<3P1A{dHx*htL

literal 0
HcmV?d00001

diff --git a/imageset/icon_post_delete.gif b/theme/images/icon_post_delete.gif
similarity index 100%
rename from imageset/icon_post_delete.gif
rename to theme/images/icon_post_delete.gif
diff --git a/imageset/icon_post_info.gif b/theme/images/icon_post_info.gif
similarity index 100%
rename from imageset/icon_post_info.gif
rename to theme/images/icon_post_info.gif
diff --git a/imageset/de/icon_post_quote.gif b/theme/images/icon_post_quote.gif
similarity index 100%
rename from imageset/de/icon_post_quote.gif
rename to theme/images/icon_post_quote.gif
diff --git a/theme/images/icon_post_quote_.gif b/theme/images/icon_post_quote_.gif
new file mode 100644
index 0000000000000000000000000000000000000000..daeec410053c589c6fb12f68ab18475cedf990bf
GIT binary patch
literal 1362
zcmeIx|5MU;0LSsS$_jBMYSDSRl02I=m!@vHb=T<76w(1s3q4C1$UvQ|#lq~1Md@^x
zU-A@1p_t&8tTruHuFO8BMGzxJWiY2=sC@AoXyMmj?YI3Ad;AH{*S%tK2ctft9srww
z5df#t>2NsSzJ0s4wzj&uy0Wseyu7@$w6wUmXt&$nym|Bb_3MR&g;m?a{QSJlX0uwY
zb8~aEv$HcZGgDJj3+8Ey#bP#_O(v7kXtW!QlarG(hKYB^$Hxr@gMHXw(Z5<8HjIsp
zS%=5;dj06=sBu_t(EU9>Fr?GzCi}G-jmD-N9Pb@8EBpJ^{U&Aq%(LDR#Y>e+rBo=5
zkU}PtSs%(KI%Vee9{ul6W~EOc2pYK$8SZutNgs{1b&R*POQlj>%Wos%Hof4MR(Nx;
z?nYBn(@=HuU%bXXexpPp5sSszN{ObTez5%Kp%Rh0^tw<e>?;x0)z$I&d`(fEqNsYH
zkl$ZW^Jji#FSl~w>{a!d^0KnB($dnt)1|$+C4HPLD$bQZe)vhrE>@o?Dkv!6a=F6{
zuAG_wl98{Xoqfp2Q&RI@Q1ax*a-SdN$kI;flG*a)6FE6K&%gRkmYDO5^lesF*4^Z+
z9%6P6A&bRgY2sK624gV#8#<l-^k7C$481#sMx|2I)6=`K)U>p;zK9ekD&_HBGPIZc
zc<+&<q$CoFL?jXk1j6kIf+QlLV^;zmkH=!M((TcL?fa{|LZ5-qCt!Cc`1k<`X$HX(
z@SzCor~!c`0R3+6|NXZB+Tn%$K7-26pa*bRY-T_#E`bQp%P<!NaDou<&c8<ia0hU@
z`^UA4x-P+ecBMrj!GRy&55x<Ckr?k!Ho7z~iMjQ%GS6;GrmMIRf#bvzaou+sUQ~zC
z6ax2?dSv`zCIBK+MS&1=3Go45+T2$k;&fT^k;_$EYc`UQ7*WgMP4eB$Va4VtRU|$L
zjbPI-6}XFPSQvEg_R#&~28GaL3m}7vbsHXhjY<?@P#dAPXl;czjMovoGy4Y8HI%nC
z!f~-Z>>8rVBaoa;J4uI$ytK)+(V-qNKRe7df^wid=#YO3;tr&)_CGXFPEDkDZ8_A*
z={`@|_vO_fUh9C$?Tp-YyzrV^I_6v#vjKw+Kte}dF3%A{9IWLWoRYJL*NMeE-v1~M
zK7l@t^c?M2vGT56&i5R907ZiM0R08mSxWI%x76^$3p8>#<&sY%S&Q%q)5O6yqjtz(
zMDm@OK%}>6^b3$mc~y*Rw>}TtEnwn&ckrn4;_%b}gI827Q|`atpDOo4O&5thQPEVn
zdl|Cu6@jt=Mp@?<y)$DQuXoSWO_*#-u`j8XT3mT7M?X<T&XhOsjxu%Y`N8qFAn(gK
z--#lSXYCT^hBM^8+on$&eR+C!)A|dj!!g&-o-c>{oeTdIyZPdIeXJx`?GC|%=q=_(
z!6}QmNmQ81Z2&bC%Z=v77E8;mdlt(Pe^?uP;FeVLc~)YZS~B%Z$1FnqE41#T=~lP*
HU|`=rZs<!g

literal 0
HcmV?d00001

diff --git a/theme/images/icon_post_quote_r.gif b/theme/images/icon_post_quote_r.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36686b314f90e1ea1a48708d5789e2bdc0a5f3cb
GIT binary patch
literal 1362
zcmeIx{WIHl00;0-h=-WlBz5a_+6!*08LiTdoy|o()=fo9J=9801k=XD#i;fsjZ)Op
zG>fRDLo!d*jR~cUug4TwN+PLD5e*^~@f6}AX20!^*y}%dzu))vzU<}v72XY)0tEm^
zM@L$%_VDoV;NW0?e}8XpPovT7?(XjF?5Nf1?d|QYt*y<?&HeSwjg5`<^>vj>wYIjl
zy1Kfuva-Cqys3P*w6vsDDi;?Q6$*t~u2@)DSdq^ko12@H%jN1R`I7AI&Xjz1c2+et
zE0f7)W@Z#qGP(54#`vUEDqRpwNF<VVzIbj_tmKPCLeU~$v@$q4J^V@_5b%fj3TT+e
z<Ec7$^Ibe;TfeNmca_@<LD2MbNZ#Bv$^CP-sdKKrjmzaq>szMTO)_S~1na4|ysoCE
zX0o*QZ+i7uSv7~lVYAs2G>)XCN?cqySx_M?{DsA0jTNxU%gf8k$|O1E!#Snn*=3?E
z#_J5)D3vyT_b1_<;-aFW!otF_+l8ZP1!JlCg4F!KQu6rZTwzj9R#q03N}VE7hhj5c
z5i<l)cRPsbe0=&yWctvJw3pwd^1^?R29bw?l1L=d%c}`I9BDA%R(yPXb5MLg_GZ6-
zd|X_d#3znOB#J#^2n51_S9HH8q0ci4kH<$uMD)1h!^6YJ977@J&~B#?$SI`TDL61N
zFd!fRi^cl;`#*E^=Q#Rx+W7hU`ntQjb1glXmaab|&kut0z2ICIuzLY)Yk@TfoUH(#
zGJsV9usELkfB$X3LW^`yj>eOt3Fy=~axB{WvL6;$Xy7m-a0G0@v44*O47K10VeZpd
z(UWO-!Y16=1h_pgw(@0Kn_xb4eIM3eYnoZbEBauj*ix76mG4Ij18@8P_;sYzK5Ce$
zDM6pW-AV(XB94~B!eknq_T|=&RWWU@8MP44B5_YVe0DJ{_2Q=?&EHR@r^MhuxoZ+?
z1O3qY%0r`XolVF+I)IdkqNu(+hwX5A&nIoNmGt1n8J#;om2$P_N{R^qHh{VhbD~>b
zchG@QC#_2Ckf)#l6h%;y5=g&U(-S)c>_-wQW>EI)j}4ES(?0Tsqsp8S4#ydgR{6HM
zt+stRtf5ONvi56DYThvEek2_y6(m?8>=Q@@l`i_y=6hOPh&{mEGcYwrGYTslPQnf8
zjyY?$H3BsqcCpdpn{JIB;|qnE9vlarV3+{iLpAoLP>ksl7XW<qbRv|D3J-}Oo?;Ra
zR@Ko9UNF%Gszs)O_7NIx+sdHm=i67obP_^|6xfIxMV@_WD;AI)4Dq=pqubVf>GX>x
z%osZyV;qBUK+n^3%oT$P4sF30*hW(OY)WX@HB9tj=+1TBX9%T~X3Swk>Ld;-@jud$
z7$_O>roECt6Pp2xSbm*bJTN!FFcEDCN>=_E><z3g%?T<f3A0wRT|A8-jy_yghkfi7
z_8B|x@$>n*+UokH`i9n}`e1XtPtwL4xRUhoM@>S`@^76&xbSyK|MPc^a6LG1`3Lol
BMpgg-

literal 0
HcmV?d00001

diff --git a/theme/images/icon_post_quote_w.gif b/theme/images/icon_post_quote_w.gif
new file mode 100644
index 0000000000000000000000000000000000000000..daeec410053c589c6fb12f68ab18475cedf990bf
GIT binary patch
literal 1362
zcmeIx|5MU;0LSsS$_jBMYSDSRl02I=m!@vHb=T<76w(1s3q4C1$UvQ|#lq~1Md@^x
zU-A@1p_t&8tTruHuFO8BMGzxJWiY2=sC@AoXyMmj?YI3Ad;AH{*S%tK2ctft9srww
z5df#t>2NsSzJ0s4wzj&uy0Wseyu7@$w6wUmXt&$nym|Bb_3MR&g;m?a{QSJlX0uwY
zb8~aEv$HcZGgDJj3+8Ey#bP#_O(v7kXtW!QlarG(hKYB^$Hxr@gMHXw(Z5<8HjIsp
zS%=5;dj06=sBu_t(EU9>Fr?GzCi}G-jmD-N9Pb@8EBpJ^{U&Aq%(LDR#Y>e+rBo=5
zkU}PtSs%(KI%Vee9{ul6W~EOc2pYK$8SZutNgs{1b&R*POQlj>%Wos%Hof4MR(Nx;
z?nYBn(@=HuU%bXXexpPp5sSszN{ObTez5%Kp%Rh0^tw<e>?;x0)z$I&d`(fEqNsYH
zkl$ZW^Jji#FSl~w>{a!d^0KnB($dnt)1|$+C4HPLD$bQZe)vhrE>@o?Dkv!6a=F6{
zuAG_wl98{Xoqfp2Q&RI@Q1ax*a-SdN$kI;flG*a)6FE6K&%gRkmYDO5^lesF*4^Z+
z9%6P6A&bRgY2sK624gV#8#<l-^k7C$481#sMx|2I)6=`K)U>p;zK9ekD&_HBGPIZc
zc<+&<q$CoFL?jXk1j6kIf+QlLV^;zmkH=!M((TcL?fa{|LZ5-qCt!Cc`1k<`X$HX(
z@SzCor~!c`0R3+6|NXZB+Tn%$K7-26pa*bRY-T_#E`bQp%P<!NaDou<&c8<ia0hU@
z`^UA4x-P+ecBMrj!GRy&55x<Ckr?k!Ho7z~iMjQ%GS6;GrmMIRf#bvzaou+sUQ~zC
z6ax2?dSv`zCIBK+MS&1=3Go45+T2$k;&fT^k;_$EYc`UQ7*WgMP4eB$Va4VtRU|$L
zjbPI-6}XFPSQvEg_R#&~28GaL3m}7vbsHXhjY<?@P#dAPXl;czjMovoGy4Y8HI%nC
z!f~-Z>>8rVBaoa;J4uI$ytK)+(V-qNKRe7df^wid=#YO3;tr&)_CGXFPEDkDZ8_A*
z={`@|_vO_fUh9C$?Tp-YyzrV^I_6v#vjKw+Kte}dF3%A{9IWLWoRYJL*NMeE-v1~M
zK7l@t^c?M2vGT56&i5R907ZiM0R08mSxWI%x76^$3p8>#<&sY%S&Q%q)5O6yqjtz(
zMDm@OK%}>6^b3$mc~y*Rw>}TtEnwn&ckrn4;_%b}gI827Q|`atpDOo4O&5thQPEVn
zdl|Cu6@jt=Mp@?<y)$DQuXoSWO_*#-u`j8XT3mT7M?X<T&XhOsjxu%Y`N8qFAn(gK
z--#lSXYCT^hBM^8+on$&eR+C!)A|dj!!g&-o-c>{oeTdIyZPdIeXJx`?GC|%=q=_(
z!6}QmNmQ81Z2&bC%Z=v77E8;mdlt(Pe^?uP;FeVLc~)YZS~B%Z$1FnqE41#T=~lP*
HU|`=rZs<!g

literal 0
HcmV?d00001

diff --git a/imageset/icon_post_report.gif b/theme/images/icon_post_report.gif
similarity index 100%
rename from imageset/icon_post_report.gif
rename to theme/images/icon_post_report.gif
diff --git a/theme/images/icon_post_target.gif b/theme/images/icon_post_target.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a2bc2a2c4755690afcb6ce9ede9d80a966f58ac0
GIT binary patch
literal 124
zcmZ?wbhEHb<YwSx*v!CCUS9tH|Noyqe;zw_?BBnC@7}$8^5n_q&!7MP{rlz1m#<&H
z9zTBk@#Dt~FrfI8g^_`Qmq7<405XGtMRS9x!^%Cz8QqOyq3!}4P7HGwaPd?zdKJmE
WX)}5*<o}k!)6BX)nA22=!5RP=Iy1Te

literal 0
HcmV?d00001

diff --git a/theme/images/icon_post_target_unread.gif b/theme/images/icon_post_target_unread.gif
new file mode 100644
index 0000000000000000000000000000000000000000..65d47bb900833396380c61d5fae00735130f1e4a
GIT binary patch
literal 89
zcmZ?wbhEHb<YwSxSj52K>+Ab}ZrT5Ei(kR!3`junCkrD30}F!=NDQQwfmzOj<;*W_
g5B5f$wf7Vno;fXVJ@mjf%wk69&P^GU1vwe40j6vhn*aa+

literal 0
HcmV?d00001

diff --git a/theme/images/icon_print.gif b/theme/images/icon_print.gif
new file mode 100644
index 0000000000000000000000000000000000000000..766cca4d2eff84bf802dbec56347a5344ee2ebfb
GIT binary patch
literal 204
zcmZ?wbhEHb<YN$E_`(1J|NsBLxqS8O3zwD|*)B7-TVd|F%E^19cgU{9%;k{@d(-px
z=ad{StvS;*abr{4quu)+?K$w|z>ycH&Td<=^61W8e}Dac`SRu6yLV5XJlW9D05lD3
zDwI(C$->CMAkCly;)CpDVD)^U)|ZkwFJqTrPV^iXh0`oOcgua9ykF~2xR_+5?I)&u
xDD`B@tFW2P{h^gc8eJTGmn#h1gxC%?UYx<o;h8x>W0UVR&4UY8Eq7wD1^^2uS*!p6

literal 0
HcmV?d00001

diff --git a/theme/images/icon_print.png b/theme/images/icon_print.png
deleted file mode 100644
index e832d651dcae7c7b58dd59251a4346c13358d6ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 859
zcmV-h1El<kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009bNkl<ZcwX&R
zJ4jn$6h1fJs7qo%h$)gNh&YHgDuRPZ9zw;(RH#^Rb7&nDEOc=YDLP85L!lsA&>@40
zE-6A4r7A8CDx^>(Drz(M!bHu>{Qd5MXmZ6^D5Vs7;N#psmvg@FJpM~0Aq4$N(*S>$
z;6H(!eCX`#v}!aOrzA;7@IMf6q+ob>IQUxxt*xzEB<wYt&Aqj?wQ?j9p<pmbmzS4}
z{{H^!tE($NaBy>Ta{zJ{pa?;DS|L(HL&FnzkIiO#>U25@frLN??4A#WLIk1|0XQ@8
z?i$8I;_>)FWo4yK>gwwH{0vrIT}`oA>=w~zRDDhmJ?a-07HD&GlR7#&gj`ZmVh3n>
zd6^6b1A&OENK}#x{FeNz7Qxur*`cMSC90{ZiRb3#Y9tI+w6(R-?CdNB0s(4jYNENh
zIXXK#qoSfBDkvzR{QP{%%gZAKkWQyllck&&7Z+)IdYanX+gX6r+}tec>+7ksw3M>5
zvuSE-iY6u|NC<Hc=qqWpS~41qWHOnU++wj1;+0s&?(QzP$8NXN*47qD4u?aiTjBHh
z2*j)aTf-ik#RI;$xS-S1Q#w9A=68xUHa056jLghT_GM*dw6U>4GA6DrnO|D1R!*3V
za5zlZ66MT<Fy5y9{r!~qjEoG@>-Ds^w?{GpQq;?`Ox@kx-0wtE_y@7RzE0{K0F$Cx
zkBkI4L}XR~6_$~ak#}`<bw*+%CQz$Ske;8PbHC9A)v%c$hVVDZLzL#{=f8+Fh9L{A
zqCk5DS|i5B#^OCaJ>l~5@(5ZgDk>@jE|;jPsuGytdxYG5i)LnK+$}9Fj>NVAJj4f{
zdEZx7R=#3|y&!x|M5aV1P=Vq<0VF9b<KyEWunDiSva%jc49|mgxm;_ghKh@eZGC-x
zk+h%d!^6Xuqobof;G5g+{_gR34pvuJ&$hR>BYwYMpx1oy5`J=W(&zPh^P%*4y5zSN
z3=R&u;0tk1ASXEhi2}emc07t9h6V-(^tk0Out94Cdz3(J_&ghMSqjmPLL_D+3m6(2
ldV6wm@{xYQ{{4RyKLMHST)n;3T}uD}002ovPDHLkV1mcRk2C-P

diff --git a/theme/images/icon_profile.gif b/theme/images/icon_profile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..96696babd979d2aeaf60a9606564a852a24bbcc1
GIT binary patch
literal 538
zcmZ?wbhEHb6ky<E_~yd!|NsAYcOQN}bz!ct&yJL`iSky@x9;tgH2Zk`?6I2eCnwJ@
zbB=s<<>tBW83&steK~t+M}Fh_kj!1htv^41eRTB9!-FUGRd?^tZ}@ut%9k@2cNMps
z@0q!`s%xHA&~#1bUthm{eEjUzmc8HJynA-$@*HEIiHbI-nkK9X&-wfN&yy497g`5h
znYyS?+I*Qy^x0X<zr1|YCuR2H!quZyT~jq(Zq8kKpuT^9ZSUV-zt46|J<-sAu4_iW
zjQJ!*+Z_dsi|j&QUb@~dV{vlg{2Lo~Eq9B#@Z=lAPy>oTSr{1@To`mf4hO{v1ABRc
zOH;FjotC9!b5}Eqlp&89J4bgjuK>dg20qRyP25~F85o)8y3Aj=c&U}`!r4n*ScL3(
zOeZbXR@GCIcQTfq%daE4P}!P)ijmmD83MfB5(WyV88mgfP1G+lXs|MMvB^4$=$i{O
XD$3mLW)pXobFfhnRJ+&I$Y2csOD3sf

literal 0
HcmV?d00001

diff --git a/theme/images/icon_rate_bad.gif b/theme/images/icon_rate_bad.gif
new file mode 100644
index 0000000000000000000000000000000000000000..790188940877c1c9cc92c67b41b0ca989588e711
GIT binary patch
literal 465
zcmV;?0WSVWNk%w1VH5x;0M!5h1_1)*dz9;dncIPu&xV)2jhM2Wp(_Ck9svmAV1N2@
zlJa$v)MkPBdYJEblpqik>v@#oeU-&-gZPc7-+z|<lC0E$mFbkJ(T14LhnT{HlE;ad
zxs#l%l$uXRNn~JQC<ze@0R)|olLG+(^z`)Z?(XX9>gVU@<mBYx;o;ui-rU^W+1c6G
z*Voe0(yy<tg@uKAd3khnbZ2L0US3{1J3BBiFf1%AB_$;t9UU1N85R~65)u*&3=9AO
z0RR90A^8LW002J#EC2ui02BZy000K=z@KnPEE<o<q;knr!eY=F^C?rcuB_W~<+{39
zw(!!*Dz8|oR8N_5omDQCuD4F2R4UdgwQ8YOJV_@mDR?L-J3Ko|Cx<7GC?+N=i%2*-
zk|sMkn>kB5FC`^9O+z{+BqpAvKRGHSTC6`eDI_?uKQ$(|xV*T(z`?@6GBh7F9!xXG
z6$;J`2ul;r&Ivv~A<_v83l8280zOI;-w+TC2iHm$3;_WV5fl^y7UD=3@bd!_AwDDP
z0|HvWfPp{;4fc+J@KG>>4*=J)DFLvdV!|dq3KZb*kChJ&9HPlW(7`}QRu4p6EVXjj
Hk01a$`g+4M

literal 0
HcmV?d00001

diff --git a/theme/images/icon_rate_good.gif b/theme/images/icon_rate_good.gif
new file mode 100644
index 0000000000000000000000000000000000000000..935bb71937f02a50034e1bd6032d77a75caf4c1c
GIT binary patch
literal 462
zcmV;<0WtnZNk%w1VH5x;0QCR>Y-wrC$;mY?E(!qwXH!%q0R$QW1M+u)`GJe`g^uQp
zl-!e<)tH^qnxDg@r_H>*2LS@;WpVv|h}&&<>41suhmg&8f9i^p^_!#PkCxz&m)(z+
z*_E5-q^iuFq1vpmbZl+6oS)OUyGcezdwP5O`}_Cz_wn)Z?d|R9>FMR=<>27p-rnBa
z+}zmM*wob2iHV7BZf<C3XkK1kQc_YpJUlQkFfA=DDJdx?CMFyl91{~03kwSd1_l5C
z0RR90A^8LW002J#EC2ui02BZy000K-z@KnPEE<nP5_0*2m2ylYEQNwblPDAJnlzbK
zI_{4YIGw`W8100rj$*MHlifz8RH>9}w>-7(cq%)COm-<ND=I54i#$syEh;RFU_6eG
zh$}5DEiErSOe!v%FD*7UH&LiIFD|YDTU<D^I96h}xVgH!xpKKA4?egc4<W*0G7k<0
zw=yCQ#$o^>9v;V61T`KF4LkxfGb2nN3=A9`3kw<<8`nl3=^E=613vCX9To}-7Z(*3
z2`Jnn(xKnK1QQC_V}fBqf&>U6N;oi(2nLA~BG?-c#Ya5}ASW{8Vh@5xUMN$l{1F5I
EJMdn;c>n+a

literal 0
HcmV?d00001

diff --git a/theme/images/icon_register.gif b/theme/images/icon_register.gif
index 054e41d99812c80491419cefc7297224b62b12f8..9ecf126c4f04b813850d8db04112aaf01d32bf86 100644
GIT binary patch
delta 135
zcmV;20C@lB0p|gKM@dFFIbje04gka+0IIaTw8G7rx!8$~kTPqgy2#YU)#GuJvy_^j
zzt7yHuC|Ypms4_)-QC@UhKPcKf^T_*oSdAcrKLM<pyA=+ii(PbtI~Cbn0|nP;^N|b
ptlTbq&Utxx`}_OK-0J`U03rDV0RR9V04x9i000mG4gdg=e`qG<L&^XE

delta 135
zcmV;20C@lB0p|gKM@dFFIbje04gka+0J*NP$ho}CrmT;Oi;zfD&%eUm%g&~Lgq@a{
z*2T!Pr>d2ak%eDn-QC@Xg@uBGf`D^%oSdAcrKOEdSmEK}ii(QEl$()!e}I2~;^N}U
pj+n4aTzPqU`}_Ol(A59{03rDV0RR9V04x9i000mG4gdg=e`xXLLiGRu

diff --git a/theme/images/icon_search.gif b/theme/images/icon_search.gif
index 8654a4f50a1b8bb4496490120ed377a215a7fb45..da2ea712a6140f2c4dbe4e918caba249ab7844f0 100644
GIT binary patch
delta 164
zcmV;V09*gg0?q<|M@dFFIbje04gmE40O`id<-o@1#LDW(&EVG9w`h5~ZhyUUg1>f#
z*~H0>7&ML=Hjf-QmLfizDMXbgL76W}oHb6KH&35BQlUOor(<-bVsfZub*5x=v~z>B
zbc42dhrgz*z^bp>$IJ8M=a3;ilq^P*EJm3<RjEy7vvGnI(80yez{K0k(Ddc$<KW@1
SpQPU5<B^mt1Ipa%k;IBmK3E9=

delta 164
zcmV;V09*gg0?q<|M@dFFIbje04gl2v0OHNj-p9=0%h2S`)85$HsCR{|e2TAtjj@E0
z)yT|uE=71SMtL$wfH+QtKU9D`QH4WSh)G<EOJ0mkV2)8^ns9xXZ+x3_f0=Q8sDF&8
zfQ+hykh-g|ysom=%g*rT>3cRzfIw7#KvalMVVGWVrhbbR&BVvd!^YUp((&l);^E<}
SqNd~H-jS3o1Le@wk;IC_cv*P>

diff --git a/theme/images/icon_sendemail.gif b/theme/images/icon_sendemail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..be2efd98509c59e30f3b8c241bcc3a6a68813260
GIT binary patch
literal 303
zcmZ?wbhEHb<YN$E_{snR|NsBr(h+(7;HDQhPd>kK;`RMYuO8q2{N~BBT%(QkK3kfD
zcK0XknV5QTX2FqpWk=?fADUOOXI9yXCG~sfRPLQqb$R=&`=_=%IJ4u{@y$<eoO$>7
z#+B2D-aNVU`Ss&ZuO3}Hf8xvAXP;j`xqJ66&?2yf)Fc#tvM@3*s4(b&3<dd#fz8KZ
zQh|q#RR4)3MKdz2=5sDn6<HC+KV^l%!<h<e7IC<Hd$I8J_&>OOq36UirWD5r8>9SZ
g#~OEN7|1d)7l<k-x3?<@6$Au$_fMGU?#N&b0HywOS^xk5

literal 0
HcmV?d00001

diff --git a/theme/images/icon_sendemail.png b/theme/images/icon_sendemail.png
deleted file mode 100644
index b8568418ab4b774c2a6c0fff9b7390fa68b1205e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1878
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9%*9TgAsieWw;%dH0CG7CJR*x3
z7?LeOnDMC$&pe=@M2TxeNpOBzNqJ&XDuZK6ep0G}TV_#ed45rLvHxayKL!RCL6DjV
zUmvUF{9L_6kP^L$+yVw0`-+0Z<m}WEg{0K<%sg8q1qB5qh0GLNrEpVU1K$GY)Qn7z
zs-o23D!-8As_bOT6eW8*E}IG~pyu4vl0=1y+?>2(s|s5su$fjsHb_`sNdc^+B->UA
z;+_cK00rm#qErPFJwx4O17i~f6Ei&{b0bT0GaZHC#1aLs#5@Hfa|I&<10Z2!Wo!;a
zK*xZAk{uV2wkb+UvkG!?gW3t?*(zm}loVL$>z9|8>y;bp<rk&v8(Lag>Khp88yV>W
zRp=I1=9MH?=;jqGLkxkL<C0pOT$EW*l9`{U05Uf*DZjMDR!IqD5gb50mskL|D6beA
zc)(!PuShJ=H`FuGhno!4Xaf|qaxO|uEXgkl$<NQRLyHat=U`(SkWLgu2wM^QQ(Y2E
zQtg1@VWDeaq-$s#Vqj)vVrXS*7KNlAq6kg9Z+=Q<S|v8^Mpj0qQ0+*HpxSNpK>>jj
zFyK%J`3X&&P=KW*!^5kfv?vE0Eh)+RsX3{+sd**Ez%VmJ4YQPFtF-*0+{6;Q%-qEE
zRQ-aybQ^tyAYS)DTn$VXz+|ZpPnR&K!=sWW3`Dro#CV9Iw6tV#bDuv01Je#q7sn8b
z-nUb3XNS6r9NRy$_WsGhNoF!zP2;jYxM{9cTJ$4fK38t7_#gJ8?cW?-R&*$>^)eLg
zU1=`z*z?56rO)5Y@&0zxIJ>siBT2~XMYsP_`NKS$6aGesUo%qqXqaNp^>jZkSMAOD
zGyk-{;&c{bVF+T(+0v-s!F0!9U33qlXYyg?=XD&X^KP$QcSYUr!fu6=IRdi{Hkq~c
zHZT}Sn=r|he3|OCG;cwj!n%;F-!BKJZkL@TrB=DNu3+g;yW6HxPfc$~sNGe}X7&E6
z8vBxcZ_-A|t671Qf-)T|3LQmQ3-4u}3vcF9V=rGdmsLr6>AlyNat>E-4OBSCxPfJ*
z);ZP4X-}L#ub=n*cKyLOF`>d=yWhR(PB-ZI9I|(@1_yVOQi%S(u1h7?mn$0w@89|?
zt?bd3*_-p#->X*2JfB(a=i<_ut=VyE*BtK2OX@OezWr=I_T_PX(6czZ+TX|DUbJ0Y
zIL#|`t*gVwY|G|FA^xI4DFz*rb8>3_cgL^azo$N1`{~#B<;&myF$wywa;~lBX-Mmr
zkibxZX)RqVR;&{LXz)Tu|IGfX&u70+&pmKbI=uSr)2n_Te>^k&`uDPZT;^F_F>hao
zsf#w1O>y8TuyqQZba(2a%dcej7HG<@>wWWk(Z@FzCr8^0|HyfCnmK+hW5J`Ozh@WU
zel+cJRIk^n6;%z29HOD3tG-#Ys?M?aohz_xLA&An`8He2A6Ya21Bh|v6KD7H_19-q
zUC@7a*(R7*gGG=jKy=lbvM!Bt$B*$lR|l=j$+ck6+&#NK`@6jL&JTKeV)t(v1cWju
zdP*>#D9FvI_}(#1cU4|{j-B)(!?K+75z}VG?N^wRl96*EIx6GePnK8W9(l8`_@4io
zc&|!QB6;eY?a>Cueyqx|seN%uXaj?Nk2yol4Yt|u?y#vcxMh|-c>Vd=|G9tH|B}{s
Xc)HUqvf(+f5@hgn^>bP0l+XkKso8ts

diff --git a/theme/images/icon_subscribe.gif b/theme/images/icon_subscribe.gif
index dd2ea1e3fa44a26b03f28ea1413adeecf859dc41..7977b3dcd6152905b4c08fd767c3caaad78f45d8 100644
GIT binary patch
delta 135
zcmcb?c!ROt-P6s&GEsnmkKv09!|&g}&*|ALGqP=F5Wai&?u}Us9-lnB*g5d^tvj=g
z95<KMUtYeplV71<R`>Rfy>s{#cPSaJ4oTQuT7P=_y!mFXUA*$Ua>}~}l@7P{pPw>k
hb4va~udq{hUNgXe;!hSv1_l`h9gqOXPKJr~kpLw~HNyY^

delta 135
zcmcb?c!ROt-P6s&GEsnmkKu?6!|&g}H~7R%@CeS5)Vh23?wMt4?wz|hF*NDL-TUos
zA<LUOPp{uvq-IuW>~v-S;YKa%x%U3EQVZ5Kbst=~yxS|HNY!+8b!&-+#r8=vkIY}b
hq_}oMblTGkR~cYH@h1x-1A`2M4oCoGC&R@0NC1R|H!uJI

diff --git a/theme/images/icon_team.gif b/theme/images/icon_team.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0ccf369e9ed27932bf067ddfe7e873bb0ebbcae5
GIT binary patch
literal 1009
zcmZ?wbhEHb6ky<E_};?s|NsA&FJHd9`|#VhZxa=5uFY6-uxZi~?}R5O&%b!~Y)5`$
zucX=jg2oHIvmQNq^!e0<=UeyAu?To|<>sNDnG@x$`lQUJYP!7IbL2!r|L@<wuN*%$
z&njqrNaoMaUr)_lu{FMUQ-1x&<7ZE|PJVy*<d3i47TJX!?VJ62?~ysiK3`tGxv}T)
zn}<(MFI#{2;E7%BQ}#DZ*j3#6<@1;OckX_C{A_hZ&YAY96BVpi`y?J)x^B5!%&yYb
zQ}b5rC}`Z6Rx#7at54ee?fzrSgVKI|{kA)!YPycw?#$|i)<G{WT>bm&_x}8b4^N&?
z({|lo+xzI@qs3nFU(a9JTh+CzxMfXv&Ll<KPp8fwo3(U`iv6*g?$c8j_RE-`U$yz*
zl=-I@ta`EIz`pA4yVq|XsPBJx@WlG0(iw(cd$Ou0E7@MzvghybKU1|`_SW<~+p=e-
zuKSLZvXc|%-@bVH^XUtRN?YF^IDW9C<<ZeIdvoggWh_oim^WS1`NoD_r<x{wd-HB(
zc-FHsmmjX$a%;=pmzS<jR&zKzYx$EC=VzPxU3l`1VHD6e1QdU=FfuT-FzA4+1?33_
zj&ls0oIRHpIP?m+8O+i6;j+NN!n^86N0AHDWY(l_Aup5#I3|i(i!exV9yrj#5N*e?
z=Tp)FMiv!Djt+qZoC^e7TwWA#PJVKR!HA<p!R4qMH@{8NEFXrZo&)AN87nxL9`~~t
zaG%*Aq3oV8(S&)60LKz{4ms`^rX7xpmz`D+GOTOqJgM%@#IDzN;ozi$Ez@Txi-r^~
zNaSU<_R>1Tz~eAsvc3gJOhSSyS29Do#+03b4hk*2xzCn3TykuX*AS7j_%cW3_*|>t
NfPxc?qY@k#tN|<RPxAl(

literal 0
HcmV?d00001

diff --git a/theme/images/icon_textbox_search.gif b/theme/images/icon_textbox_search.gif
index dd1d8cf1adbb725beb1086d6e32f5582fc9e68e8..b3b51d8425a2426065899ca61099fa2e770950fc 100644
GIT binary patch
delta 12
TcmX@lbe?H~3gg3#s#=TyA8iCW

delta 12
TcmX@lbe?H~3gd%~s#=TyA7}(Q

diff --git a/theme/images/icon_topic_attach.gif b/theme/images/icon_topic_attach.gif
new file mode 100644
index 0000000000000000000000000000000000000000..70203124feb548cc788804d2bed349f4ff2bba38
GIT binary patch
literal 82
zcmZ?wbhEHbWM|-FSj52a|NnnuW8<{6w3#z!0@(~Op!k!8k%57QK?fuNQp><B?jgjq
bWbNJuD_9?2V%58T_N%~bl^KkWRT!)R*=QJu

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_deleted.png b/theme/images/icon_topic_deleted.png
new file mode 100644
index 0000000000000000000000000000000000000000..494b4fb563a6708b734ffba6e5674860f0c1925e
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;37XXd5kmltb-
z)%*HddFB<DB<3Zjdb-#u0Zq`$%uKOzb~1Exbu%_KaxyYAG;}qxFts#rGj%pIaB+0B
za5Z*=>2=9ZF3nBND}m`vLFhHZsTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6s4IL(9V
zO~LIJ6P$YWfsWA!MJ!T8!-RmT2gHOYTObFX@Kf`Esl5o8tao{eq%$xuYI?djhE&{|
zb7{Z!(LjmgAFK5*stQfc^K@IyQ*_$?gRIN-j2*j}H%g>@P`+z4Bj-t4pwX=}lXOy&
zgf9E4*{cV|zc2o6^VMRe&DT}G=Ty)8Jm<Zo`s`(y&+I4az7egl>*bnd*rR5XENMDB
zWc?LsVVz$an$4a**H|PS9hD>AtNSeG;Wq86Ln7~{lrKEqWfZ0A(*AG5jKi~cl`V?B
z8}%`>_3x`a9gMZNH;QTO?hEBfG$}dv^0@7~Ex&?F8WPR7&p6JZ_Ex$(?~>G~z=!O8
zF>zZDh4b!F4s4GPZ!5LY_`mIt^PERK%@WR>duLfJj?H-_#9n4$ZuQJXN2vGuou~DQ
zckVwvCBJ?ZEBD14c5<~3Ti?Ar%6UH5`McPs>@~;u6^^VqV%Rvj;)8nwBg4bxHh#xh
R+HQaf5>Hn@mvv4FO#no9rK$h`

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_latest.gif b/theme/images/icon_topic_latest.gif
new file mode 100644
index 0000000000000000000000000000000000000000..815b26927a6ee77ec6b43c5ee3900e6ce24b8897
GIT binary patch
literal 124
zcmZ?wbhEHb<YwSx*v!CCUS96&>-+!z|DQj9{`>du*s)_@zkYr4<jI#WU;h66`|jO4
z22`N<lZBCiftx`GBn&cxfkm@G*J1S@hYa3#SD2qOvP|T0ZeQ5kE}5%vQmA2zm*9oV
QfoH6FQa5tDF)&yI02$*jBme*a

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_newest.gif b/theme/images/icon_topic_newest.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fd6652d957517170f4cac154c08bda6c723913d1
GIT binary patch
literal 93
zcmZ?wbhEHb<YwSxSj52K>+Ab}Zke&M@&9m(U%}?bjvZqF1I3>#j0_BH3_2hlNG$`i
qQU=?dUkV<a_hwyjvvg~n!^+pTV1}2ARBMACbKx$5;9Y4<4Auaxlp0_F

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_poll.gif b/theme/images/icon_topic_poll.gif
new file mode 100644
index 0000000000000000000000000000000000000000..291d6873a7ac5d3ee50cb1398728f82c5b6398e0
GIT binary patch
literal 120
zcmZ?wbhEHb<YwSv_{;zT|NsB5(y?fA^4?+Tdn6|JM0)w9rv8PqX21FT9W0MRDE?$&
zWMJTA&;f~p%wS+qH8`2lG1Fq=+~;a@zo@zwCL}LhG$(6T)a!LGV~#Aae$(+ldAB1A
GgEauVODDSk

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_reported.gif b/theme/images/icon_topic_reported.gif
new file mode 100644
index 0000000000000000000000000000000000000000..006b1e2291a6bbcdcd87161f4bbb41b5384b102e
GIT binary patch
literal 246
zcmV<S015v`Nk%w1VGsZg0K^{v|NsBWUU=M=r`XKYyedt^Mr6x?l-Puq`S<w0G*$ZW
z^7rNG<gmQ_{QS?DsoUJ)^4Hz#z{}F9x4<}A&u@mtQ*izI`@Jqu?b_e(&DHts@c#Y%
z&5NG*_xIGe!`t5DA^8LW0018VEC2ui01yBU000GZpfM3-X_AwXXh7?}t&$#aLBNOc
zTu{3;w#KHlxI8|NK&yc$Ob`vghQj$+1CbWuQ0TNW6{}TJumBo@Ky*`ah^+=e3&UtJ
wC~xZ^q1bQ%3I!f{a5Odm0tSRuJ3Rmk2?L8(Ni9^9VptGHm}3P2Zh0X9J1DhzH~;_u

literal 0
HcmV?d00001

diff --git a/theme/images/icon_topic_unapproved.gif b/theme/images/icon_topic_unapproved.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fabe07ad2ace628306b5acd202e3ce9dc91cc33f
GIT binary patch
literal 253
zcmV<Z00RF<Nk%w1VGsZg0Q4UKxNCLfzr^ay&*s$D-MGB}|Nr#d-_v=8$WdU{rK{ws
zveu55)Rmow1QyF#XV;se`0nub_V)Vt_@qKl`||VOn4+yyU(juO!hng+V{z4lkN4*2
z;GCt*Tx<OM{M+8+A^8LW0018VEC2ui01yBU000GgAmbopX_Age6)Xz{P+L$PQ^`Q1
z11-l42m?#d;8_}j!Ui$;Bo3?qW)R6GHII+>AYetR4NJjr(P{}7Pr;KYvMvd;cA;P~
zCf$HWt`#^|0|5mR83cS<HU$$61qus?T0jO57!VFkkWNqq3t5?40tQT<XBh`^d?5fk
DgVS$k

literal 0
HcmV?d00001

diff --git a/theme/images/icon_ucp.gif b/theme/images/icon_ucp.gif
index 13e8b4255c934c07f923b75d92544dcb367192d2..d6a8396b3205cdcfc8ed1409da9ce08c2d4a7a8f 100644
GIT binary patch
delta 135
zcmV;20C@lY0saAhM@dFFIbje04gmBY0IE@C%afqerm*JA(c7@OxpRfoo20;ejFTik
z%ZZha8#n3G*u8m);lj%4#mlv6d!9Q|qe57-ad@jHGqhoJ_wVuQ$j$HH<GF2r-@eA(
p-QC=LhR!ZL`}_O<|NqL|>mm6B0RR9W04x9i000mG4gdg=e}85-N234$

delta 135
zcmV;20C@lY0saAhM@dFFIbje04gka-0GVQPz@DheuD9XP)zi4YtbmTmrmnMzmVP--
zzLuYOF-PUs+pva{+sMx1%+aTJg^NyLkyK`;euR=gO{8&v_3`rL&eQDT<*R#%*~H4-
p-QCKLn6OM-`}_O<|NrIC)gk!=0RR9W04x9i000mG4gdg=e}A3INRR*k

diff --git a/theme/images/icon_unsubscribe.gif b/theme/images/icon_unsubscribe.gif
index 9ae36e22c0defee665a56199e4f943d45f8b575f..a803c8b58eb10c4ab12fb2c74accbb0376adec38 100644
GIT binary patch
delta 84
zcmV-a0IUDj0oDOVM@dFFIbje04gmBL0M0Hv|NsBp-Q9@*6s9sg$cT~HnxOaY@8G+@
qp)*70%+Q%4Gm#M_uvKHIL{r$RvCx^J@7>_a-0P819FbrPk!@+D$}2Gd

delta 84
zcmV-a0IUDj0oDOVM@dFFIbje04gkaw0I*D4|NsBp-Q8~*ERaZ3yp)~HrmXew@!7)1
qj7V1E(ba-ENO>tbpJsBES7gt#xyGZb?BL_&(AAMq9FbrPk!@+Z_AB84

diff --git a/theme/images/icon_user_online.gif b/theme/images/icon_user_online.gif
new file mode 100644
index 0000000000000000000000000000000000000000..acdf38767925b40f8f5437ca4614d1540f48ad29
GIT binary patch
literal 364
zcmZ?wbhEHbv|_Mgc+A0Y*xUP9NXY4=q_Y_r7YYlnbavi9d-l<zNB?mE#h)yUTnrox
zIt)MnGJ}ET--i>P*{&9^&+a}SCQ+C2v-3sDx|~^?3|=lOJbQN0+T<TQZrh&bmsrA+
z?fO`7T8M7+N=Al+9X8<_jSfmHwAQNzHW+PdN)<ia@Wy(+)>G#NyUcc5PjzyLvfyCI
zEjQ1MVQgq@l2VK+5-RlTl+KK1V_|Q1nm9>}xn78M#)MfmqQUbQ#xLfmT&}-riO2%u
z^&5oy>q=KH7Ax%Om^G&^diu^qyG8dg6z`wdGW|UJQK2oXmkKrPD?2V0b$C1b6)_fu
zdo1@KZoHTJe2XF@E9>F7T?ekQvtIggw!q>=&gQqX8n|y9i5JYe%BSShv_b4Zo1;|I
x3-ybMeO+S4i9QvD%I>{Va+wu#IEqv@_o}+rg;-`to%Usp*Xq&~c41+#1^}n0rcwX^

literal 0
HcmV?d00001

diff --git a/imageset/icon_user_warn.gif b/theme/images/icon_user_warn.gif
similarity index 100%
rename from imageset/icon_user_warn.gif
rename to theme/images/icon_user_warn.gif
diff --git a/theme/images/icon_user_warn_oben.gif b/theme/images/icon_user_warn_oben.gif
new file mode 100644
index 0000000000000000000000000000000000000000..af85f43fed87f6198d4a30837a120a936ceac6b3
GIT binary patch
literal 388
zcmZ?wbhEHb6k!lySSrMDEFk4_dHc17{#*UC?@nLz{_N$?x9%NuiQMNLvCA=Ry=~w+
z+khi}Nf!zlFP61luIijIW5%jgtN#E0|L@<wzkmP!`Sa)3uU|iY{P_O;`?qi3zJC4s
z>C>kVA3nT$_wLP`H?Lp6e)a0r%a<>oJb7~O-o0D5Zr!|j^U9Sg7cN{lfByWLGiQz-
zJ-Tt@#+fr`PMbEZwY9apyu7%$xUjIWpr9Z>KR+!k&Bet9Xcr!!_)pNeC^fMpHASI3
zvm`^o-P1RKLGdRGBNu}`gAM}_fIP~;)^lKffrpM%|A{9CkBVHUxIRmH)WR1#MdxVh
zUqfvPpQT)-kvbc$&0L)lXSFrrxs%&2qnQD|Vuv>O`$#D%8S6AlmAdLlODiku>-P23
zyZFecsH$pf%~X-;bkdWRRa<Imx>RlPlsG*(b&ZY7H)^QMb?V8>Ywp>*Z`Tw(g~LaV
W9-ZRjd+PLQ|Jd^vE;>6hSOWml1J)@3

literal 0
HcmV?d00001

diff --git a/theme/images/icon_user_warn_unten.gif b/theme/images/icon_user_warn_unten.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e2ef6b43778862ce250baa404a65d29827b423e9
GIT binary patch
literal 363
zcmZ?wbhEHb6k!lySSrMDEFk4_dHc17{#*UC?@nLz{_N$?x9%NuiQMNLvCA=Ry=~w+
z+khi}Nf!zlFP61luIijIW5%jgtN#E0|L@<wzkmP!`Sa)3uU|iY{P_O;`?qi3zJC4s
z>C>kVA3nT$_wLP`H?Lp6e)a0r%a<>oJb7~O-o0D5Zr!|j^U9Sg7cN{lfByWLGiQz-
zJ-Tt@#+fr`PMbEZwY9apyu7%$xUjIWpr9Z>KR+!k&Bet9Xcr!!_)pNeC^fMpHASI3
zvm`^o-P1RKLGdRGBNu}`gAM}_fIP~;R(xQ7frpM%|A{98PKzC<xT+~WXyMCjVpDe9
z{BK78VaCALB<a>e+g7v4t4u1CtgJhJ-Shjw1cAx(-AmaslPcV**qND=iW*#+%J^Di
v0!<Qo3MSPR+fQKU<74P)b28!NTCsA~3ho>yAK#6eHuc4A+rGozk--`OeR0fW

literal 0
HcmV?d00001

diff --git a/theme/images/icon_wink.gif b/theme/images/icon_wink.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0c70ac23e8363ac6daf7fddc48e060ffd0225530
GIT binary patch
literal 374
zcmZ?wbhEHb<Y(Y#xXJ(mhp)e$viz)W*h&WDnOo02yZiF<{B5^BegEy0x%u*=4~Ne^
zefIwQ)}s#v9p<0A|9--nD|@fJv`pIIQ@H*7wMYN||9}1I`-9hCPuzYxciW9+yYF1M
z_W0V<k9y%N@4o!vmAiS@#TR={KK}Oe&-<^xf=YI-J8*B&j$21>yqdE9npN`Fw{PEq
zoj^XJ_>+ZIgh7iz2V?}uPYi669i|4T{;=Ta>rb$_!(+$I@+fFliH38Ra)_gWUfYI~
zjiIGG7}|~>&MfAWRa!ZTZ?|Q?`=T8JD;e_`7%JJ_l$6EA8MwIkCHf`Q-Rly2D*G8{
zdWd!APM2U16jbo!&7L=dK|w*oOE|H)k8za(tB|*>RBlt#B36MyEonZro*9b-_@sSh
Vg`{Rka>}0eadGqT@^NIa1_0Yok8uD1

literal 0
HcmV?d00001

diff --git a/theme/images/icons_button.png b/theme/images/icons_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e69064401fe7d91d13c24a263a4fd5dfe43dba
GIT binary patch
literal 7367
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
aD~I9T`rdTceTx0%2s~HTf|V&+hW!r~E*nw+

literal 0
HcmV?d00001

diff --git a/theme/images/icons_contact.png b/theme/images/icons_contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..f84abd36a5f8a25c190bba0e45b8550f52b077da
GIT binary patch
literal 8507
zcmV-BA;jK^P)<h;3K|Lk000e1NJLTq009F4000mO1^@s6666|600009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTa{vH<jsO7SmjD2Sz5oDt
z?EnDQ!~g(1rvLyvrwbO)VE_Oiu}MThRCwBA{Qv(y!%zZo^&9oXBxL6B3UHg=ICqxe
z<%{PG7VZHI&u^b+;N;-iDK06QR-a(>h!is!8JT1m7?}JR82)Yh|Nq~8W=0l676$hE
z|4jch82&M={=@jQ?ccwD-|?C8dEdUE*E46vykEQ4{_o$voQw<%e}VWHuf6?c$*QVF
zd~R<0fXaRV@fRqjIk1VCmkgwOftZ~{tv`Xd_{fT+xwsVk`~Hpj%l@5Leq6pF`ThI}
zhCgp#GcXH_F);J;G4Q$h{^Adf6(iNX6=y&GpML!t!>2$07}%K^8Qi4U8Ms&&8NLGf
zN<1tKPLk|f-KE+6IhdLLB1az(53NLu1S}Y9{xdQ#-ulDvZw)IG!zBhr=DR=tvOZ&F
zVEpl);q#Z1|2u!d)S7W-^D_V8mSOtCt?`fXcM#C)0muI}^OBa<855<%7^<Yj86?kN
zW7zrUFGB^e47d%F0|+3-n2P0Y%q%QZS(uqs7@3$rsu`FWnHX4Dm>56>#ovGb8UFo)
zg!O+=m;=TB|NF=A=kMP;fB*c+UfdqBi(UbjSig3XhJjhGxP~ml_pb~LUq5|eU<Za^
zLs}xk*N>kVc!h)+yhFnnB&8(M+f&VE5o0C`6N?0g2-9j2hd(y24>Di){g$PNiR({`
zLh>I45pxEHd-E9?UhQUS|MTxx6+UxLGc!MC;^r0;jfvUGsj2ypftB^gzi;2Tz8*cQ
z{bBQFBhjp^6|xg1bb`taAbv%s!T=ab3|xfN{Q+jSztA{l1BNFs!GM_GfQ11!)`H;c
z7q(X&wLiJctiSO2hVcG+aM$)lL-C>izkV@D)OE+OYiKVe)vX~1-u+*D3s^=1Gd}|p
zBP4tO`46GN+5JB#vKTDH*cj>zd6#)gb4HV5e&N1Y;lFSH{+krK?0xi%J<NJ4@>OcG
zA{nP|z5I6S$l<m<ovHH)nGwJ09w<D77KSN3#v#uKr0Rh<3W!;OcpDHm1F;4WKL_eN
zgRaM#vH3p>FpAh21b{Wg8(`jJWBASRiQzxvUj}9dHlWv882$ofSpV|^>!p7TEdRL}
zn1DwAWO&E$2Pl5*e*+^41%bVv6T^Wy?F<aOK%X2t%fJwv!*J@uX9hc9UjGRYK#U31
zt6wp(vWPM>voL@P17;v*VP=A4d}thi5(=yZ@gG_k{QV0o%YOfPJ-;OcqXq~om^2ee
zrD0SzKYv0K-ybjytU-~bXYH6*la9+H$xR!lYN#t@iRkKs(+eliGtVD>W9Tc%XLxr1
zK7)XWDA>I3Ks%zdvKjvW{*^bo+GjGM0J1i*PkSVOWTxxZe+(CZb?Ai>76z5{KMdA0
zAZhT`bq0nLp1ijtxfHZ6U%T`dmpPYYWe+MYT)2$a$>|VO=sy&*e!p@>`(9{holsod
z2Fc3GDWHUbuK(-TFaLkcn9A^b?`~jj`^UiW=@TT(LE-)TH`p<ZEG)o`!VEMKSZ}Zc
zD|;ZHSyhdJv%HFdM@ohfOJVQ>U#kFQ{?Ffk8RVt-8AJrRz`5?u!*>ine*Oj}oS(qL
zfCHPpck`$H|FUm8gWTfHa63Qm-1Ou{OSv?UtqX%>+hj&kGV1gjUv_03dhg1>$_NQ`
za3c8!tR$JhEd!9y7a*VE4<uMY;!~^z-esxt2oq!e%ICB5+1XgD&s;tI`{eHH8JZe(
zJV{=5%h-Xzx$DMzhC?T={&{-tpw)@_wWkRb1|C2PRG^0gGxiNE@}L4G0ZkYfc?=-6
z6+k`P(Dm3dcK#P&Py%LeE{0z~rIB^Y49{+VVK}tn2?G-gEWiC{unCo8kW%4cSk-zT
zSXTaH`2PPj!#9SP3`hRg5FOS`jEsFJRxuQs0V_EMP&*e`bcH1`Fs$CeU;?z~EI<IU
z{9|MkWdgPYfJzydfVQ)-GlMiCQZvvo%)of~2c$t5REt20872mhUL5wO85$Zg_&Av}
z@NqF=Rq*NCKZZ}=|1rGz_?2PKoH-0PZ{7qI9#{*5#Ma$LqFleSKK|uq0F^xVt~~<g
z31)_Uo3}FvN~$o3$*D6uy?34A``fn+ynF&cH?uPEi||g$?b*9@a*6Xhd;w%{YyW2X
znah8F{C&@?7|+0PrRfg?6Dvdxl=DB{XJC*KQvCJh)em8OHM-7?8!=2=T%f>VW`HEy
zzu-UxW=2jOozu$e*O%Q54Q&$&4c*PIqJmKv{Mx;X;oDST*~J319OyR&CMM(}9h!T8
zBFY(1K>;i@eqFi*tgD0>c<P(6=6Bo$0Vqxx81mvQ7=qn27`VCEz~ULTTNut>ea^tn
z#*9<%k4tBO1rsZZ7^k6`Ig5zclV6YSG5q`SotcS)^DnW9wD;OqS8%Ao8vH<q#i?;K
zq^R?}(-ma90?ZEIF24OGw&2cJqeZvBfzxEcu@6Gx9L$@8<vD%vb}QF<iFjE0G_!GX
z^8RH3W;f>Voj-rPyZGTJ6T|y=Um4zf{>kv~&wrL5zyDi;8h8Yp3TheX0r5Uy#xDYu
zGr$b~A6gKofEqYh^ne0N2wEs$W>9eb&&$BUC;%+A|1t1z2{M!}(`C4O_$b52SHFPS
zjFEv?jFq8$g(btL?k5bqj9-BH?hgawe^8(E18L1KMqm%@4<wxb{e>h>7G{Qj(Dcdx
z5P%Y^32hn-!%xySNt?D%w_3XDCWumh5b=jy#*pqdEAFTVJqs!b!rXBOg@K43MRq9z
zcTkH5H;{=84?+*4>ljrO99o6VwX<8(=C4hBlXOy9JM{1plJI?eU%uyke&ROm6CffW
zl{wfOvhwpE9NFh$I9APULW`kQXcRP7zLj92Gbvd_@ak;_{b$c09B@&rFj3PSe3h#X
zs3l24I-N!$k+8_1<6PZ-X1Z9^p($U`9o>i5&!5p|$j*{V?ukTES7dCgt$`!E5I@yV
zgeHI`<uo=oQ#AZSdzN%1P2RW?+aK9mTXpFRqi~(R4}?yVN`H0stCDN|Ks{E?f9~V@
z<V7yXWc3Q}5g6a^m`@Z-mdkEwLZc;ri$Xk}_YVwYi<6Thv5ATK9S!zo&Jsf~9_}v^
zFcrn_T-yn3lLDFwYLSM|4>gnd?+Br4bzB^Z<Lbx>`(9Rbo9wsa!mbJ<1|Tozpnl4q
z=MNv9v7ZHktJbbPksh=Xfl;e+rN<A{u4}h>)+cK1=3A){7G2G~5l${2@*y?Y1xas&
zW()G5hh@xUFK?WS3UY{Ny^oe8=oBHw7q^nbF@g2E8Kcu$f8@(p5VJZTWbw1`3t?Ya
zXO%|o#k-G}c&{6(tU%dVH<ZfO(m#AQ%jU0BMX9E#t`iA7r7PJv9H0_9jC)9=G1tC7
zS?4URcurzGHCDjztsdM+9mn0FWr_<7Zl;c*PQ5cV`W;^CQ_a-SV5xThjnz&7%6ACk
zPe|5|5Ouvw!<?DNEa5q4z5gwMSU{Pb30V4Y0NYHDpML@O*Z#w*4p^!NcM~9KkrBiO
zr*lU5SOP|$5?Et_S_Gg1VcLS#3?3dHz!ohFMwbCp5Lj4PFmQ8o<Mcp6%Pvt#-rs6p
zelRk8e*2i=`0gDHPTqbDM|ST97ABt<-o5(F@b&X2260&h1|C5nV1P0*JbQ4PK}}DS
zfr*X92b-BZ?0gA=`b_i9=KNz|W`D_W85lsf`hYoB3W#-pv3-OAJSK4@0@(ZomQiMl
zzw;^uG4NiR$RK&EoDbBVcEsjwXlsB0+B#r`^8Z0=1r|OxxAV`Nn}dLb0cPgBdzax4
zsQHf+rogTa1Glp)!=HC=8Gf8N32Yt%o6H=XNQDBlh4$eC$%VmhV1e#ptq5lCJMn;_
ze!_kRP;~=}XJD%UuU;-Ihj*WLZ5H~pWz81RqB^i+{=9r{1uC!vA`+INB*5Rl*}k1U
z!5{>rK@A{m=4lA9FkE}{3o=#!M8OK2paE8%%Cnysr=0o-3`s^tQyC8C<qkre{A|$5
z3fO(P0@Snf>5s+$dCpo~ZrxjZ?2U7~-9#aNzJ{OQfBg$E^_!UF7&^}|YnFk8q(nI5
z-#`DKJ$^Lx#>O5*0e#zpnL%|2ww4XZ{TqNd71k4j;$P5)H?Dwtj&mRum_+_D{soT_
z{0D|V2e8bao^XdDZ@C(SrUNfH1M0Z&Gfa-T#lXn{%3FVc-3FkZ|9?np6fiPsn`krC
zR^~7;l(aH1T)WG_@Zc%9U|R!}%K*}%00G1TYI3oF+6q8gMvNC&F#kuiM4>Iz$1lHt
z`z`;#Z3sx=!OF_S@Z$&WS_IS$02K(Jf?&sv9SjZ*4h%dzJn({G<;s-|zP`Q;-@bjr
z>j@4v7Mm}hUo(9A_!d|?{$;rN@Girxi)R@mWaSv#Lt+_z19R=w^A{N|oj%L(;mu11
zegQ6qH(y^faB(s*u<>FaXk}yJD3*!+%phX|$*qoyfbs9iz;F!MQIVHpVBiNv>rO{d
z`<{Wp<2VC@usX0%cmb?sfcYgVIttfJ0Jzn~@adv1!~Z|*3_MzofH?tF1bl!M4s0?q
zFMr&)A&yP+uQ%_2aR8cwKvZ)7fMLU7VaXtvn8fgQ%VvfT3+6NYxqJnph7nQRGk*C_
za;xC`&p+@?fA#h&h8J(YF!1xRGqABTgX0$;;PVO;24?>MpSG=I_}5nTpF>^y@3%9@
znZ=6gmT{R{g9rA0KYnQNY5V%~|ADPG(7@vRMKeA#vU7YCPAd>VH!nkt`(57aUqY}V
z_1(|^oFHZju&clhOn^sU|71A#_BVstnwQ|N4S3K9+K=1+;%5!M!r;=?P~VK`h$uEz
z9>&M7pEF%~d@{>#(ktEoza%YDK^9;|@}2Rftc16A{Ip$H7iMi?c;v#(@b#YqQ0rDK
z#%Tg^EVd+t)G9;=pd@x5cP<4D3;tyI%lH%AJqLEZ84j#?!VuOX%aAf%8Jr1U-TT3C
zVCiE94h|NeJg}<{EO-8cx(bX;B=is%TKX#)glvH6+QAUm9|9($+YcDTe*9uszz@tO
zz4I9U0R-U0>|UD&qcHxYX|^_L(PsUCDL6j|qSJlR3bO@WofmFb8w%bym<l4O|AEsx
zFJuf9w(H&OUl@Y96)!|x1t-kal?}wzwPqpB*F1UOS`=2@OvpvP-sHT=bI$KMEEzad
zB}n2}S+B6lV6pv1(}5F#z&pIYhw-b5OH5lQgTQY{%&U%VH+lt<#J#1aX~^gE?3_;o
zs;d5(JgU_uLAY@tNZN|E!?Cv^Dk)Spw-9Yh(mav}v}~MB_dtn6Q7nFCc1I4k&=(M(
zmv?R#TpYacO?x?y(s_!NbW|h2-z?GbEb#0Jg-M~_nxG^|D77>TR0_bx8{$Cu<odwF
z%+sdHz^S(3)8m_vR2}A864E{c-E)(5<qBq@&>2i5c2urIad_@_gUHxlL@4YzF1tH^
zWf+lc7OVFkz+711w&7PYuy<c2{L%YPAE58xAR6Ig96q=ox&A{mZxWV1Z=kBz{+STe
z@jF87+Km>gxI9+6H$K;T^aSMez;*n`qDX-<^VQt3VtVn1c#3G@T(T8s(p+O-bO-ax
z2BtpfSTo!PMSQoKIE0Uv`#r?&cEtO}jw_+C>D90r2n(WhtXB?=^bU1*pq)ferg2jV
z^@w5UGw-ykqg|=cAVm9plULR1mSA`f;jPfN_&0X<k>3`!D0JQ|l@t-rZ@<N(7a4ZR
z<fYdLlEZR5oBnHB1(O74v3|oYsUVf^!ceA%9!H=h6Nu+1Ddd86<<c<PD+GQDK&jP)
zHW7r;x9KL`bkme*X;W<*wHgmX@v7^k2ssqQiym!IqrLU!K|$I>5ej-Kc=Mp9hoXX{
zIopC15rfhQt+Z$>RE3zXvF$dAv)Nt0nT_Jlmg>O3!tM<F&CmPZdoyym!h{(o%eHW;
z`66)W(X2cD90Ytq&k!3R2Ej}Y1g6;3%w2@i-$zw7yeqhVNj95>rfFc59n$Hvc*hw5
zmkpd9aKGSB3Go}O+D<X#SD>g07{QoHdP(6#-RDQyScgF%vhl@2YkM=I9bwEb6d;rC
zZfXg^u6QHo!_4H+^=t9_qbEj>Qio`y5L6nGfg3d(KH`3p=m&<!DGNr4ArNjwHK6cf
zW!I&Pmk%YA$r-OxN?6}iI01&P^G~t0*a>}>M2Dn`Az52%`!qIot~Hf<><I=m_O4!c
zevO?nfg3|9lR@$BJ#5Y8U6b*LoNzdd|9ghu;D39h|EEbT{GGnIsJvXbnt}ecvZGWG
z6CZ41{@8)Zz`mY|>U<vhopEP(YDjeK?~2V43y`e!QplK{*^CSfHaE0HJXsa9TqfWO
zETaEKhT~J8ak5k4cMH%L4d7UNBd+v@aWE|7%(Pw)-{Gf?+fY;U>;i$nQZ*Rtq2!>N
z8;DeOBvcC@q(!K;Ht3bT$Ss%fcC~=+*#155jrgtJ*vp%!NmE{3lJ2*Y50(e(hTG|S
zBHXDwqIR3xgEN7FQ>9Am+~*T>$@gb|x{QxY2DoT{^<<S;YJ&g*o41g-OfdiFa>c2H
zhM*jB9js?L0^A9pyMq!P{n?upSh?4D{#^h{ttYf;C=P#V(xh39tXrX)`6mYz)RQPE
z>d~Dxy!0rFGCb*dH}SBOf*^>fsEBwH?KXGNli)!;coB5UpgZ(XyZ%{c+cjxllfL+S
zNp&FYrVm2$LU=rW@8$b_-|u@0=iP$sFjH2#M4uG`gRr0>vcA`&tio;-^pO)lh|Sa?
zEz6ionc6LER<WLYweUwC2x*W`r$fy-6k6Y+pUGqbKp50IE`P7+qRiq2t{M?3;@c8d
z@>Rs593u%`oOysu8Dg!*;Iur9#)ug(2bwkzWWF}q%{vDr{qY6bC};FIKG+QR?^UtO
zq+ruhKYI!sy+wNV{6-NV`?95dz8t$MY|uVq%1{$^SQp=6_}DUv^Cw`YKL$Whsf=YO
zCT^;!RB7k*bYBnNH@3qqRUj!FKPi`^Xny;S`lTsUXXl6wsG>L*!tZY|;5-1o|7rPR
z14dk<OATz~HVb7#t<gq#)uwlwvjT3ftBp7Fj#n<p%E&0<$4^7Zfwd=h(aA3PscSd1
z$TlOW572yDiE~p;aUV3^K0|&a$<lSdhlS&o4$DyRaB&@Pb1eb0nB1#lVLXXbJ2XC|
zMj}l&Jb>WxL7*q)7a5CwaehD_Ho+)fxz%OxvVoIH8+)7#u>upFS`te+7l#iV!l%Mm
z_Uz=$>=xmx3!?UqKp<)b54QTK3rehTAp63}BRKF05ELIji%!7GeVM`Y1sHg=?3|w6
zAWpo$LGd>$II`cu%oVYZdy3rJO_G;n@AKDqLEYQEd9M5tfKjUnZ6XMxFG+Vd613YU
zk|+&&h*&Ry9%`kBUc}OhS_GvP@!;R3SWxkxf`=mNLA;5A2P*|Bip4?|Jk&scgrb5}
z549lnpshwLo2J>#Zen(Qlb`mIRTmz+!|V*qH{ZPPdwk=ytlTLxYiWkg&D2szY0F5b
zRv2}4ScXnbl@W&?X4a&>&mzsXuA3rCYmQwwU5yMxy<ZT)!L9>n2nSd17YGul5JBY;
zM36`%To?1;O2<+j(p;^-RH;)GiKHb%rhZyjNW&pvNpzMKI`X$<wpb$bQkr-ji&4WF
zb(?o+aB%NUpMr}U>bVg%u38#?H96>IHqd(;(3{E5eYDW{nhx4>2&jumk*ejk+1W<z
z@$f!`+TYS7HHdakVq@o<?9BW4$Cj2mQY4a$jf`AidaqX-FU7VYPaFRhvaJl8QsDd0
zBm5kFUL*@!@t6ASwSV%WR-~%`O#~t%=sEiYZAb3o!(6fy@t)4GJ%FR<hoRAqKA*dv
zJC^B7Ub}1=(^Ee6@UaH9=eVc-#2HVd|5lq4YeZ&pjClEZ)fp9kp|-1gy?DFL*&LFu
zZ(?eUvP|mR5peFc*5Sr3wJ0|w2BV<gTjaoH%l70eM93jiKXTO%fl?c-(arr!>8~(y
z8tr5tWo9t`C4h&EyD^PUWa&G50uwkHoj_cE4OO<crr&jh@TuLcDj>20aiq=>uf+9`
zf0+9c|DXRWvC{hrqB`IhOi~T*DPbGP**atfL7D5f_-!Fw?l+4hkQXQ0<@PWMAV_Q{
z`dgbY_UtYq;cz*k5u543F9v{}aT)<w#{fT1n12Ki%g&i8+oAKI3=Z*AESZ>?w*w8~
zXJ-Xf!;GIKgt>j^wT7O7=7;}SXsj+ONrSWkF5LSF?oxdJ{vBLMz!n<83J6da0aPHI
zK8<^d_s!@3(F(#WXFmS~Hj;q(jDrJWC8)K`$n=Nd>zCgQPoDo~U}Ixq;NS#yDS)M_
zAh0|9{wGH)E;E~2T5h&hRx?ch^^xJ&`_KQG9RD)9tz=-hIu+QD1UkiT83V)d6b6Pv
zLBNtU6NrJ{xj2o1L6$+|HP%e>=MT@5l9J+|_wTET<>qex|5x)1!{^T;4|B3}gp-oC
zO4iiOfX*sl4KF@VH-^`%*D^2y3uQ*oI16;T2|QK<s`=pqi;xk2a9<8oC;+=j!j={!
zwG2Q70`iyu$O;gj&^Q4Iyq!Dc?T>4h806-z5oQ(^g%8TGDX1J4uWX5Vk{iF|*Ztel
zq_~Hljp<jY0vE%?^B=*3gWZ=uGwKMkGE@M&1!?Ns4B!9!XOQM*0WV8#y6}ndC#Y4x
z3?9g0c=8oT8N>Oh&6-(!(}h=pUDux7u;60mWO()dB`_WGf(Pkd{#Rgl^jnnS;Y%q7
z#<v$3EVy4Xs7O9j<^BIVfZ+!tXpztnJO#p8V0Qtu$`G_%+Xcta3}}(jLc(J>jKCWI
zJ1{dbLRtjC^bLxIKR|D>f(k&;7~NlBn)t^IjQ4+#>EHjLZUSib0eiEEo0H*$j{}2>
zpCbc9IIz3R%+CN`2w&L+3~OGX!?J*Cfc3}HZU!E+P=-06)&sCG_y7<<DDCJ23v-S;
zCQNf<VrJR}tbG_o1US9twML#rn>+u9R1jbV%*@QQT!Yi#D-eHx=E~8V|GzLwbezkF
z7u2|)&FtDaM^2bA<>BkU3_lrxy?oFDDVARhpFVzPc=M5&fs301*p*=c)*^oyB>Da`
zy#2<LHm};{BQ7&DGBWzjY;C?ynlRn@=fOFSF7p@|fE6zT8y{q9@fWbnHwQNG-W_56
zE4an%{r}5sytd3@PfDj0_h2*c>&cTUf?;7tf4_Jk^Sre+nwgjPBa4K@YYr8ar@(?>
z8g%;UH?}br5D@hAV32LBV|cf9JHwxkpBVoA`~@svfc?VXe}Ju@zmQr0SYtCXGcz!Q
zrXV>u7?^=A2VoN<28rA(26};y8&)u|N=h>@ar0n=Et{g+3Kn7UB`iWBB%52N!^5-p
z`HwGGUjAe_{QMV#{q{EukxHBlIs(9!ATZ-U{PK-q?Smf-r-1VC*#uxJ6veTqjX`bq
zdtjINu<zq@`S;#jcL%0c0bx<uzx>~Ra=iQdHTTEg-wZ#2Vf*|W55vWW@(jn{aWRPh
zW8O5?>)cWSj=%qLtUv^nx}e(B5IUtOh(+05P+bTt2sRKmpbKpL{|9FF|4iUD2h6}s
z4_XNf>=-cc33Gr8>Yt#kEdN*_s}cW0rtU$l30&KXxHuVpECyzLRw)MXE|}ZEqOH6W
z*lpj#09qmW^T`W_jLG%D?wK~Q6&%T+&^nU=H1InWAb>DB)%zD@opMZ=>IN!rmvzUS
zf-a=^hp$#c2U}-XrsG;oNG_OO=AN3-we!1-2y^bc&%YVI{9*=Xe0E^-?;nF89~&@W
z{s3D9-x-8~{ovPMS<+@zxXdPC<QpSxowlRf_De~H{&EshfXo4L0-ICcpE5992kO=<
z02UD9|C!w^+)Dm3{k|L#74}$HR~Ku`fL&Sn-Irs>c!0G!8xuG8AJB5nUymOPv#Y5+
zf<y^8{J`rCu$JaLyo^dk1q>ieMZidHz5ITm3?Ei4WO%=F;UA&+3=}n=cW?Q?A|lGb
z>+Ua1s%27K%wLz=3CZ~Hef#9zyWb3tKmB3oI`;`aYXBZ20kM(BR6qj;PLlYyUYN@o
zodRJPKj+j2#>=lRi}7>(xBvg|ALp;n@BXv@`|{=H^@rzge*0K1P_+%;JS}KtoE8x4
zLl+;x^1~a@3@rm>F9K-5kc5RFpsB*2V3Qz&hs+F2|A2)8>wg9}={B%D7qDgc8=U$7
zf(DYnt%AS*e*;xx9}|21j^W1IT?{(kfOYVm<3L9pWVrtEGs8q+VKNiijd&|A!cbjX
z4h#=qF))1vLncsc20#E|HEsWb>{CdKXMQ6srWsH$qs%=ozIo>iV1}Q=%KX#v&4)h>
ze|~)i4=l2?Ffnj)3vGJ#nI(B)t=k)7&D1m0W!ZP-I(T>(RL4Bt&%h8C82RAg*6R{m
z)?MHT)QY^$#Qtx0Q&aOZeCE7gv&QJp%a>xpadF3fJ$=gm@AGFCW-hMR%z}dNp$k%e
zLr0;R=on;wsjXKyy+{yP(0zWtZ0?`$r;mMLQ`G<uYW{uyj)7HN@~=e81RiDqp|9jv
z2<#d>-R~(P)pqgAv!(aGF?{*{2Wiq8Y2N}U3;z1Ypd`%3P^ZtwMT#9$asxoRBgk<d
zFq4Dgavl^@1^fpuJNgA)Ui=TdvJbkZj1jz47}ARV_ZzZD1u}UA>`t(Nbur>jN-H9Z
z!D$XOMGETTp8^&H$Z=BFGM&NN$Bx0_4Y1e(HmKD><G26;#5mNpFvCD%%TDRP|NmJ5
zgM$y~hc~ROEQjY*y1gUSoCo(G*rsNr&brCBUlJ4}GSAH3Y~8pm^7E%JDqA=1@Cl6$
znj<1AygxEBl8Kd-_5Y$pi?9Y5uyRp<HFavt=l%P2SwuuWGjVZ!<oEPEBoG*Q1Uk_4
z6DfoJrbigrM9c#X@OCp`*{t;W>raLSodFDnT9OR2R-R>;y5ux?b^*3735ZLNtVo(Y
zQ1N^1;~(3dPkwB@`{ge$Y`k#a^B)ZNfGq~lDnu7ac7_^5URiB^)+Y=@7+5mZeE!4m
zc|WjMewdYo@eU))|Le!UPq=|itrcgX`kz04wf_BKQekBLZ_CWU<9Om<D=#_r0$Tzu
pyxa_HK7VBZjTtTi;=KR?1^}`>_KJLTc^v=%002ovPDHLkV1nvOJNf_s

literal 0
HcmV?d00001

diff --git a/theme/images/icons_pagination.png b/theme/images/icons_pagination.png
new file mode 100644
index 0000000000000000000000000000000000000000..872b7308c20338ff97e9341e6c77c982ff75b957
GIT binary patch
literal 1043
zcmV+u1nm2XP)<h;3K|Lk000e1NJLTq002e+001Kh1^@s6DHnWg0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#wMj%lRCwC#naxWSVI0Swnca5Rb#-;!
z%{1)=4<VF+m*`EjOHgzO?T{2gUAlCT$ihQW5K2-00a*}{K~xwK)Fmb86nIDvMWKeR
zspYOO`>OlW_qRK{4YsrHyyPa#10SAwoSC1`e&_rAX683sJRWCy`@3<vFfxQ`YCfCw
z91(F5={E4}UMdcU?RBX<FXPxca1}fUFQ7_4m+WbL9qbjvN{P~jZl{{bo$k2Zr^Sy{
z5+@hOSiyO4z+6zsib~2D^&FShfKiNa(9iq}-jSex@eclU1hm*48$0{&b`7ifF`nt~
z?A3#wR;8jGZENpylvgFTAKtvss+BNyaD(Uht);F?R$wcRVf+CMfmu)_IB7pH(Fx&T
zAmo{GTWrOptf<u4iOCG-OB6NYWD~{!x_I7D>)O1HZ7`WfG46ps#)Ezz3kQ5G8jUdQ
zCkHtp+BvvrPtrj#I4ZG9WecOVC`!f2mSdW+SZbXW)g;OY#+R1Eq4DX7Q8qg@!F&r|
zhGoP2i*pPP`8D<J%LI)RYID5e$)~op6lG;R@&A!4Od&XdrNB%Us|VZNv_xjyV{CaT
zoay*BxThtOd7rGwlT)-zyh@!YB}^0YiiLzhdlZdC=E)@z&pZw=heX?p<9o3!=Ewga
zj*{gmm1C~i?2h^p=cXWrt=^f*2rU_@W-u5jF{j5b@83%F$Ie`=3;Gr=!%begv*DR0
zCO0Q&byt!bN6IlZ7ORc=kMUS667bDu4MIuSH}6T4YS?Ztn#@I&+jnd!udXpGagN$t
zqco0`Fm{u<fcohWo=;S~HoUXi?0($2+(_VIH3?Iz#H+t6=`WGGFuE|hFuE|hFuE|h
zFuE|gpCddmr)s`2wxZ^{;>kL;9)*!pI5|X5*B}HUU|HyC{01CnqM9$2DnNtE`DtZm
z`EkfGt56J{#B*zdU<>FL#*I0|mqOgwTE|&!DY?K~_NUq(6<qTgxIvlVq!wTij`0hH
zu0#a`463}soW_pf)H=op-iy>80=p!RtpfcS9MqUcr>KgXEyr|#eW~&RI0&Q)+f;J<
zl$R?j@1~J^&XG{81o#AXCxL4fg}Wtk&boDsQ9`d%qC9a0{LG?l1(*Wu8TNfucxB_F
zE1Q=bBb9t9xgG}eJ%lRaOA04M$@eKs7R7f9$$PDrm7+LOj;R;=0TrT9JIRt?5eTaw
zv|Q(K8srw)ari8^X=-CCC-oT6=Y`K8pfX`<m3Z}cCH*DxAGF^B3;+RyMG1{$=vDv#
N002ovPDHLkV1gvc=f?m5

literal 0
HcmV?d00001

diff --git a/theme/images/index.htm b/theme/images/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/theme/images/loading.gif b/theme/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e1ed0883e07c63f3a36f9ee38318ffabdfe44147
GIT binary patch
literal 1320
zcmd6l{c9U_9LGOt)7<6K<~f(UB$vxmAJ&H~TlbKzUA3ESll8uJwt_Hp&><)jMP);L
zm|QM*NnEn6Bh6&Z3@cmf9>f+l?VPUcL23mN9Qag_IhEqWZ^A%@so#rp-u?p*?x%ad
zzMt3k{kg&9K)h=#1R+>KaPya6%@&KPzTRfHJ6*KX>2lzgb~l*K1W6hU1|vlojg(%m
zKUg}tW9P2-u6%Ui@?vHBjGqs_oKg})!y7mCpzWiFN|TqDKGo@Tk*4M^Zmck@Cm4>n
z8TPTU#~Id3yII!b<@kWd>q}+xucQ=@kMnUn=MU_C>D2?p*S(y7`G=p!kCb=p9P8=r
zYmct}`1)7H$;u1+Qti=LynFMd#ZN9?UFuvP=luMh7xxV&1+R|_g(K0}nx~)J+tj?O
ztEYD$IduMmtNFvF-OoJVxglPjn(+sMU*7zYb~EsQeS&|PhWj5L-P*Uke{D2YtHYkb
z-}Q9>2-;O=bxlC5h)7DysG**$ts{uKTC%=DDNaa6onDwMAJglMr4pq(Ha#Qgs43ZG
zcyqRFFrD?(%*~f;Jf(LpEYwVx7On~BWa{k&jtkBk&ZJLX^I6Rn$DA&0{7`@!VBb7<
z99^H`L(^WD)7H7+>&(&F@N8nsygvKQZ6WvP#YQS2*shG_&427VX?^5GX5QB)-+J=9
zw!~cTw<AQG{gTM7t1Le;Je3$-o_zM)(&<N&M@}7VEdTb_cr3q2-P%nSMmj3*Z+VAm
zdFu1y58WPNJNEqa{nCR&ZQQo=r#?H87{Hgmdvzxm!2krldO$?TElI!zB$~;}$X~EK
z_S?XsIKiyAz?%9GqQMIKD&!N97krY8Z~);Tje#DpJHkmf(g0R)0g2}T(Si$>{7f3p
z0QNq$f_xwjC9u0uf3+wnjEhTi8rTR<46BN*BI3J|qVQV>{28>Z3mCc(V8P~ec@?)E
zDv)tl%vN6^)2P8ojjRv6NRqJ)GJ_LYz(zalz#uoPl_i0Kx~eRPD_P4+Zgw!F<~meB
zB_(`<q!~eBJEBSi)&Hkas%jvtbO`SFA?%u#{BLL|D`rSM2?&?S329kqR^+B!I+A-J
zmfIL*HA&Z9qXtn}CCDvuHuu{8+&u{^K8eI<IYj~g!AeGsgwo799`AFFR@H(xp>7-q
zS`7*zS?2gnS&45iNNwXqZIlGZo!%MI4C@6&u?*dxQCj`Ic_lnvoG9fr0&2^()g@8?
d2uOVTp3nbwY83?`yc#5-wJ)159KZv+{{|9CDcS%4

literal 0
HcmV?d00001

diff --git a/theme/images/no_avatar.gif b/theme/images/no_avatar.gif
index f4612fcadb001c7a3641d35753135bac996f2e14..ad73330e713ec9a21f97366b326a8c66afe5e9bb 100644
GIT binary patch
delta 915
zcmV;E18n@-1EL3iM@dFFIbmb~WB}Cw0K?4G;pXYu;N;NP-Twam=IZV6^7Q)q{Kd}I
z+~MZ&^Y!HD?8D8}_V@Vd?eEdp-pA0_<>~G8_V?T2<>BS&<>~D1@$>cf_|)6r&)41d
z`1#o0<KX4!!OGIs+~Mu;^2pKG&eh!b`TFzq_t)Lx{r&ze$<f%|;^yP$>-F~d`}_R-
z{Qbqw*3;VH@A35R@bmoq{Mp~*`uqF8$<hD+|B)dakuU{+A^8LV00000EC2ui0Av7U
z000L6z?pDJEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjwE7GfOd^)cfj~H1
zERo3our>oQ6%sUqgoT9?6&QSdUl0ifhLMtk1_=<1TL1zIlbw<Z0*jbc0}h_2k`4o-
zR00jCu!aqP0<2IB0R*wSgaiQ$wM+;LyTpVG2*61U!^O=DzsW`c&D1mj(M1Be)x`v~
z*fRsK+|3QE(Ez68)DEJx0_)u0wGf=~)C!li3HRIywE!UXqh`Qe9}EMzVPI7uVYLdQ
z00?r}OoG8Q11MHI*Jpx8Y7;O;_}DB0CJQ8sS-^CEAtkX3m=3tybpX@0nXm}h#2HH`
zBmbE^QPpJBGUzFoj8Gc&w35-trJYPN@(6WONJbf}O5(UiqE<r|M>YIP2;wM&WCtyb
zDDZ2+eQE#EvsX1=GI(0&0aUlN9X4@G&4HVtEvUD_LZ<P&hIqy@oX;8y5$5uk<RQ0i
zChP@&?eY*;4rh5jQfi>8(MUAWtp@5MY9fx>604-|H4+vr0=R%t42FvUEm+ttg1|!o
z4fiw@@PO=fhyWurjtCIK^Me9FNggQh0C9!_D}t^lkRh503L>hCpkSgF3E5Q*kiY~2
zMTxY7N}vF-=D`R2hJ4T+8XKelU?eGQaK;ILDjX<@3MY`!0S69x!a)aNbU;Ccr%-^u
z;TIHgcnSw!oFF1B5puCXgD0M%f`VE+U|@@=q%hzWApA!oEFbW91qwUrg2ELf+!rJ)
zCCo>K3Gf~1i2?0Rv7wW?P%uRX=}{Sr2<1glfR?)y5XA%Gff>sRH#YI5nYxJSL<reh
zu_;t_O(-U3EQ~FIKy-J;GD34oc+lrA9x$=yps=`^1PjO^3X2B9CDDSTy0oB#os^!E
p=MgVt3d;*gARvRMsK@|l5gCvQOP5B(peiacAc5(tl583T06V#K#7Y1F

delta 448
zcmV;x0YCnt2igM@M@dFFIbm7=S^%>E0K~Yu&cel!u^f@W4SxVE00000S^!!A00jOJ
z$VsccIP1+j2w*6VWNDsgs+v>qt#B;Qtoy!nuJ7QD<Gi4-)&l~E$e{6fOgd%EX7fos
zNvG4QwpWr6w_q15D-LVPUaOf(wx!zZ89a@G$5(cG{l2ri@q9FXe}I87gM@{Kdog;7
zizJ9ef{>Adl7AtXRho%Vm1UQGkerjEfuyCTaj2=PVXUpLXG4y%Pq3M|nX^c>Jh~&m
zu|mS2y~SL#Y{<#Ko6OBQ(49`C)6~_JTfW(iuh+YeXW-$C->c^5=v{Z*ydvbm@xkz?
z^Yq56_wtMGVE)_og%ddJRXsicZ&_-$FH6IFZ6MCevwtQbu|sAoI`j4qoF<Qu*Q^D6
zCvDuOi_6&bO4)5?wPMU*3Y#_)n8#zv3=+cyai<c5N>~xhCkNHgXhn4#Etgc=Cr%m<
zenN@|)6y@8Bwbb02+`JbZw7sRlU3YQtX3$VH5+NpT8?SKz9kzM?OYXT9Nu-xZ{c1!
qU8MX~+94L-;F9o+9Nw5}?7K9Mw@r%t&j#gh9x`j*%vnPO002A3bl{x;

diff --git a/theme/images/quote_rtl.gif b/theme/images/quote_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ac719cf280fba68810d89e25246a5eda18411f7c
GIT binary patch
literal 154
zcmV;L0A>G2Nk%w1VGjTd0J8u9aByxvKR>OksiB~qh=_*X-Pl-HR(yPVOG`_|#ld7`
zV!61r($UP7l#w$tGwSK&A^8LW000jFEC2ui01p5R000C>@X1N*ONvou7A=SqB$MJe
z0<{F9_AsGCPRprG%!yQ|JjH`aqt}oKdH_kScX;(2x5uzYcnqG==_$256(s=ggm6k)
I&XWiLJOAfD!vFvP

literal 0
HcmV?d00001

diff --git a/theme/images/site_logo.gif b/theme/images/site_logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c065519506de2037e98162776ddab170b8dc36e
GIT binary patch
literal 2208
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

literal 0
HcmV?d00001

diff --git a/theme/images/sticky_read.gif b/theme/images/sticky_read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f050a54aa7a8be0d820acfebe01ccebeac12f3a5
GIT binary patch
literal 625
zcmV-%0*?JhNk%w1VH*G&0QCR>^V;6rmY?qF>B31{hK7dl?d<;j{oA^}%yoddCp`G;
z?Z;SW`1SSn;^k#!WzA)Ck&%(UIZW*5=i=4Y;-;>=GDX<e*WSj*`uO<v^z`WB<7{kf
z=i%V$<mBkMzwXP>{P*~@va-o*cgMxW*s8F;y}k7D@#e6%wHz|?@9yBu&i?xP^YZcN
z<Kmf^n00k^=HTA|008&$^2lRx)}yJzP+(qOUijzf@zB)p&e8n)`@lg`r>Cdw$j$%%
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9JRoY3N=<YiI-f$-qVfowJb_1K(1bn_
zs6b=oEBjW8Kn39?A|kz&AyW_t3bHb8AZq_E2_HTf0va%fFf9TMJ~%sUUIPJx5-l8;
zm>eA$J{}cbBs(`gg&Hw2FR3pY8Uiaa3y@AT4|5%?4lcU7tQ{sk0RvDK9zH1@$jQpc
z1wH^MP$&RC1rpY$4%yk(1qKZj7fut>#@6QN=G`|HT|@~zJ}h>2B{nuL^8zV84GAhw
zl6=sax50)38zbiZ@&pCJ3=ld}6qrarn}&%gFc^5y=gBx6J{Y8s7-GW)2qRN4>K6`*
zhy@Konn+>6WQY_j7%7-B!_SX`2QhVIFhSsj1sNE8D0r}Af*%z%7EHq+BLo2xNgK@A
z@z0Nt85J5BU{Hbw0|PfAEO6>|NQD!F7%<S716tc65pEc;0D(XWA2J5exGRLl02u~c
zKv-M=#DV~Xe;ml`gD->;fOiaz909I@&jx&aNDx`b<PT)@43HHW%mWG(5LD<`I*N!L
LJ7%<O69fP|drlgm

literal 0
HcmV?d00001

diff --git a/theme/images/sticky_read_locked.gif b/theme/images/sticky_read_locked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a073fe199abdc045f7cc6a42c5fa63e236bb9e67
GIT binary patch
literal 646
zcmV;10(t#MNk%w1VH*G&0QEiq>Eq+Nxw*S5K7@pX?&;~$a)9yf?(psG?B?hB?e5u#
zlirx2{{8*<^z`x6*kxs9l9H0dM_A&fuB)l3=HTDh*Vm(qj?QLt=()gbY;3_jPx|=y
z{Pp(s^z`T9;OoN3_T%O-EiUZK(DdBi$Hm2rjEv;O$Nl>I=CHTSUv9P?Gs;?Nzcxtl
z&eHPl?|ETlCJGM9S7vo}b(xr$0002@^76+}VAg+&^zrfc=;~fxUVCO~t*xyyGc*7H
z|NsC0A^8LW002J#EC2ui02=@s000L5z@Kn994S^B*6P+GI-kNsigj6_FpG=EHiAMG
zDh24|EBhF^1?%P|Dl{U7uX7*}4z+U2#%|{XB0d`g02GE49s~_O4jKw=HVc9X9+j4r
z2pv8cEM6iJIX;8{G&C}&G5`Ps3<)uhPX!kY9SEuqGr75{060DiHc%`WJ_fwU$Onun
zP%0xn2ME%o57pJu2MizrAWkRF#nR&A;vqdDFd<KXJ}!240XjM}?*juo6BhPPk#lu+
z8RY38VQ0VuV<vbEaH1f^h7&FhNE~1dfW#0y4u}xJqlY&Y4tz9lVZZ>73>iw4bkSn~
z0uuxVcyw}O1qhKiTvR|Azy+j^jv*{q=-7kDlN1+jZs>qxfQ$+?HuRXV<AuF@Gl_7B
zk>c5g8UY4G^%2y<1RiKRdMUt-L4yDj8lZup?<&?dEKmq)&|m|D7BJEZ&g!I54h9uU
zlnB6}#tU;jB1c{b1w(`y3}!&sY=FZG32mMj_EBLo2_Fd}d<gwSgI)%(<%kf#S~Lq0
gWXd?O0jstf6&EB(xFMjAZzl-~M2Juz2kRgJJC6Vz?*IS*

literal 0
HcmV?d00001

diff --git a/theme/images/sticky_read_locked_mine.gif b/theme/images/sticky_read_locked_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..50c7eb6ca7ccaf0e1461b0d6bb6f68f35c788649
GIT binary patch
literal 662
zcmV;H0%`q6Nk%w1VH*G&0QEiq?Z?fyA~$DeXY%v$n3tFH+1<RmyUAB(R?TXJgoN_%
z@9N{@?&<09?d<I5=Qor_(sF?J^Yi}w{`l(amdBpnm!aaOuGxr_tEs8QNLl&y_U7Q<
z*w@$1WO9Ymk)w@}`uO;Cz<~DS=4H2X=Dow`;ovYWF2Foa{rmfz;-|;O#VyE2j*gDz
zu(uwGFTOQLdSYcJ3J!B~a{vGUwAZ@UfQ;hv<<<4tU|?YG&(q=W<e!0st*xyyGc*7H
z|NsC0A^8LW002J#EC2ui02=@s000L5z@Kn9EL;w!*P)jC`JO(abU5j}I+Yfw(#af9
zkI-{UyaX;H6x1gf_(TtnPZuR$P5_B7(qJ$eAT%x`4+sb@Zc`HhIX)l^3mcLf4KyAr
zm<TC1bwmdhjt(WGq$La*A($y+QUDnfK9D6dGcvX^3KT9W2rD+7Ll7Mj5evow1j)&j
zBPccqoKr6(J_^Ry*b9Je8XaT-1wIW9<g^0k=j06%A}=CRDB#uP^!4;6Jti?GQvm?g
ze*74~frCK61PORx*nv>Wr#*fA2q1_<g`Wf%8Z02eBY~6)9YCN^(4b@jblMu2;L#vQ
z4jw(=G4i27flVIgSlCq1BZ0I75)2Z=lv3k>2$};FaInQg!2p;hK74@LgU6H(9gc#C
zFd%^p4iP}~zyJdV!h}PKXgF{n+}4g^eMJ3$frnj~WPU(!CqaV&3>qX%i1FbpLcDoT
zv~Uz5tb`mf?n+K8rND^^5;(A6VSpG6d_6*k_DF_Ah6oY}Y-R!IfQ7tdEW_fEOvRoI
w0AQ0*%mxJtJpcmej{PEsnkP9jTo`UAKnDvJY6PgkJZ}UD88SeaFgyqVJDss5IRF3v

literal 0
HcmV?d00001

diff --git a/theme/images/sticky_read_mine.gif b/theme/images/sticky_read_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1652d202dd2913e5bced510129ee133305cf87c0
GIT binary patch
literal 633
zcmV-<0*3uZNk%w1VH*G&0QCR>+qk^$%Ft(LXUuhgmX?;Yva<8o+u4wt%Vl%$?d<8}
z<nHO|hK7bPuSK~hJpTRu!%14lSZDb5_V(iCQKVjTb94CU>pag??C0m<($n9lulo4-
z*w@#-I7;5d$0L+Ayfa1i^z`T9;PmqH{P+07!NKL--RHNy#N)~4u(!wY&b1se^6&1B
z+?w<7@YVI&{rmd>006_^$I|E3`0?@Epr>G9V8c*g@c8lY_wnQS=4RS>`}+F8KvDny
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn91PpE+&}{(txqL37l<0|c5Qo(1fItjT
zADKciB@P^i3Czd#J!U!CM}?a$%D+J`unr{_3keStAA~!F5@j9^0X`cG3L=ss2{SDh
z4HqphcT*5G4;vVhq%J6#7b=}n8a)<1kRmZL6}1c@9}PMe7dR$UT@N8+3IYVj$1XB6
z8z?U|WgsU$EW~3N7{m$NJ`*ctD+WFZ*ch_{=;+vj6CfT^8R69B^!4l@O;U_dfPf`7
zHVE`vz@nRj44!KE@Y7EKKpQ3cjqq^-M415yNbq2>Edc`?=oD;Y!Q(-fGV#PoV8O8f
zItDCRNbq669i9OZCisvrf(4g{S_MY9m}%i8o*xkq=;RT?1%nD4LTvC+v<JeY8E)i!
zz_b7Z8dE1AuzHjT0tXX>l_((LfrSncu9h9rA%&w5BSJg~;9#y4039qm;J|=E2_G~*
z`5jUN0*wdA7`Px2;lN@cfM0PqR^mZoXqSJ~bpvCK55A!>ci_Y3fdL2uQVSWd0)Yk%
T13(~<JtV`}9thr*4FUi=VkRSA

literal 0
HcmV?d00001

diff --git a/imageset/sticky_unread.gif b/theme/images/sticky_unread.gif
similarity index 50%
rename from imageset/sticky_unread.gif
rename to theme/images/sticky_unread.gif
index f873285842a28c7ec9ef4931809870247abad8a6..d62b3c0f3a79d82e7b1a5b069f908cec5e814c8c 100644
GIT binary patch
delta 215
zcmV;|04V>61?~iYM@dFFIbj<B8vxY+0KG6$<K^kmtGD8%wA#|xh&4&HW_bPm{^`2K
z?CtRB>+Z~hm&aLj^48qh%hT-3)5&j#)V#&`>Fvjxr^|hk!bD@|>Fmm6ec|Hgt6XmR
z`TF$r_QOkP_vPx}nX1!rh?GKB_21;mc8vD-_`W<_*22tA#ZhhX^7Q-h^X~8R+S%Xz
z_xaFkgz@q7@NbUa;pPAU0L)8j^Yr$?Kwt3B*Y@M*tb2(1@A95oZ20*3`}_R;`uqO;
R{o%#T|NsBn-s7?7p#gnLmo@+Z

delta 241
zcmV<N01p4|1c(KHM@dFFIbj<B8vxZm0IWe&=H}+jueaN*wc66yem_d9Z+ZRw{^P*L
z?(XjF?Civgm%3(k@7dkh%+u)4)4zF#(!Ry^>+Qmzr^1Gkvr}a1>gv95e&gfiqGfOS
z`TF(s^|e`P_2=r>p{vJ!iHb~D^5W#cfQ<L|_pVG`)x*nZw_k4a^Yi-h^YHNS+S%Xy
z`1!<lh4Jz8;eL?f;^P1S0KHml_4W0#PhsrS*YxG*rh$n0@bZ>pZTR^4`}_R;`uqO;
r{ocsT|NsBr-`^qr7Cb{wP+2}QFfcVBaA<HsLLf(SZ*_10vCW|Ye><OM

diff --git a/imageset/sticky_unread_locked.gif b/theme/images/sticky_unread_locked.gif
similarity index 66%
rename from imageset/sticky_unread_locked.gif
rename to theme/images/sticky_unread_locked.gif
index a063b9c5e7ba81adb7fc16adf152987ee15ea061..5792b8649a4e4e0a97c44a359d88b6326938ff64 100644
GIT binary patch
delta 197
zcmV;$06PEj1o8xbM@dFFIbj<B8vxZm0Ejh7v}SnUnX2u|)8)Fv{r&#z?eNT7chIV|
z=<4m(hnl`RS?1{L;o|4@-s7uWZs)_y@zdJk<>>hN`up+o^!4`S=IZz5>i6mG!aZHl
zYlFm`r_W`6ltNa-L}U8y@zZjM-p|zP?C<vX_{U6X^V#1#y)94t_W0$jy7BSz;^XMa
zQ*XvdX72Ct@NbUXkD|;=YV-8=-{I!rqOsL`kn!^L@Xy!&`~0kXh@M+)vAeec3<Qbd

delta 197
zcmV;$06PEj1o8xbM@dFFIbj<B8vxZm0DeD8t8aPNp{wc6)8N0w{r&##?(V*6c+9S}
z>+9>ykejYbTj}ZP<KyM>;p3uZZ{x?z?bq7n<>mSL`TFwn_4W1V=jZk3>h<gGvQ1yb
zcZ9#8r^0f7icD9vQ)Kz?@yC9N-O<$T?d|vX_qbbY@Z8@#tUgiu_xRqkyYcb!<mBeN
zVQ{xsXz=jx;eL?Qn4`T~Z1wf^;^O1ks<O(4k@NHO?9<o&`~0SXh?Zk*vAeec8*z#h

diff --git a/imageset/sticky_unread_locked_mine.gif b/theme/images/sticky_unread_locked_mine.gif
similarity index 65%
rename from imageset/sticky_unread_locked_mine.gif
rename to theme/images/sticky_unread_locked_mine.gif
index c43609bd29fdc69b5920ef23435d8a587590d68e..93495770c8cfac457a7b60575bfe0f8a9a2a8763 100644
GIT binary patch
delta 194
zcmV;z06qVz1*!#qM@dFFIbj<B8vxZm0O+{G(y+O{Hdlx<N6ao%wPtwKh?>VpXXUKA
z<mT$_%G3S*{`mR%?CtR0mZ$U9-OgHe=jrVG^7Q8D>*3<(tX*)$nx^#K;^@K3^!4`l
z<?8V9^XlsA&}@VE>Fv*DezJOq;hn9>RBw|%Q`2&Y`S0>M>g(>_&(!bm@rfQd^7Hie
w_xSww`2G9)@NbUa;pW_sqSt(q^Yr%q{QU6G*Z27O^5W(0?(U*lYq7ZU0kI&8%>V!Z

delta 194
zcmV;z06qVz1*!#qM@dFFIbj<B8vxZm0OG#H&a}C%Mp=G6NV!2)tZ#YCk(;<zXx_8C
z=jZ3?&eQ$<{`mR%?(Xi@pQ!NJ-N0yf>gwwH^YrQI>Eq+&qh@iypQiEP;^W54_4W1j
z=j!tE^6Kj9#CU}D>+QmFf2)Cs*`=<!VsVK{RL6da`0(;M?Ck8_(bVwp@O&#d^Yiof
w_xJnv`2G9);eL?f;^Whqqs)hs_4W1s{QT_G*ZBDO@Z{z0?(UglY_YiV0l-y?_W%F@

diff --git a/theme/images/sticky_unread_mine.gif b/theme/images/sticky_unread_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e201a9f31f10d716d0ca44788402bc897ff5f8b5
GIT binary patch
literal 643
zcmV-}0(|{PNk%w1VH*G&0M!5h_vPx*tGB{MW6nHZ?CtQ0HA&;<>DtoRv}Sm$U2pyU
z{^`2KzB*dsrnT_M(#TnK&VrZe>+aUU%h}7*?akH6Z->;p#mAec(rbg~>FmpWlKJ`i
z;Ns_+L|OCH+{$Eql_5R!_4fPl^WT}O(s79L^Yq}v%k|&n-QeZLP;9&`PwwyX%5{tO
z_xSMf^V^J{+S%Xz_xbQ|jsO4v=hD~n^!E7h@~nG^zlfIj>+YgiYxwy2&P!_j`~3g^
z|J&Z<A^8LW002J#EC2ui02=@s000L6z@Kn9lt3N=!9!#DxqL37lsNeaFr&p{L?S^<
zAc?^+B|=mqK+nhaDQGsZ!$ymgf0`6U;R_KW5d;byAPFECARRqr6ATnS8xaN^lpHQJ
zF9RwAFCKPN4-E=C8I`6kCYve_D`f#G06vl&Gc!E54>pMa13We;QxznAV+IT|$jBuo
z4lyPk4P^ogJ}br7#RS?uCn{wsCq4uj<h2av=j4I_3=>i?;ML^w^z#HgIRX+>3=U9$
zfC3aKa06h36+YM<0M($6wm<_1S^!wW#{vOmAYh2mV}&*XIwEq=wqk<<5-iHV^WdY!
z3Xc~$6hQEDMGJ22?r8WBt3`>R6%#sixUj;-%^Vmi+!6ADM63-VT<GX<pvDFtIY^{{
zvGm7*2N=R_sBuAu)r1&QEbJ<z0s{aFLIl9kLP5R{T-gqp=3_^Q5IYoj@TPZ&1pzsH
zm`IQyfC3Q@0u&Y!;DHDQ2r?r85aYvz$v+M!rjXe&WXYhXDOk<N2L%S8g-8%UVGSD(
dOJWPrpn^n$1}_+B&^_b;ixep;xa%4O06VtdCno>^

literal 0
HcmV?d00001

diff --git a/theme/images/subforum_read.gif b/theme/images/subforum_read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8743088d5fd18991d0ebba0668420300e8f09aa
GIT binary patch
literal 124
zcmZ?wbhEHb<YwSx_{_ktRZ{=||NsB~{rmg(@6Vq<zkdDt<;$1PpFh8Q_wLD)CyyUL
zK7Rc8v17-8Y8b#k@h1x-0|PIE4u}UbgMmeJgQ>&HJ;oW`jcTFl9ETMcWETo?RWY^}
Y%5-WovMn<HHpQTab$u|WsS<-V0Qjai6951J

literal 0
HcmV?d00001

diff --git a/theme/images/subforum_unread.gif b/theme/images/subforum_unread.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b2b661dc7865e776363d0368a889f40ae4d1e5fe
GIT binary patch
literal 124
zcmZ?wbhEHb<YwSx*v!DNN6YvB|NsB~{rmg(@6Vq<zkdDt<;$1PpFh8Q_wLD)CyyUL
zK7Rc8v17-8Y8b#k@h1x-0|PIE4u}UbgMmeJgQ>&HJ;oW`jcTFl9ETMcWETo?RWY^}
Y%5-WovMn<HHpQTab$u|WsS<-V0P{mP2><{9

literal 0
HcmV?d00001

diff --git a/theme/images/topic_moved.gif b/theme/images/topic_moved.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bf1e6ab68189eabd8ace97ce55968572671ebe87
GIT binary patch
literal 667
zcmV;M0%ZM1Nk%w1VH*G&0QCR>>c7S8#L2=(SiCex?&;~@$;<rw{OaW7*Qc%d?eFc$
z&&h0f=d!uy;o$lB`1tnrzB)|o=jY+0tm)(9$5UkFthCv%wbh`f{{H^DEkVv_b^iVR
z$ysQ*Dn9t??7%)yxF$NvaecQTHtXi*lO{Ci;o<)M{`&d)%XNVA@9)cZg66lq`}+Il
z;NQbhVBC_N`S|(o?Ca>`;`;FN(|3g5ou>Tz`|$1T@9OII^z`)c@$v5N(l$(HW@i8Y
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9v@BeM&cL;>5TDQ=s`H_}R)N(^^U0v1
z&%%HcNchfZlLtT<6u{EV%FNQ;2>6@M=1VX@Dp4T<3O*Y<BQh<Ei!viS8zu@LfkZ0<
zg%1QW4V|8zG6W7j3LtMo11mlc5fde^u(2f*5e^s(14AerGaEP)6C}dJz{L{>F&GIP
zUq2v)IwJ=MBs|vF)7b|jIz9jyKNkWsHaH{a)z;_h>?1J-2?7WUG(I^55&7xX`ThO`
z4@_uS@IitP9eD6mBXA8*kB12fbgLmC1Av1#GUBL~@tVeuIJ#Zx5a8gAlP7tgRC(iJ
z50rX*1n6MV-j16%bLz~Q!^gQL0X0^o7@ESRQKLjtJn%trfd&&WbV!{_wJKE@0vCwu
zm1FABuTyhuh=;&gp%XdMs$I)A?Fnz-q);#e<H3WkcJtbW(T5o-1|~Mt)k`=pj14vz
zKp;}!nGX{zU`U=!83qdsq(qz=qT+)B6Fv;EI6=Df2^IznDS%Mvi3$)5%oy5Wp!S9h
zXFOC8(Hcqt2owN#0FB1b8VV3L!$FbZgN7Fs0#w)nAwzFCMUFt|0Kr8FCt!jA06Pz8
BLt6j<

literal 0
HcmV?d00001

diff --git a/theme/images/topic_read.gif b/theme/images/topic_read.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a2efaaf29b1b1226665e309b08aec1a3ea42199
GIT binary patch
literal 653
zcmV;80&@LFNk%w1VH*G&0QCR>>c7S8#L2=(SiCex-^t7T{QU0e>G19B>g43tr>*(!
z@a@UZ$!vJ%vbpEs;Q9FY`1ba`I!xiCtjAMi<gB#Wu(j#q<Np5sx-CJ@XLbJl{mEHq
zxhg*R>g>QiP`D;K%5i<{=I6H|Ht6Bu{{8;?`TCienRRt_%XNVA@9)cZg8TaW=HTDv
zx4qnwoWoII`S|(#`}^<g>*(X+)u5-}ou<=wg!c6G>*nU{=jZhC@$v5N@9OIR|NmxY
zX4~H5A^8LW002J#EC2ui02=@s000L5z@Kn9tT0{!&fvwU5TDQ=isP}lT7i};<H4Y!
zPr_gmQ1s4dQU@>@5WrGQ%e>MZ4ETdC)>AY-Dp4Q;3q2Y;I5RAZi!(So8YBxIfkZ6>
zg%Aca4xOH!GX@Vm3m<Po11&ueAr>RAu(2Z+IS&^N14Aeq3K~2X7AL~P!oa`?G8YOP
zUq2s(IyeXjCe_x})7dyWJpdR#Gy)JYJUHg(=;`J%1quQQ3^qMC208Zk`1$q*5F{B4
z9whY8fd`L|g9sD)C}@CN4FMPc4CFzvqQ#3Axn1HAVBmp|2Na3~si#K(4iV?=Sjn=b
z%a%8KToO=YRf?M_L@LCY0z#{ghYT{1fT5$P(W6L@!tlo+90UzFjOt8i^o9m^37i!w
zaigo(uVA~D==M#@1T!!oKoF_6ty&m;n4xMwLPJ`&c-z9z5Tii^A_SiGAh805;lqew
zthhi*#Hk@FJS-s5qri$1m@}7HQNYlG2$i0w_|U+NAq@pmYtV3}0|gPGp%92L0YC@J
nXbi2H5aBT#6c{{Ya6useg)I><#D-JkNCXZMUVv}{CI|pKf`>eJ

literal 0
HcmV?d00001

diff --git a/imageset/topic_read_hot.gif b/theme/images/topic_read_hot.gif
similarity index 52%
rename from imageset/topic_read_hot.gif
rename to theme/images/topic_read_hot.gif
index 54c673bfe1db6286126b14293e0bc3ababdaf444..ab57112b00448161f0a65561e5134ff8185125df 100644
GIT binary patch
delta 271
zcmV+q0r3943%v_}M@dFFIbj<B8vyk`0L^7{!be#4^z`cF<m|=D`S|$s@$vor{p{xE
z=;Gq3sj2z)_w?T2Wo2dk`}^|l?(y#J?&|92;NZ)4fti_^_4D)Hm7n<b_Wbzx#$9Xn
z;pNQB%jMqQx+*=j95Quvb>GX)xF$O8=;-0o)Zos~)YH>{(T$ev=;+E@YKw}C@9XRG
z@9ysF>hJCB=;Gn>@9^;M?D+Thw;wd_%h1SZcFSLG$YpZKR%P?r-rt*~^48nKQDF1%
z@MdOa|NsBn-s2(p1O*BJKL8>B3r<B;Q$s;eMKUfh0|5X404x9i000{R8vp<X{=lDb
VC?uJ79Z#~6{`3O6gtPPk$piCos%QWJ

delta 271
zcmV+q0r3943%v_}M@dFFIbj<B8vxZm0GXMYg@uLn_4ViH=h@lW`1twr^Yi`v{psoH
z<>lq6sj2w*`045CWo2dj{QU6n@bB;M?Ck91<m92Dp_!SP^z`((xw-fE_xk$!l9H0_
z?Ci_S%;MtWa&mHMX=!zJb=B3?Z*Onw>+9Ou+Sk|D)6>*{udlD`>+6$~lZuOr?d|RG
z@bK*H?CtID<mBb?@$v2L@AvokYin!W-QAd&n3a{4mzS51kB{f)=e@nX<mBXvii+~`
z@@8gc|NsBr-`^qs3r<B;Q$s;eMKUfh0|5X403rDV1quK^04x9i000{R8vp<X|G=Mc
VC?uJ79Z#~6{`3NbxwG^E$pfp(t%Lvo

diff --git a/imageset/topic_read_hot_mine.gif b/theme/images/topic_read_hot_mine.gif
similarity index 79%
rename from imageset/topic_read_hot_mine.gif
rename to theme/images/topic_read_hot_mine.gif
index 456090a5cb02ee94332c769b162d9e52407fac63..14896909d610d49eebd4189056ce1448cc06a6af 100644
GIT binary patch
delta 271
zcmV+q0r39s3-1emM@dFFIbj<B8vyk`0P*bX%4BlLT50s%;Hs&r{{8;mn4vJQMZ!l|
z?da(2#me^d^!oVt^zrfN;^X=E_fe!?Wo2bK&Qj~<=JM|D{rmg)_Vy!`HOqE^!@|Pm
z;NY2=nf3GY{P_6p>FMg@<8^d&_TlA=i;KD{J+&M%-^<N^xF$N%(b47J-r>{K;Lgv)
z<H^yDmdEkVj@+8_@9)+1+UVlp?(OWiA2jaE(8J%y(&yFk*W2*;@xxJI@b~dp*KG6f
z@MdOa|NsBn-s2(p1O*BJKL8>B3r<B;Q$s;eMKUfh0|5X404x9i000{R8vp<X{=lDb
VC{(d>BT{ma{`3OK472nB`vbXir<wo&

delta 271
zcmV+q0r39s3-1emM@dFFIbj<B8vxZm0PpYbmzS53k&)@?>8Yx!{r>*DySt!2P=$qs
z>+9>;+1d5=_4)bv^YioN<>mPJ_?la0Wo2c&OJ3>e>G1II{QUg)_xFY|KcS(a!otJj
z<Kvl`ne_DZ`uh6p?Cj^~=X7*+?Ck7|i;Hq{a%pL4)z#I1Z*OnW(bD4L;@aBU*VotI
z$jh&<uk6gy)0d+0@$vE5-Q?uu?CkDqYir%z-Q32?<ki>Z<>mMB@`{Rz_VMz_XL$1R
z@@8gc|NsBr-`^qs3r<B;Q$s;eMKUfh0|5X403rDV1quK^04x9i000{R8vp<X|G=Mc
VC{(d>BT{ma{`3M2$FuYS`vXT@svQ6T

diff --git a/imageset/topic_read_locked.gif b/theme/images/topic_read_locked.gif
similarity index 50%
rename from imageset/topic_read_locked.gif
rename to theme/images/topic_read_locked.gif
index 969e8e393668402594d08337211ffbeeef0f85be..0ecb78e03f9ad50fe1dc11e87ce05d77759cb8a5 100644
GIT binary patch
delta 241
zcmV<N01p4`1=0n7M@dFFIbj<B8vykH0N=^WxhXu@t+RT0dhO`wnwgpH$j#i6oXcu=
z`R(uM;o-}5f%^ISaBy(rsj=qZ;PmqH_Vo1R-rmSpX6nDi`1JJD(b2+4S?T2Dyfa4Y
z=H~qT{Hm#`^YZbbprGmK=<e(4=CQaiFfiWP*}ghVfPa8u@$c`>%gW&0+>efr{r&y*
z^Yhx**Z%(g=jP_XK2X`#*7*1L{{8;ux4pzsVEg*}@a^p4-{9Myr|03}(|3ga`~0Y<
rr@%r~|NsBn-s2(p1OWg5KL9KM0000R02=@R2L6%z{sQm`lluYj1)-r_

delta 270
zcmV+p0rCFQ1?&ZXM@dFFIbj<B8vxZm0MyjfadC0O!^3%cdh6@!nVFi~+uOIdx0{=r
z^YioN<>jEDp!xdxaBy(O#>V60<MZ?L_4W1P;o*>wkk!@I_V)JE)6<28h3DtzczAf}
z>FNCZ{Hdv`@$vJZprPpK>Fn(6%*@O%FfiQQ+<bg|e}I60@bK`=%*@{2-j0ut{r&y)
z^z_-;+5Z0i=H};re}CB6*!TDN{r>*X&(DjCi~9Tf?(Xj4;o-f#z2xNNrKP3){r#t>
zsDXij|NsBr-`^qr7Cb{wP+2}QFfcVBaA<HsLLf(SZ*_10A^8LW002J#EC2ui02=@s
U000L6z@KoD<of~%?~~yH@xZFBx&QzG

diff --git a/theme/images/topic_read_locked_mine.gif b/theme/images/topic_read_locked_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..12de0341ab2ee29df0cd126006d22dea8bf5f20b
GIT binary patch
literal 723
zcmV;^0xbPUNk%w1VH*G&0QCR>=i=eHDn97r<Ef~qfPaAKy2043v;F=3%yxq9$Iai#
z%I)arb#--{nwr~^oXcu=@a^pR?d~wIMf&;r<EgRq^78id^yJ^)`1JJD(a}+)UcyIM
zJkM0fS7!6_@gtNq>*nU<v$^B==I-n2FfcIQ+1b4{NW|mG@$c`>%gW&0-1YPG+Sk{|
z@y?Fin%UOYzdlga_1eTyV8h?X(&yFt`up(s@!OxL@b~fW?Cg(@kMh{uX4-i8_xJz*
z|J&Z<A^8LW002J#EC2ui02=@s000L5z@Kn9G(2RcfJyc+3_U&%ar#39U<gMc5pq0W
z0f%7rnF$0`g{hN>_}=hCWJkl1TQ=H=Xf3#F9uNzI5EV5(8Xt)~iakRJ8woxKC?EhA
zmzf|dG%g$x94;|?KOrWPJqrM<tgQeRC!icHq(3GFK0P1;0KC4vy#gyA5+WQNI2TnN
z5eFk@(5n~Is{$1>G(IOWAwmI?9=p*b<m4ro0y#NQ2?0Mh8yGbsAoaTh1Oxi`EEfXx
zIpl0Gg20D`K?nupLpXpy1{DGjVmR>N3xy~nGG-J&VgN%DDIjXB-~(O&Tpl!TBtZZn
z0gxpGj66^viKGe;azYp}fSmEZo+KKukeQQYyOTavpje7xL`Qu17&IV}0l<i*7HFE-
zaKi@%rcFEkY(SRkg{vqql-yA9z=R4O;yP_efPq~dW=D9aFoEI&coQ*H7@VUcSsjS+
zR?Sf%YlMM6zWJD7p|S@C<uWsPApnJi2|fzATjpj01`H`Lu*mQtgX<S1^n#Ai0l^Rx
zAr83hVIieBXdv|V&~1u{0?7wz^x(Z>aPtZ)J|FPWPQereFcM5pKB2q!2{pDSFkzdD
zl@M+w>0UqGM+6E1%2WBFrh}jMaUv9u0mJ%yK36>8KnMv?-~|}+{WpaXNL;~$6aNJP
F06WfxPRIZN

literal 0
HcmV?d00001

diff --git a/theme/images/topic_read_mine.gif b/theme/images/topic_read_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f717fbbefb8282bc2feb600889fec9f503ac0716
GIT binary patch
literal 669
zcmV;O0%H9~Nk%w1VH*G&0QCR>`S|(x_V(?^&FJFd+>)HjYIphV?l7-K%XNX{sj=(k
z=Gn8j$X90Szr|6cUcyIM=i=c!&s4lLN8icI{QUeQlr`6<t?lgT@a^p8vADiEOvK~K
zx-CKe{{HaM)$;G}{r&yN@y@v_KEOUufZL9^COY-<^40a)w;?wE{r;JmnRRt_=HTDw
zx4y(tV8h?X^YHM}=hgfA`~Lg<@b~f4cZA!Yr||gkyu7^c>gx9N^z`xZ@$T;b|NmxY
zX4~H5A^8LW002J#EC2ui02=@s000L5z@Kn9Tohaqk;GM45TDQ=LNuxoT8$Q=FybJh
z&xwQ~F!avol%c_pOu$l3%PfOoE_lpN)-z;EUr-1S0zDu+3J@%dix3I`X96REMH(JG
z0T&RPoSO<4FBLC69wl!>5-pet1Ff#DJTWw(AvZA|5<>_K1|2!AE5X7m5Dpc_B*!ug
zfhC17tO_dA)G9bJBoPM@Bqu!$96vS>0WvuX=;`VTIvd*&AvzQW4;BSAJvtZb>lZY~
zCn7|+5g<hYE(v<<$iXm&kB1N+;&>5)#)cCCO!OGXp@G7NAVcQ(03!#C4>@-9XpyAQ
z4h%3cM4b6BCI*cHM0Cu@qo=#ipFn@=SSjIw4NM=BexNy1>4yLt9~?{pz{HNLShH%q
zY65`40^<VA&|#u1(}-nF=m0^_!VhOX0O*)Yx31l}kiZGqWd=Zi05ty!{tL+fGgKK;
zfbcuGv0wloW@OMnWCGk2G5~1a%o%`;4m|{*IHhZZfD}C_WbW*lLXQ~&G*BXfphN~U
zhCoo*4Fbd&0|`*f4l|~K0n}(-uW_M)G#msRMid~Bp+SNz8oa=XVuZN}4NRPX2?78+
D|28-Y

literal 0
HcmV?d00001

diff --git a/theme/images/topic_unread.gif b/theme/images/topic_unread.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e6cfe02ea2cabbd936bc8e6fb332a3c0820ed1e5
GIT binary patch
literal 317
zcmV-D0mA-ANk%w1VHp4(0OJn;#{f3V5JS!&Ptq`4)j(+3P<7m3g5YqD<A0jwkEiON
zv+b|I@xRUV&)N9j=KufyA^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW*Q04x9i000>P
z9smFY)$qwV4;g}>M!SCoAdaGdBp-zYWIF~-8jgapNQ^>|idT#SL`uOD#U=}2YSMV&
z8UjGzwwxqJD91s>sZs_2g5i+_^gN8hKtoZ8db1Dl+z?JghX>f+5p+LB4=f)Be1HHb
zJ0AfbM-N<&0Dymh0X<=WR7iObZU!-!9s~sw43tu5ilSx`lpza8JB||qQ798ch!k6f
zxFrS#Q3RA^00Xm31sNK|6D*8N49Fb_kX}_RoYyH=(Az0HW8W!Yx8og90OIEzV5IES
PENAdm0|p7x9T5OK+f{dp

literal 0
HcmV?d00001

diff --git a/imageset/topic_unread_hot.gif b/theme/images/topic_unread_hot.gif
similarity index 83%
rename from imageset/topic_unread_hot.gif
rename to theme/images/topic_unread_hot.gif
index c303d3ff4e87d6db7b29e9e26305891a7c8e9f06..e712f6e827d99a120f3a9d44cf9d7dc9875b69b4 100644
GIT binary patch
delta 215
zcmV;|04V>L3zrLjM@dFFIbj<B8vxZm0PXJazcp6k<mlw)>iGEi?{ALw;^*=5^z`-i
z>Fe(1=<B^YS@quI&0~Gzn5xW6YTJ~h%z>8n_xQ$Ib?)%;>g(>|p|I@5&fwza{rURJ
zbBgcF)brWj^Yr!4YJ%S3=GoHO%YT&o{QS~!i1+yT#!_xh&y}YA_xb+*{_yeh>+SEz
zX@UCs`@Aeq?CtO2<LB_t*T6Yi{`~y@`~1EyQrXbg$!~|+*WJ)<h5h~h*v{4a`~2wY
R?Y%r(|NsBn-s7>&$^-~fpN9Yd

delta 215
zcmV;|04V>L3zrLjM@dFFIbj<B8vxZm0PpYbu0~kp<>lw+=lJ;f;C_$v<mdDA^Y!)h
z?Ck96>FKRXTk_%Kz;J%rp{u=GY|@>k#EF*o_xHJHcJT1<?Ck8>sj=tE&*S6c{rUR9
zeTwVP)bQNj^z`(@c7x*L;@Q&K!ibdo{QSm!iTC*UxL|Ki$(yG9`1$_+{_^tj?d|Qo
zbb|W&`>Q=s?(Xj7<mBwr*RV-j{`~y@`~0myRN2tizj=q+*WJW<hW-8i*v{4a`~2(c
R>#j>(|NsBr-`}y#$^;tWpR@n~

diff --git a/imageset/topic_unread_hot_mine.gif b/theme/images/topic_unread_hot_mine.gif
similarity index 80%
rename from imageset/topic_unread_hot_mine.gif
rename to theme/images/topic_unread_hot_mine.gif
index 5fd895e67c941086a8709a64fd5979e808f41b8e..fa8b167c644fcf6e3dde78236fb2bf8b7a38daf4 100644
GIT binary patch
delta 215
zcmV;|04V>|3e*aJM@dFFIbj<B8vxZm0NK>q@Xprk?(pNp%g#Js&1!=F{{Hsj=f5^r
z^!4`dZ;tr*`QxLq=<4mvftK;|^vp|Y%w&Dzn5w!tSoPlHq)}ztmZ$FU^5o{~^w-|z
z=<CK>b?WTy(`$s4AwA;d>Gt;c^Yrz}af$B7(Ea-R-{Iy?(s78(f0W<i=f+ZQ&z7hC
z`1$wv`ME1i@A326jiCDb`{Cp0;h(O*FH+~y*Z%zc-^0rH@bdWZ^4ZVU{QUioEky9~
R^SwM<|NsBn-s7>&hXe@0n;8HA

delta 215
zcmV;|04V>|3e*aJM@dFFIbj<B8vxZm0NK>q?9$fm?(W~n%e+ou!FGfG{{Hmj=dVUt
z_4W1OevkP0`P-|r>+9>piI(&8^SxSZz;J%rp{uJ%TJquJnp<Ymo~ZEf@aN~}@!H<$
z>FK#=cI@oz$9IK?FFxkx=JxjZ^z`(<dx`1H(f#`S;^N~@#(jyxh?L{w<G5gN$(*PB
z`T6+x_^3Qj@$vD|mZAFl`{d;1*{83rKvd+_*Z%zc+{ViG@$&ca^4ZVU{QUicIYsjF
R@~%r=|NsBr-`}y#hXfhwn??Wt

diff --git a/imageset/topic_unread_locked.gif b/theme/images/topic_unread_locked.gif
similarity index 57%
rename from imageset/topic_unread_locked.gif
rename to theme/images/topic_unread_locked.gif
index 1662aa0d54223342f3810e79fcd1e916a75fb11f..0a9768ba7d2d0587c03dc6c432418c22a4b26f6c 100644
GIT binary patch
delta 215
zcmV;|04V?I1<wV4M@dFFIbj<B8vxY+0R8>_>AJ<_s<@DCb#O{k&ViP;ij?i{@agL9
z`TF|d<ml$;?8sbq@$&TV%hbxt%<RL><mKu0_4n}c^Wfs<+1lL8ev`sPW7y5r)2q3^
zHCEEo*3Dym-r(fKOlkV=@u7Ny)wsmn-r(x&@4!4<$#;!T`|<OGS7E}##`E;`##C_A
za*5*N<M#LX*4Wyrfr|I|`S9oK@9^^9nycdE=lSgK`uqFn=;`F-<>BM!@zL1O(9yv_
RUjP6A|NsBn-s7?70s>0Nnr#38

delta 241
zcmV<N01p4p1?dHUM@dFFIbj<B8vxZm0R8>_<G{w<vAK+Kc56>l#fp}(kCpH5@9XR9
z`TF|h<>l$=>APuo^YioT&(zDy%jd|==H}=1_4o4f^5f&<+uPg1hm*5YWZ2Es&#$<y
zMp)F;)WC3l;o;%7T59?4@tl8z)4Ido-{0-+?XXN;z<`Zt`ttLBTw=t;#Psy^xMFd~
zev0Da<M;RX*x1;mhKu<4`0wcJ@$vE3qO9fR<@fII`uqFn=;`F-<>ch#?bX@P(9yC_
rVE_OC|NsBr-`^qr7Cb{wP+2}QFfcVBaA<HsLLf(SZ*_10vCRSkvfZMi

diff --git a/imageset/topic_unread_locked_mine.gif b/theme/images/topic_unread_locked_mine.gif
similarity index 52%
rename from imageset/topic_unread_locked_mine.gif
rename to theme/images/topic_unread_locked_mine.gif
index 37fd4ccef2cb953b897ddecba08757fd79318f11..916b60517e9aaa92367b0e5829d2f81e0c7ea2f5 100644
GIT binary patch
delta 215
zcmV;|04V?b1>yyNM@dFFIbj<B8vxY+0OIB7@#pK|;^xT7%fm=!z%o?*{r$r`T<pWm
z>AJ<;mZ;>axR7mia7t6`?eMmWl<Dj3`TF|KftJWzckj*B@$&TM=<D_M_we!a@5s{M
z!^+v(+|#SM-{Iw$BtOv6)B5o9%YT%sTW;9R)uDQW`R(vd^VHkVWPa4P!rk8C>g?~z
zca4KrVe|C$#Zhh3a*6i$_}19ks)35{@A2o-*ZTYW`0(=R=;^{jVe{JHqeou&`1#aI
RYXATM|NsBn-s7?76#_yMmWKcU

delta 241
zcmV<N01p4+1^fknM@dFFIbj<B8vxZm0OjT7@aXH~<K)W9%CuK!uR~V-{r$5`UgyZo
z<G{w%o~hljxr}jkYfn?|?(VUVmFw&4`TF|Bik7=+c<a&C^YioR>FM?L_ww@c>dn&J
z#>(5<+t07K;^N|pGC|VP()sc8!ibciWpCKc)trBX`0ns%@7UYIaevXd!QbEC?d|Qr
zfsKA#V)XR%w_k3@ev0?^_t@CjrG|^|@A2f-*ZTYW_wn-R=;^ajV({JIm{MQ(`1!+I
rZ2$lO|NsBr-`^qr7Cb{wP+2}QFfcVBaA<HsLLf(SZ*_10vCS0%L4TgP

diff --git a/theme/images/topic_unread_mine.gif b/theme/images/topic_unread_mine.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4ca8492e74d51a5b2b74a43c1ecfc286ebb9a418
GIT binary patch
literal 678
zcmV;X0$Ke>Nk%w1VH*G&0M!5h`1$$iyT;<==-!s7&ViQGtGU2DT*zE^_~Yp2=<Dyx
z)a=8}@yF4mQDwh0Ro21F;-s_7f0V*QV%W{q^VZ$`{QQ|BKl<?V&0~GUO=;=s?)mNT
z)V9L*_xSAX@XB|M;Ns{0{{G;@%J1;<##C_Aa*6)@{qpnm%u8zUZ;t-`{@>x|{r&y$
z@$=`>*ZTYW`0(=QvAxbbU-qZE)JkjGW`e;$U&2Rak1a&%?C<pT_VM!c?(gxvJX`<&
z|J&Z<A^8LW002J#EC2ui02=@s000L6z@Kn9<a`b`gXHkx5TDRr#E~Hk7K^~3lrco2
z&xr)1*!a$9)n<W_Ou$k@;Np9=Jes^`_wsE54g^sVBnmz(JP9BxjEo=&06rlKRZkBR
z6h0jq0wA8Bj~XHt4?YwQZ$lCRnh650u&+EWFb@_CFfJ4lLlGDkEIF?z#KkBS4Hn5Y
z$|e|JKMsa1t_dmE*eNqE12PUW1DOj3KLsQg6*&p(?Cl9BquvWT6&EB09|S%+8t(2I
zFmUuhAcF>s4k}7~$PmNFjy!pKNSr7Uf(QmWL{QLi!UqHr1{OHXL9(RDk}X=~XfYzk
z4j%y|NOS0+rU!~RCEE1RQGtWQko$ND9ZIw)Q5`TPkbt0Rgwqi@aXuZ<!6S(eB~$=7
zv7@WkuVA~L0Fdy5xeFmUo;VSe;@T5BSlBBN%@6<`c=PJri#O6ZA->E2=+Gf2;lqR@
zZFr_CfC?6a5lcP{fQ5+wH;7D_8R7+i&!9sCcoD*f&s0MQWKf{OM+MKKM_2G+LctAa
zPY5^&VCE2u3cy*gII|&!1Kd!=U|6uBH5%G$4rD+LCxU?tB?iP`5MxUQ8_3}lIdY>%
Mh653tfC&NsJ8&sL3IG5A

literal 0
HcmV?d00001

diff --git a/theme/imageset.css b/theme/imageset.css
new file mode 100644
index 0000000..5cd9134
--- /dev/null
+++ b/theme/imageset.css
@@ -0,0 +1,376 @@
+/* Former imageset */
+span.imageset {
+	display: inline-block !important;
+	background: transparent none 0 0 no-repeat;
+	margin: 0;
+	padding: 0;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+/* Global imageset items */
+.imageset.site_logo {
+	background-image: url("./images/site_logo.gif");
+	padding-left: 149px;
+	padding-top: 52px;
+}
+.imageset.forum_link {
+	background-image: url("./images/forum_link.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_read {
+	background-image: url("./images/forum_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_read_locked {
+	background-image: url("./images/forum_read_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_read_subforum {
+	background-image: url("./images/forum_read_subforum.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_unread {
+	background-image: url("./images/forum_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_unread_locked {
+	background-image: url("./images/forum_unread_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.forum_unread_subforum {
+	background-image: url("./images/forum_unread_subforum.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_moved {
+	background-image: url("./images/topic_moved.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read {
+	background-image: url("./images/topic_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read_mine {
+	background-image: url("./images/topic_read_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read_hot {
+	background-image: url("./images/topic_read_hot.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read_hot_mine {
+	background-image: url("./images/topic_read_hot_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read_locked {
+	background-image: url("./images/topic_read_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_read_locked_mine {
+	background-image: url("./images/topic_read_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread {
+	background-image: url("./images/topic_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread_mine {
+	background-image: url("./images/topic_unread_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread_hot {
+	background-image: url("./images/topic_unread_hot.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread_hot_mine {
+	background-image: url("./images/topic_unread_hot_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread_locked {
+	background-image: url("./images/topic_unread_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.topic_unread_locked_mine {
+	background-image: url("./images/topic_unread_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_read {
+	background-image: url("./images/sticky_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_read_mine {
+	background-image: url("./images/sticky_read_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_read_locked {
+	background-image: url("./images/sticky_read_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_read_locked_mine {
+	background-image: url("./images/sticky_read_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_unread {
+	background-image: url("./images/sticky_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_unread_mine {
+	background-image: url("./images/sticky_unread_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_unread_locked {
+	background-image: url("./images/sticky_unread_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.sticky_unread_locked_mine {
+	background-image: url("./images/sticky_unread_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_read {
+	background-image: url("./images/announce_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_read_mine {
+	background-image: url("./images/announce_read_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_read_locked {
+	background-image: url("./images/announce_read_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_read_locked_mine {
+	background-image: url("./images/announce_read_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_unread {
+	background-image: url("./images/announce_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_unread_mine {
+	background-image: url("./images/announce_unread_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_unread_locked {
+	background-image: url("./images/announce_unread_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.announce_unread_locked_mine {
+	background-image: url("./images/announce_unread_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_read {
+	background-image: url("./images/announce_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_read_mine {
+	background-image: url("./images/announce_read_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_read_locked {
+	background-image: url("./images/announce_read_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_read_locked_mine {
+	background-image: url("./images/announce_read_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_unread {
+	background-image: url("./images/announce_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_unread_mine {
+	background-image: url("./images/announce_unread_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_unread_locked {
+	background-image: url("./images/announce_unread_locked.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.global_unread_locked_mine {
+	background-image: url("./images/announce_unread_locked_mine.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.subforum_read {
+	background-image: url("./images/subforum_read.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.subforum_unread {
+	background-image: url("./images/subforum_unread.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.pm_read {
+	background-image: url("./images/topic_read.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.pm_unread {
+	background-image: url("./images/topic_unread.gif");
+	padding-left: 27px;
+	padding-top: 27px;
+}
+.imageset.icon_back_top {
+	background-image: url("./images/icon_back_top.gif");
+	padding-left: 11px;
+	padding-top: 11px;
+}
+.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {
+	background-image: url("./images/icon_contact_aim.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_email {
+	background-image: url("./images/icon_contact_email.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_icq, .imageset.phpbb_icq-icon {
+	background-image: url("./images/icon_contact_icq.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_jabber {
+	background-image: url("./images/icon_contact_jabber.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
+	background-image: url("./images/icon_contact_msnm.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_www, .imageset.phpbb_website-icon {
+	background-image: url("./images/icon_contact_www.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_yahoo, .imageset.phpbb_yahoo-icon {
+	background-image: url("./images/icon_contact_yahoo.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_delete {
+	background-image: url("./images/icon_post_delete.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_info {
+	background-image: url("./images/icon_post_info.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_report {
+	background-image: url("./images/icon_post_report.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_target {
+	background-image: url("./images/icon_post_target.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.icon_post_target_unread {
+	background-image: url("./images/icon_post_target_unread.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_attach {
+	background-image: url("./images/icon_topic_attach.gif");
+	padding-left: 7px;
+	padding-top: 10px;
+}
+.imageset.icon_topic_latest {
+	background-image: url("./images/icon_topic_latest.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_newest {
+	background-image: url("./images/icon_topic_newest.gif");
+	padding-left: 11px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_reported {
+	background-image: url("./images/icon_topic_reported.gif");
+	padding-left: 16px;
+	padding-top: 14px;
+}
+.imageset.icon_topic_deleted {
+	background-image: url("./images/icon_topic_deleted.png");
+	padding-left: 16px;
+	padding-top: 14px;
+}
+.imageset.icon_topic_unapproved {
+	background-image: url("./images/icon_topic_unapproved.gif");
+	padding-left: 16px;
+	padding-top: 14px;
+}
+.imageset.icon_topic_poll {
+	background-image: url("./images/icon_topic_poll.gif");
+	padding-left: 11px;
+	padding-top: 10px;
+}
+.imageset.icon_user_warn {
+	background-image: url("./images/icon_user_warn.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+
+.imageset.icon_contact {
+	background-image: url("./images/icon_contact.png");
+	padding-left: 16px;
+	padding-top: 12px;
+}
+
+
+/* English images for fallback */
+.imageset.icon_user_online {
+	background-image: url("./en/icon_user_online.gif");
+	padding-left: 58px;
+	padding-top: 58px;
+}
diff --git a/theme/index.htm b/theme/index.htm
deleted file mode 100644
index e69de29..0000000
diff --git a/theme/large.css b/theme/large.css
deleted file mode 100644
index dfb1d2c..0000000
--- a/theme/large.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 12px;
-}
\ No newline at end of file
diff --git a/theme/links.css b/theme/links.css
new file mode 100644
index 0000000..2d3181d
--- /dev/null
+++ b/theme/links.css
@@ -0,0 +1,210 @@
+/* Link Styles
+---------------------------------------- */
+
+/* Links adjustment to correctly display an order of rtl/ltr mixed content */
+a {
+	direction: ltr;
+	unicode-bidi: embed;
+	text-decoration: none;
+}
+
+a:hover	{ text-decoration: underline; }
+
+/* Coloured usernames */
+.username-coloured {
+	font-weight: bold;
+	display: inline !important;
+	padding: 0 !important;
+}
+
+/* Links on gradient backgrounds */
+.forumbg .header a, .forabg .header a, th a {
+	text-decoration: none;
+}
+
+.forumbg .header a:hover, .forabg .header a:hover, th a:hover {
+	text-decoration: underline;
+}
+
+/* Navigation bar links */
+li.breadcrumbs span:first-child > a {
+	display: inline-block;
+	padding-left: 17px;
+}
+
+/* Notification mark read link */
+.dropdown-extended a.mark_read {
+	background-position: center center;
+	background-repeat: no-repeat;
+	border-radius: 3px 0 0 3px;
+	display: none;
+	margin-top: -20px;
+	position: absolute;
+	z-index: 2;
+	right: 0;
+	top: 50%;
+	width: 30px;
+	height: 40px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.dropdown-extended li:hover a.mark_read {
+	display: block;
+}
+
+.dropdown-extended a.mark_read:hover {
+	width: 40px;
+}
+
+/* Links for forum/topic lists */
+a.forumtitle {
+	font-size: 1.2em;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+a.forumtitle:hover {
+	text-decoration: underline;
+}
+
+a.topictitle {
+	font-size: 1.2em;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+a.topictitle:hover {
+	text-decoration: underline;
+}
+
+a.lastsubject {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+a.lastsubject:hover {
+	text-decoration: underline;
+}
+
+/* Post body links */
+.postlink {
+	text-decoration: none;
+	border-bottom: 1px solid transparent;
+	padding-bottom: 0;
+}
+
+.postlink:hover {
+	text-decoration: none;
+}
+
+.signature a, .signature a:hover {
+	border: none;
+	text-decoration: underline;
+}
+
+/* Profile links */
+.postprofile a, .postprofile dt.author a {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.postprofile a:hover, .postprofile dt.author a:hover {
+	text-decoration: underline;
+}
+
+/* Profile searchresults */
+.search .postprofile a {
+	text-decoration: none;
+	font-weight: normal;
+}
+
+.search .postprofile a:hover {
+	text-decoration: underline;
+}
+
+/* Back to top of page */
+.back2top {
+	clear: both;
+	height: 11px;
+	text-align: right;
+}
+
+a.top {
+	background: none no-repeat top left;
+	text-decoration: none;
+	width: 11px;
+	height: 11px;
+	display: block;
+	float: right;
+	overflow: hidden;
+	letter-spacing: 1000px;
+	text-indent: 11px;
+}
+
+a.top2 {
+	background: none no-repeat 0 50%;
+	text-decoration: none;
+	padding-left: 15px;
+}
+
+/* Arrow links  */
+a.arrow-up		{ background: none no-repeat left center; }
+a.arrow-down		{ background: none no-repeat right center; }
+a.arrow-left		{ background: none no-repeat 3px 60%; }
+a.arrow-right		{ background: none no-repeat 95% 60%; }
+
+a.arrow-up {
+	padding-left: 10px;
+	text-decoration: none;
+	border-bottom-width: 0;
+}
+
+a.arrow-up:hover {
+	background-position: left top;
+}
+
+a.arrow-down {
+	padding-right: 10px;
+}
+
+a.arrow-down:hover {
+	background-position: right bottom;
+	text-decoration: none;
+}
+
+a.arrow-left {
+	padding-left: 12px;
+}
+
+a.arrow-left:hover {
+	text-decoration: none;
+	background-position: 0 60%;
+}
+
+a.arrow-right {
+	padding-right: 12px;
+}
+
+a.arrow-right:hover {
+	text-decoration: none;
+	background-position: 100% 60%;
+}
+
+/* invisible skip link, used for accessibility  */
+.skiplink {
+	position: absolute;
+	left: -999px;
+	width: 990px;
+}
+
+/* Feed icon in forumlist_body.html */
+a.feed-icon-forum {
+	float: right;
+	margin: 3px;
+}
+
+a.anchor {
+	display: block;
+}
diff --git a/theme/medium.css b/theme/medium.css
deleted file mode 100644
index 4c992f9..0000000
--- a/theme/medium.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 11px;
-}
\ No newline at end of file
diff --git a/theme/normal.css b/theme/normal.css
deleted file mode 100644
index d0783d1..0000000
--- a/theme/normal.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 10px;
-}
\ No newline at end of file
diff --git a/theme/print.css b/theme/print.css
deleted file mode 100644
index 3143b3c..0000000
--- a/theme/print.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/* proSilver Print Style Sheet
--------------------------------------------------
-	Author: subBlue  ( http://www.subBlue.com/ )
-	Version: 25 August 2004
-
-	Copyright 2004 phpBB Group
--------------------------------------------------*/
-
-
-/* Lots still TODO here! */
-
-/* General markup styles */
-* {
-	padding: 0;
-	margin: 0;
-}
-
-body {
-	font: 11pt Verdana, Arial, Helvetica, sans-serif;
-	color:#000000;
-}
-
-a:link		{ color: #000000; text-decoration: none; }
-a:visited	{ color: #000000; text-decoration: none; }
-a:active	{ color: #000000; text-decoration: none; }
-
-img, .noprint, #sub-header, #sub-footer, .navbar, .box1, .divider, .signature { display: none; }
-
-/* Container for the main body */
-#wrap {
-	margin: 0 2em;
-}
-
-p { font-size: 85%; }
-.copyright { font-size: 75%; }
-.page-number { float:right; width: auto; text-align: right; font-size: 75%; }
-
-h1, h2, h3, h1 a, h2 a, h3 a {
-	font-family: "Trebuchet MS",georgia,Verdana,Sans-serif;
-	color: #000000;
-	background: none;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-h1 { font-size: 20pt; }
-h2 { font-size: 16pt; margin-top: 1em; }
-h3 { font-size: 14pt; margin-top: 1em; }
-
-.content {
-	font-size: 11pt;
-	line-height: 14pt;
-	margin-bottom: 1em;
-	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	overflow: hidden;
-}
-
-/* CSS2 Print tip from: http://www.alistapart.com/articles/goingtoprint/ */
-.postbody a:link, .postbody a:visited, .postbody a:active, .postbody a:hover {
-	text-decoration: underline;
-	padding: 0.1em 0.2em;
-	margin: -0.1em -0.2em;
-	color: #666;
-	background: none;
-	font-size: 100%;
-}
-
-html>body .postbody a:link:after, html>body .postbody a:visited:after {
-	content: " (" attr(href) ") ";
-	font-size: 90%;
-	text-decoration: none;
-}
-
-hr {
-	height: 1px;
-	background-color: #999999;
-	border-width: 0;
-}
-
-.author {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 75%;
-	margin-bottom: 0.6em;
-}
-
-.date {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	float: right;
-	position: relative;
-	text-align: right;
-	font-size: 75%;
-}
-
-/* Dont want to print url for names or titles in content area */
-.postbody .author a:link, .postbody .author a:visited, 
-html>body .postbody .author a:link:after, 
-html>body .postbody .author a:visited:after,
-.postquote .quote-by a:link, .postquote .quote-by a:visited, 
-html>body .postquote .quote-by a:link:after, 
-html>body .postquote .quote-by a:visited:after,
-html>body .postbody h1 a:link:after, html>body .postbody h2 a:link:after {
-	text-decoration: none;
-	content: "";
-}
-
-/* Poster profile */
-.postprofile { display: none; }
-.grip-show { display:none; }
-
-/* Quote */
-.postquote {
-	font-size: 85%;
-	margin: 1em 18% 1em 4%;
-	padding: 0.5em;
-	position: relative;
-	line-height: 1.5em;
-	border: 1px #999999 solid;
-}
-
-.postquote img { display: none; }
-.postquote span { display: block; }
-.postquote span .postquote { font-size: 100%; }
-.quote-by { font-weight: bold; }
-
-/* Misc page elements */
-div.spacer { clear: both; }
-
-/* Accessibility tweaks: Mozilla.org */
-.skip_link { display: none; }
diff --git a/theme/stylesheet.css b/theme/stylesheet.css
index 2e89f9d..09ad532 100644
--- a/theme/stylesheet.css
+++ b/theme/stylesheet.css
@@ -1,3710 +1,393 @@
-/*  phpBB 3.0 Style Sheet
+/*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:		debianforum
-	Based on style:		proSilver
-	Original author:	subBlue ( http://www.subBlue.com/ )
-	Modified by:		Timo Salmen
-	Version:        1.0.1 (Generated: 200-04-03)
-	
-	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
+    Style name:      debianforum
+    Based on style:  prosilver (the default phpBB 3.1.x style)   
+    Original author: Tom Beddard ( http://www.subblue.com/ )
+    Modified by:    
     --------------------------------------------------------------
-*/
-
-
-
-@import url("gallery.css");
-
-
-/* General proSilver Markup Styles
----------------------------------------- */
-
-* {
-	/* Reset browsers default margin, padding and font sizes */
-	margin: 0;
-	padding: 0;
-}
-
-html {
-	font-size: 100%;
-	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */
-	height: 100%;
-	margin-bottom: 1px;
-}
-
-body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	color: #828282;
-	background-color: #FFFFFF;
-	/*font-size: 62.5%;			 This sets the default font size to be equivalent to 10px */
-	font-size: 10px;
-	margin: 0;
-	padding: 0px 0px 0px 0px;
-}
-
-
-.advice a, .advice a:visited, .advice a:active, .panel a, .panel a:visited, .panel a:active {
-	color: #D70751;
-	text-decoration: none;
-}
-
-.advice a:hover, .panel a:hover {
-	text-decoration: underline;
-}
-
-h1 {
-	font-family: "Bitstream Vera Serif", Georgia, Palatino, serif;
-	font-size: 40px;
-	margin: 0;
-	margin-top: -1px;
-	margin-left: 69px;	/* indentation from the debian logo on the left */
-	padding: 0;
-	font-weight: 100;
-	color: #606060;
-}
-
-h2 {
-	/* Forum header titles */
-	font-family: "Bitstream Vera Serif", Georgia, Palatino, serif;
-	font-weight: normal;
-	color: #3f3f3f;
-	font-size: 2em;
-
-}
-
-h2.solo {
-	margin-bottom: 1em;
-}
-
-h3 {
-	/* Sub-headers (also used as post headers, but defined later) */
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-weight: bold;
-	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	padding-bottom: 2px;
-	font-size: 1.05em;
-	color: #D70751;
-	margin-top: 20px;
-}
-
-h3 a, h3 a:link, h3 a:visited, h3 a:active {
-	color: #D70751;
-}
-
-h4 {
-	/* Forum and topic list titles */
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.3em;
-}
-
-p {
-	line-height: 1.3em;
-	font-size: 1.1em;
-	margin-bottom: 1.5em;
-}
-
-img {
-	border-width: 0;
-}
-
-hr {
-	/* Also see tweaks.css */
-	border: 0 none #FFFFFF;
-	border-top: 1px solid #d70751;
-	height: 1px;
-	margin: 5px 0;
-	display: block;
-	clear: both;
-}
-
-hr.dashed {
-	border-top: 1px dashed #CCCCCC;
-	margin: 10px 0;
-}
-
-hr.divider {
-	border-top: 2px solid #B0B0B0;
-}
-
-p.right {
-	text-align: right;
-}
-
-/* Main blocks
----------------------------------------- */
-#wrap {
-	padding: 0;
-	min-width: 650px;
-}
-
-#simple-wrap {
-	padding: 6px 10px;
-}
-
-#page-body {
-	float:right;
-	margin:4px 0pt;
-	width:85%;
-}
-
-#page-footer {
-	clear: both;
-}
-
-#page-footer h3 {
-	margin-top: 20px;
-}
-
-#logo {
-	float: left;
-	position: absolute;
-	top: 5px;
-	left: 5px;
-}
-
-a#logo:hover {
-	text-decoration: none;
-}
-
-/* Site description and logo */
-#site-description {
-	float: left;
-	width: 70%;
-}
-
-#site-description p {
-font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	padding: 0;
-	margin: 0;
-	margin-top: -1px;
-	margin-left: 69px;	/* indentation from the debian logo on the lft */
-	font-size: 15px;
-	font-weight: 500;
-	color: #606060;
-}
 
 
-#site-description h1 {
-	margin-right: 0;
-}
-
-#site-description a:hover
-{
-	text-decoration: none;
-	border-bottom: none;
-}
-
-/* Round cornered boxes and backgrounds
----------------------------------------- */
-.headerbar {
-	background-color: #f0f0f0;
-	color: #707070;
-	margin-bottom: 4px;
-	padding: 0 5px;
-	height: 82px;
-	border-bottom: 1px solid #b0b0b0;
-} 
-
-.navbar {
-	background-color: #ebebeb;
-	padding: 0 10px;
-}
-
-.forabg {
-	margin-bottom: 4px;
-	padding: 0 5px;
-	clear: both;
-}
-
-.forumbg {
-	margin-bottom: 4px;
-	padding: 0 5px;
-	clear: both;
-}
-
-.panel {
-	margin-bottom: 4px;
-	padding: 0 10px;
-	background-color: #f3f3f3;
-}
-
-.post {
-	padding: 0 10px;
-	margin-bottom: 6px;
-	background-repeat: no-repeat;
-	background-position: 100% 0;
-}
-
-.post:target .content {
-	color: #000000;
-}
-
-.post:target h3 a {
-	color: #000000;
-}
-
-.bg1 { 
-	background-color: #f7f7f7;
-}
-
-.bg2 { 
-	background-color: #e3e3e3; 
-}
-
-.bg3 { 
-	background-color: #ebebeb; 
-}
-
-.rowbg {
-	margin: 5px 5px 2px 5px;
-}
-
-.ucprowbg {
-	background-color: #e2e2e2;
-}
-
-.fieldsbg {
-	/*border: 1px #DBDEE2 solid;*/
-	background-color: #eaeaea;
-}
-
-
-/* Horizontal lists
-----------------------------------------*/
-ul.linklist {
-	display: block;
-	margin: 0;
-}
-
-ul.linklist li {
-	display: block;
-	list-style-type: none;
-	float: left;
-	width: auto;
-	margin-right: 5px;
-	font-size: 1.1em;
-	line-height: 2.2em;
-}
-
-ul.linklist li.rightside, p.rightside {
-	float: right;
-	margin-right: 0;
-	margin-left: 5px;
-	text-align: right;
-}
-
-ul.navlinks {
-	padding-bottom: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid #FFFFFF;
-	font-weight: bold;
-}
-
-ul.leftside {
-	float: left;
-	margin-left: 0;
-	margin-right: 5px;
-	text-align: left;
-}
-
-ul.rightside {
-	float: right;
-	margin-left: 5px;
-	margin-right: -5px;
-	text-align: right;
-}
-
-/* Table styles
-----------------------------------------*/
-table.table1 thead th a, table.table1 thead th a:link, table.table1 thead th a:visited, table.table1 thead th a:active {
-	font-size: 1em;
-}
 
-table.table1 {
-	/* See tweaks.css */
-}
-
-#ucp-main table.table1 {
-	padding: 2px;
-}
-
-table.table1 thead th {
-	font-weight: normal;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	line-height: 1.3em;
-	font-size: 1em;
-	padding: 0 0 4px 3px;
-}
-
-table.table1 thead th span {
-	padding-left: 7px;
-}
-
-table.table1 tbody tr {
-	border: 1px solid #cfcfcf;
-}
-
-table.table1 tbody tr:hover, table.table1 tbody tr.hover {
-	background-color: #f6f6f6;
-	color: #000;
-}
 
-table.table1 td {
-	color: #6a6a6a;
-	font-size: 1.1em;
-}
 
-table.table1 tbody td {
-	padding: 5px;
-	border-top: 1px solid #FAFAFA;
-}
 
+*/
+@import url("common.css");
+@import url("links.css");
+@import url("content.css");
+@import url("buttons.css");
+@import url("cp.css");
+@import url("forms.css");
 
-table.table1 tbody th {
-	padding: 5px;
-	border-bottom: 1px solid #000000;
-	text-align: left;
-	color: #333333;
-	background-color: #FFFFFF;
-}
+@import url("colours.css");
+@import url("imageset.css");
 
-/* Specific column styles */
-table.table1 .name		{ text-align: left; }
-table.table1 .posts		{ text-align: center !important; width: 7%; }
-table.table1 .joined	{ text-align: left; width: 15%; }
-table.table1 .active	{ text-align: left; width: 15%; }
-table.table1 .mark		{ text-align: center; width: 7%; }
-table.table1 .info		{ text-align: left; width: 30%; }
-table.table1 .info div	{ width: 100%; white-space: nowrap; overflow: hidden; }
-table.table1 .autocol	{ line-height: 2em; white-space: nowrap; }
-table.table1 thead .autocol { padding-left: 1em; }
-
-table.table1 span.rank-img {
-	float: right;
-	width: auto;
-}
 
-table.info td {
-	padding: 3px;
-}
+@import url("df_images.css");
 
-table.info tbody th {
-	padding: 3px;
-	text-align: right;
-	vertical-align: top;
-	color: #000000;
-	font-weight: normal;
+.page-sideb2ar-left {  
+/*display: flex; */
+display:block;
+float:left; 
+overflow:hidden;
+background-color: "#ff00ff"; 
+margin-top:120px;    
+width:10%; 
+margin-left: 10px;    padding: 20px;
 }
 
-.forumbg table.table1 {
-	margin: 0 -2px -1px -1px;
-}
+.head2erbar {
 
-/* Misc layout styles
----------------------------------------- */
-/* column[1-2] styles are containers for two column layouts 
-   Also see tweaks.css */
-.column1 {
-	float: left;
-	clear: left;
-	width: 49%;
-}
+margin-left: 100px;
 
-.column2 {
-	float: right;
-	clear: right;
-	width: 49%;
+ background-color: #12a3eb;
+   /* background-image: url("./images/bg_header.gif"); */
+   display:block;float:left; 
+    padding: 25px;
 }
 
-/* General classes for placing floating blocks */
-.left-box {
-	float: left;
-	width: auto;
-	text-align: left;
-}
 
-.right-box {
-	float: right;
-	width: auto;
-	text-align: right;
+#sides{
+margin:0;
 }
-
-dl.details {
-	/*font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;*/
-	font-size: 1.1em;
+#left{
+float:left;
+width:25%;
+overflow:hidden;
 }
 
-dl.details dt {
-	float: left;
-	clear: left;
-	width: 30%;
-	text-align: right;
-	color: #000000;
-	display: block;
+#wrap{
+/*float:right; */
+/* width:75%; */
+overflow:hidden;
 }
 
-dl.details dd {
-	margin-left: 0;
-	padding-left: 5px;
-	margin-bottom: 5px;
-	color: #828282;
-	float: left;
-	width: 65%;
+@media (min-width: 650px) {
+#wrapdf{
+    overflow:hidden;
+    border: none;
+    border-radius: 0;
+    margin: 0;
+    min-width: 290px;
 }
-
-/* Pagination
----------------------------------------- */
-.pagination {
-	height: 1%; /* IE tweak (holly hack) */
-	width: auto;
-	text-align: right;
-	margin-top: 5px;
-	float: right;
 }
 
-.pagination span.page-sep {
-	display: none;
-}
 
-li.pagination {
-	margin-top: 0;
-}
+.klumpatsch {
+float:left; 
+display:block;
+overflow:hidden;
+margin-left: 150px;
 
-.pagination strong, .pagination b {
-	font-weight: normal;
+background-color: #12a3eb;
+/* background-image: url("./images/bg_header.gif"); */
+   
+padding: 25px;
 }
 
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	color: #FFFFFF;
-	background-color: #bfbfbf;
-	border: 1px solid #bfbfbf;
-	font-size: 0.9em;
-}
 
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	font-weight: normal;
-	text-decoration: none;
-	color: #747474;
-	margin: 0 2px;
-	padding: 0 2px;
-	background-color: #eeeeee;
-	border: 1px solid #bababa;
-	font-size: 0.9em;
-	line-height: 1.5em;
-}
 
-.pagination span a:hover {
-	border-color: #d2d2d2;
-	background-color: #d2d2d2;
-	color: #FFF;
-	text-decoration: none;
+dfnavibar {
+  order:2; 
+    float: left;
+    width: 130px;
+  /*  border: 3px solid #C6C6C6; */
 }
 
-.pagination img {
-	vertical-align: middle;
-}
 
-/* Pagination in viewforum for multipage topics */
-.row .pagination {
-	display: block;
-	float: right;
-	width: auto;
-	margin-top: 0;
-	padding: 1px 0 1px 15px;
-	font-size: 0.9em;
-	background: none 0 50% no-repeat;
+#wrap {
+    overflow: hidden;
 }
-
-.row .pagination span a, li.pagination span a {
-	background-color: #FFFFFF;
+#wrapoverallheader {
+    background-color: #fff; /*hintergrundfarbe seite */
+    border: 1px solid transparent;
+    border-color: #e6e9ed;
+    border-radius: 8px;
+    overflow: hidden;
+    padding: 7px;
 }
 
-.row .pagination span a:hover, li.pagination span a:hover {
-	background-color: #d2d2d2;
-}
 
-/* Miscellaneous styles
----------------------------------------- */
-#forum-permissions {
-	float: right;
-	width: auto;
-	padding-left: 5px;
-	margin-left: 5px;
-	margin-top: 10px;
-	text-align: right;
+/*Hauptseite*/
+.icon.forum_read  {
+background-image: url("./images/forum_read.png"); 
+background-repeat: no-repeat;
 }
-
-.copyright {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 8pt;
-	background-color: #f0f0f0;
-	color: #606060;
-	padding: 0.2em 1em 0.2em 1em;
-	margin: 2em 0 0 0;
-	text-align: center;
-	line-height: 1.2;
-	clear: both;
-	border-top: 1px solid #b0b0b0;
+/*Kategorien*/
+.icon.topic_read  {
+background-image: url("./images/forum_read.png"); 
+background-repeat: no-repeat;
 }
 
-.copyright a:link, .copyright a:active, .copyright a:visited {
-	color: #606060;
-	text-decoration: underline;
+.icon.topic_read {
+    background-image: url("./images/forum_read.png");
+    background-repeat: no-repeat;
 }
-
-.copyright a:hover {
-	color: #606060;
-	text-decoration: none;
+.forum_read {
+    background-image: url("./images/forum_read.gif");
 }
 
-.small {
-	font-size: 0.9em !important;
+.page-body {
+    float:right;
 }
 
-.titlespace {
-	margin-bottom: 15px;
-}
 
-.headerspace {
-	margin-top: 20px;
-}
 
-.error {
-	color: #bcbcbc;
-	font-weight: bold;
-	font-size: 1em;
-}
+    /* kann sein dass das tut, noetig fuer order:2 fuer navi und order:3 fuer beitraege ... mal sehn */
+body {
+padding: 0px 0;
+font-size: 10px;
+		display:flex;
+    flex-flow: column;
+}
+
+/* zitaticon soll nicht aussehn wie der rest */
+.quote-icon {
+					    box-shadow: "" ! important; 
+    border:0px;
+    content:"";
+    background-image: "" ! important;
+	background-color: #F3F3F3;
+    width: 56px;
+    padding: 50px 0 50px 0;
+	border-color: "" ! important; 
+	color: "" ! important;
+ background-repeat: no-repeat;
+
+}
+
+/*
+.dfzitatbutton {
+background-image: 
+url("./images/icon_post_quote.gif")
+}*/
 
-.reported {
-	background-color: #f7f7f7;
-}
 
-li.reported:hover {
-	background-color: #ececec;
+.quote-icon:after {
+    background-image: "" ! important;
 }
-
-div.rules {
-	background-color: #ececec;
-	color: #bcbcbc;
-	padding: 0 10px;
-	margin: 10px 0;
-	font-size: 1.1em;
+.quote-icon:hover:after {
+    background-image: "" ! important;
+    border:0px;
+    content:"";
+ /*  padding: 50px 0 50px 0; */
 }
 
-div.rules ul {
-	margin-left: 20px;
+.quote-icon:hover:before {
+    background-image: "" ! important;
+    content:"";
 }
 
-p.rules {
-	background-color: #ececec;
-	background-image: none;
-	padding: 5px;
+.quote-icon:hover{
+    background-image: "" ! important;
+    background-image: url("./images/icon_post_quote_r.gif") ;
+    border:0px;
+    content:"";
+    width: 55px;
+ /*   padding: 50px 0 50px 0; */
 }
 
-p.rules img {
-	vertical-align: middle;
-}
 
-p.rules a {
-	vertical-align: middle;
-	clear: both;
-}
 
-#top {
-	position: absolute;
-	top: -20px;
-}
 
-.clear {
-	display: block;
-	clear: both;
-	font-size: 1px;
-	line-height: 1px;
-	background: transparent;
-}
-/* proSilver Link Styles
----------------------------------------- */
-
-a:link	{ color: #898989; text-decoration: none; }
-a:visited	{ color: #898989; text-decoration: none; }
-a:hover	{ color: #d3d3d3; text-decoration: underline; }
-a:active	{ color: #d2d2d2; text-decoration: none; }
-
-/* Coloured usernames */
-.username-coloured {
-	font-weight: bold;
-	display: inline !important;
-}
+/* dads */ 
 
-/* Links on gradient backgrounds */
-#search-box a:link, .navbg a:link, .forumbg .header a:link, .header a:link, th a:link {
-	color: #000000;
-	text-decoration: none;
-}
 
-#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .header a:visited, th a:visited {
-	color: #000000;
-	text-decoration: none;
-}
 
-#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .header a:hover, th a:hover {
-	color: #ffffff;
-	text-decoration: underline;
+.forabg {
+    border-radius: 5px;
+    margin-right: 3px;
 }
-
-#search-box a:active, .navbg a:active, .forumbg .header a:active, .header a:active, th a:active {
-	color: #ffffff;
-	text-decoration: none;
+.forabg {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors:none;
+    -moz-border-top-colors: none;
+    background-color: #dbdbdb;
+    border-color: #d0d0d0 #d0d0d0 #d0d0d0 #d70751;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 1px 1px 3px;
+    color: #000000;
 }
 
-/* Links for forum/topic lists */
-a.forumtitle {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.2em;
-	font-weight: bold;
-	color: #898989;
-	text-decoration: none;
+.forabg {
+    clear: both;
+    margin-bottom: 4px;
+    padding: 0 5px;
 }
 
-/* a.forumtitle:visited { color: #898989; } */
 
-a.forumtitle:hover {
-	color: #bcbcbc;
-	text-decoration: underline;
-}
 
-a.forumtitle:active {
-	color: #898989;
-}
 
-a.topictitle {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.2em;
-	font-weight: bold;
-	color: #898989;
-	text-decoration: none;
+* {
+    margin: 0;
+    padding: 0;
 }
 
-/* a.topictitle:visited { color: #d2d2d2; } */
-
-a.topictitle:hover {
-	color: #bcbcbc;
-	text-decoration: underline;
-}
 
-a.topictitle:active {
-	color: #898989;
-}
 
-/* Post body links */
-.postlink {
-	text-decoration: none;
-	color: #D70751;
+.menuitem {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+    background-color: #f0f0f0;
+    border-color: #d0d0d0 #d0d0d0 #d0d0d0 #d70751;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 1px 1px 3px;
+    color: #000000;
+    margin: 0.5em 0 0;
+    padding: 0.1em 0.2em;
+    text-transform: uppercase;
+    width: 80%;
+border-radius: 3px;
 }
 
-.postlink:visited {
-	text-decoration: none;
-	color: #D70751;
-}
 
-.postlink:active {
-	text-decoration: none;
-	color: #D70751;
-}
 
-.postlink:hover {
-	text-decoration: underline;
-	color: #D70751;
-}
 
-.signature a, .signature a:visited, .signature a:active {
-	border: none;
-	text-decoration: none;
-	color: #D70751;
-}
 
-.signature a:hover {
-	border: none;
-	text-decoration: underline;
-}
 
-/* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
-	font-weight: bold;
-	color: #D70751;
-	text-decoration: none;
-}
 
-.postprofile a:hover, .postprofile dt.author a:hover {
-	text-decoration: underline;
-	color: #D70751;
+.forumbg {
+    border-radius: 5px;
+    margin-right: 3px;
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors:none;
+    -moz-border-top-colors: none;
+    background-color: #dbdbdb;
+    border-color: #d0d0d0 #d0d0d0 #d0d0d0 #d70751;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 1px 1px 3px;
+    color: #000000;
+    clear: both;
+    margin-bottom: 4px;
+    padding: 0 5px;
 }
 
 
-/* Profile searchresults */	
-.search .postprofile a {
-	color: #898989;
-	text-decoration: none; 
-	font-weight: normal;
-}
 
-.search .postprofile a:hover {
-	color: #d3d3d3;
-	text-decoration: underline; 
+.headerbar {
+    background-color: #f0f0f0;
+    border-bottom: 1px solid #b0b0b0;
+    color: #707070;
+    margin-bottom: 4px;
+    padding: 0 5px;
 }
 
-/* Back to top of page */
-.back2top {
-	clear: both;
-	height: 11px;
-	text-align: right;
+#site-description  {
+padding-left: 40px;
 }
 
-a.top {
-	background: none no-repeat top left;
-	text-decoration: none;
-	width: 11px;
-	height: 11px;
-	display: block;
-	float: right;
-	overflow: hidden;
-	letter-spacing: 1000px;
-	text-indent: 11px;
+#site-description h1 {
+/*
+    margin-right: 0;
+ */
 }
 
-a.top2 {
-	background: none no-repeat 0 50%;
-	text-decoration: none;
-	padding-left: 15px;
+h1 {
+    color: #606060;
+    font-family: "Bitstream Vera Serif",Georgia,Palatino,serif;
+    font-size: 40px;
+    font-weight: 100;
+    margin: 14px 0 0 69px;
 }
 
-/* Arrow links  */
-a.up		{ background: none no-repeat left center; }
-a.down		{ background: none no-repeat right center; }
-a.left		{ background: none no-repeat 3px 60%; }
-a.right		{ background: none no-repeat 95% 60%; }
 
-a.up, a.up:link, a.up:active, a.up:visited {
-	padding-left: 10px;
-	text-decoration: none;
-	border-bottom-width: 0;
-}
-
-a.up:hover {
-	background-position: left top;
-	background-color: transparent;
-}
 
-a.down, a.down:link, a.down:active, a.down:visited {
-	padding-right: 10px;
+.logo{
+    /* float:none; */ 
+    padding-left: -40px;
 }
 
-a.down:hover {
-	background-position: right bottom;
-	text-decoration: none;
-}
 
-a.left, a.left:active, a.left:visited {
-	padding-left: 12px;
+.imageset.site_logo {
+    padding-top: 80px;
+    background-image: url("./images/site_logo.gif");
+    padding-left: 80px; 
+    /* background: transparent none no-repeat scroll 0 0; */
+    display: inline-block !important;
+    height: 0;
+    margin-left: -20px;
+    overflow: hidden;
+    width: 0;
 }
 
-a.left:hover {
-	color: #d2d2d2;
-	text-decoration: none;
-	background-position: 0 60%;
-}
 
-a.right, a.right:active, a.right:visited {
-	padding-right: 12px;
-}
 
-a.right:hover {
-	color: #d2d2d2;
-	text-decoration: none;
-	background-position: 100% 60%;
-}
-/* proSilver Content Styles
----------------------------------------- */
 
-ul.topiclist {
-	display: block;
-	list-style-type: none;
-	margin: 0;
-}
 
 ul.forums {
-	background: #f9f9f9 none repeat-x 0 0;
-}
-
-ul.topiclist li {
-	display: block;
-	list-style-type: none;
-	color: #777777;
-	margin: 0;
-}
-
-ul.topiclist dl {
-	position: relative;
+    background-color: #f0f0f0;
 }
 
-ul.topiclist li.row dl {
-	padding: 2px 0;
-}
-
-ul.topiclist dt {
-	display: block;
-	float: left;
-	width: 50%;
-	font-size: 1.1em;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-ul.topiclist dd {
-	display: block;
-	float: left;
-	border-left: 1px solid #FFFFFF;
-	padding: 4px 0;
+a.forumtitle {
+    color: #4d4d4d;
+    font-family: Arial,sans-serif,"Lucida Grande","Trebuchet MS",Helvetica,Verdana;
+    font-size: 1.2em;
+    font-weight: bold;
+    text-decoration: none;
 }
 
-ul.topiclist dfn {
-	/* Labels for post/view counts */
-	display: none;
+.postbody.fist {
+ font-size: 5em;
 }
 
-ul.topiclist li.row dt a.subforum {
-	background-image: none;
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	position: relative;
-	white-space: nowrap;
-	padding: 0 0 0 12px;
-}
 
-.forum-image {
-	float: left;
-	padding-top: 5px;
-	margin-right: 5px;
-}
 
-li.row {
-	border-top: 1px solid #FFFFFF;
-	border-bottom: 1px solid #8f8f8f;
-}
 
-li.row strong {
-	font-weight: normal;
-	color: #000000;
-}
 
-li.row:hover {
-	background-color: #f6f6f6;
-}
 
-li.row:hover dd {
-	border-left-color: #CCCCCC;
-}
 
 li.header dt, li.header dd {
-	line-height: 1em;
-	border-left-width: 0;
-	margin: 2px 0 4px 0;
-	color: #000000;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	font-size: 1em;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	text-transform: uppercase;
-}
-
-li.header dt {
-
-}
-
-li.header dd {
-	margin-left: 1px;
-}
-
-li.header dl.icon {
-	min-height: 0;
-}
-
-li.header dl.icon dt {
-	/* Tweak for headers alignment when folder icon used */
-	padding-left: 0;
-	padding-right: 50px;
-}
-
-/* Forum list column styles */
-dl.icon {
-	min-height: 35px;
-	background-position: 10px 50%;		/* Position of folder icon */
-	background-repeat: no-repeat;
-}
-
-dl.icon dt {
-	padding-left: 45px;					/* Space for folder icon */
-	background-repeat: no-repeat;
-	background-position: 5px 95%;		/* Position of topic icon */
-}
-
-dd.posts, dd.topics, dd.views {
-	width: 8%;
-	text-align: center;
-	line-height: 2.2em;
-	font-size: 1.2em;
-}
-
-dd.lastpost {
-	width: 25%;
-	font-size: 1.1em;
-}
-
-dd.lastpost a {
-	color: #D70751;
-}
-
+		    color: #000000;
+	}
 
-dd.lastpost a:hover {
-	text-decoration: underline;
-}
-
-dd.redirect {
-	font-size: 1.1em;
-	line-height: 2.5em;
-}
-
-dd.moderation {
-	font-size: 1.1em;
-}
-
-dd.lastpost span, ul.topiclist dd.searchby span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
-	display: block;
-	padding-left: 5px;
-}
-
-dd.time {
-	width: auto;
-	line-height: 200%;
-	font-size: 1.1em;
-}
-
-dd.extra {
-	width: 12%;
-	line-height: 200%;
-	text-align: center;
-	font-size: 1.1em;
-}
-
-dd.mark {
-	float: right !important;
-	width: 9%;
-	text-align: center;
-	line-height: 200%;
-	font-size: 1.2em;
-}
-
-dd.info {
-	width: 30%;
-}
 
-dd.option {
-	width: 15%;
-	line-height: 200%;
-	text-align: center;
-	font-size: 1.1em;
-}
 
-dd.searchby {
-	width: 47%;
-	font-size: 1.1em;
-	line-height: 1em;
-}
+.forumbg .header a, .forabg .header a, th a {
+		    color: #000000;
+	}
 
-ul.topiclist dd.searchextra {
-	margin-left: 5px;
-	padding: 0.2em 0;
-	font-size: 1.1em;
-	color: #333333;
-	border-left: none;
-	clear: both;
-	width: 98%;
-	overflow: hidden;
-}
 
-/* Container for post/reply buttons and pagination */
-.topic-actions {
-	margin-bottom: 3px;
-	font-size: 1.1em;
-	height: 28px;
-	min-height: 28px;
-}
-div[class].topic-actions {
-	height: auto;
-}
+.button {
+						    /*color: #d3111a;*/
+						    color: #aa0040;
+							font-weight: bold;
+						}
 
-/* Post body styles
-----------------------------------------*/
-.postbody {
-	padding: 0;
-	line-height: 1.48em;
-	color: #333333;
-	width: 76%;
-	float: left;
-	clear: both;
-}
 
-.postbody a:link {
-   color: #d70751;
-}
+.site-description p {
 
-.postbody .ignore {
-	font-size: 1.1em;
-}
+		 color: #606060;
+		     font-family: "Bitstream Vera Serif",Georgia,Palatino,serif;
+			     font-size: 40px;
+				     font-weight: 100;
+					     margin: 14px 200px 30px 69px;
+						     padding-left: 50px;
 
-.postbody h3.first {
-	/* The first post on the page uses this */
-	font-size: 1.3em;
 }
 
-.postbody h3.unread {
-	background-color: #D70751;
-}
 
-.postbody h3 {
-	/* Postbody requires a different h3 format - so change it here */
-	font-size: 1.2em;
-	padding: 2px 0 0 0;
-	margin: 0 0 0.3em 0 !important;
-	text-transform: none;
-	border: none;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	line-height: 125%;
-}
 
-.postbody h3 img {
-	/* Also see tweaks.css */
-	vertical-align: bottom;
-}
+.icon-button::before {
+							    margin: 2px 0 0 2px;
+							}
 
-.postbody .content {
-	font-size: 1.3em;
-}
 
-.search .postbody {
-	width: 68%
-}
 
-/* Topic review panel
-----------------------------------------*/
-#review {
-	margin-top: 2em;
-}
 
-#topicreview {
-	padding-right: 5px;
-	overflow: auto;
-	height: 300px;
+.post-buttons .icon-button {
+		    padding: 1px 5px;
+	}
+.quote-icon:before {
+    background-image: "" ! important;
 }
 
-#topicreview .postbody {
-	width: auto;
-	float: none;
-	margin: 0;
-	height: auto;
-}
 
-#topicreview .post {
-	height: auto;
-}
 
-#topicreview h2 {
-	border-bottom-width: 0;
-}
-
-/* Content container styles
-----------------------------------------*/
-.content {
-	min-height: 3em;
-	overflow: hidden;
-	line-height: 1.4em;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1em;
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	font-weight: normal;
-	color: #989898;
-	border-bottom: 1px solid #CCCCCC;
-	font-size: 1.6em;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.panel h3 {
-	margin: 0.5em 0;
-}
-
-.panel p {
-	font-size: 1.2em;
-	margin-bottom: 1em;
-	line-height: 1.4em;
-}
-
-.content p {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.2em;
-	margin-bottom: 1em;
-	line-height: 1.4em;
-}
-
-dl.faq {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.1em;
-	margin-top: 1em;
-	margin-bottom: 2em;
-	line-height: 1.4em;
-}
-
-dl.faq dt {
-	font-weight: bold;
-	color: #333333;
-}
-
-.content dl.faq {
-	font-size: 1.2em;
-	margin-bottom: 0.5em;
-}
-
-.content li {
-	list-style-type: inherit;
-}
-
-.content ul, .content ol {
-	margin-bottom: 1em;
-	margin-left: 3em;
-}
-
-.posthilit {
-	background-color: #f3f3f3;
-	color: #BCBCBC;
-	padding: 0 2px 1px 2px;
-}
-
-.announce, .unreadpost {
-	/* Highlight the announcements & unread posts box */
-	border-left-color: #BCBCBC;
-	border-right-color: #BCBCBC;
-}
-
-/* Post author */
-p.author {
-	margin: 0 15em 0.6em 0;
-	padding: 0 0 5px 0;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1em;
-	line-height: 1.2em;
-}
-
-/* Post signature */
-.signature {
-	margin-top: 1.5em;
-	padding-top: 0.2em;
-	font-size: 1.1em;
-	border-top: 2px dotted #B0B0B0;
-	clear: left;
-	line-height: 140%;
-	overflow: hidden;
-	width: 100%;
-}
-
-dd .signature {
-	margin: 0;
-	padding: 0;
-	clear: none;
-	border: none;
-}
-
-/* Post noticies */
-.notice {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	width: auto;
-	margin-top: 1.5em;
-	padding-top: 0.2em;
-	font-size: 1em;
-	border-top: 1px dashed #CCCCCC;
-	clear: left;
-	line-height: 130%;
-}
-
-/* Jump to post link for now */
-ul.searchresults {
-	list-style: none;
-	text-align: right;
-	clear: both;
-}
-
-/* BB Code styles
-----------------------------------------*/
-/* Quote block */
-blockquote {
-	background: #ebebeb none 6px 8px no-repeat;
-	border: 1px solid #dbdbdb;
-	font-size: 0.95em;
-	margin: 0.5em 1px 0 25px;
-	overflow: hidden;
-	padding: 5px;
-}
-
-blockquote blockquote {
-	/* Nested quotes */
-	background-color: #bababa;
-	font-size: 1em;
-	margin: 0.5em 1px 0 15px;	
-}
-
-blockquote blockquote blockquote {
-	/* Nested quotes */
-	background-color: #e4e4e4;
-}
-
-blockquote cite {
-	/* Username/source of quoter */
-	font-style: normal;
-	font-weight: bold;
-	margin-left: 20px;
-	display: block;
-	font-size: 0.9em;
-}
-
-blockquote cite cite {
-	font-size: 1em;
-}
-
-blockquote.uncited {
-	padding-top: 25px;
-}
-
-/* Code block */
-dl.codebox {
-	padding: 3px;
-	background-color: #FFFFFF;
-	border: 1px solid #d8d8d8;
-	font-size: 1em;
-}
-
-dl.codebox dt {
-	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	font-size: 0.6em;
-	font-weight: bold;
-	display: block;
-}
-
-blockquote dl.codebox {
-	margin-left: 0;
-}
-
-dl.codebox code {
-	/* Also see tweaks.css */
-	overflow: auto;
-	display: block;
-	height: auto;
-	white-space: normal;
-	padding-top: 5px;
-	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
-	line-height: 1.3em;
-	color: #8b8b8b;
-	margin: 2px 0;
-}
-
-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #000000; }
-.syntaxdefault	{ color: #bcbcbc; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #585858; }
-.syntaxstring	{ color: #a7a7a7; }
-
-/* Attachments
-----------------------------------------*/
-.attachbox {
-	float: left;
-	width: auto; 
-	margin: 5px 5px 5px 0;
-	padding: 6px;
-	background-color: #FFFFFF;
-	border: 1px dashed #d8d8d8;
-	clear: left;
-}
-
-.pm-message .attachbox {
-	background-color: #f3f3f3;
-}
-
-.attachbox dt {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	text-transform: uppercase;
-}
-
-.attachbox dd {
-	margin-top: 4px;
-	padding-top: 4px;
-	clear: left;
-	border-top: 1px solid #d8d8d8;
-}
-
-.attachbox dd dd {
-	border: none;
-}
-
-.attachbox p {
-	line-height: 110%;
-	color: #666666;
-	font-weight: normal;
-	clear: left;
-}
-
-.attachbox p.stats
-{
-	line-height: 110%;
-	color: #666666;
-	font-weight: normal;
-	clear: left;
-}
-
-.attach-image {
-	margin: 3px 0;
-	width: 100%;
-	max-height: 350px;
-	overflow: auto;
-}
-
-.attach-image img {
-	border: 1px solid #999999;
-/*	cursor: move; */
-	cursor: default;
-}
-
-/* Inline image thumbnails */
-div.inline-attachment dl.thumbnail, div.inline-attachment dl.file {
-	display: block;
-	margin-bottom: 4px;
-}
-
-div.inline-attachment p {
-	font-size: 100%;
-}
-
-dl.file {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	display: block;
-}
-
-dl.file dt {
-	text-transform: none;
-	margin: 0;
-	padding: 0;
-	font-weight: bold;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-dl.file dd {
-	color: #666666;
-	margin: 0;
-	padding: 0;	
-}
-
-dl.thumbnail img {
-	padding: 3px;
-	border: 1px solid #666666;
-	background-color: #FFF;
-}
-
-dl.thumbnail dd {
-	color: #666666;
-	font-style: italic;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.attachbox dl.thumbnail dd {
-	font-size: 100%;
-}
-
-dl.thumbnail dt a:hover {
-	background-color: #EEEEEE;
-}
-
-dl.thumbnail dt a:hover img {
-	border: 1px solid #d2d2d2;
-}
-
-/* Post poll styles
-----------------------------------------*/
-fieldset.polls {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-}
-
-fieldset.polls dl {
-	margin-top: 5px;
-	border-top: 1px solid #e2e2e2;
-	padding: 5px 0 0 0;
-	line-height: 120%;
-	color: #666666;
-}
-
-fieldset.polls dl.voted {
-	font-weight: bold;
-	color: #000000;
-}
-
-fieldset.polls dt {
-	text-align: left;
-	float: left;
-	display: block;
-	width: 30%;
-	border-right: none;
-	padding: 0;
-	margin: 0;
-	font-size: 1.1em;
-}
-
-fieldset.polls dd {
-	float: left;
-	width: 10%;
-	border-left: none;
-	padding: 0 5px;
-	margin-left: 0;
-	font-size: 1.1em;
-}
-
-fieldset.polls dd.resultbar {
-	width: 50%;
-}
-
-fieldset.polls dd input {
-	margin: 2px 0;
-}
-
-fieldset.polls dd div {
-	text-align: right;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	color: #000000;
-	font-weight: bold;
-	padding: 0 2px;
-	overflow: visible;
-	min-width: 2%;
-}
-
-.pollbar1 {
-	background-color: #aaaaaa;
-	border-bottom: 1px solid #747474;
-	border-right: 1px solid #747474;
-}
-
-.pollbar2 {
-	background-color: #bebebe;
-	border-bottom: 1px solid #8c8c8c;
-	border-right: 1px solid #8c8c8c;
-}
-
-.pollbar3 {
-	background-color: #D1D1D1;
-	border-bottom: 1px solid #aaaaaa;
-	border-right: 1px solid #aaaaaa;
-}
-
-.pollbar4 {
-	background-color: #e4e4e4;
-	border-bottom: 1px solid #bebebe;
-	border-right: 1px solid #bebebe;
-}
-
-.pollbar5 {
-	background-color: #f8f8f8;
-	border-bottom: 1px solid #D1D1D1;
-	border-right: 1px solid #D1D1D1;
-}
-
-/* Poster profile block
-----------------------------------------*/
-.postprofile {
-	/* Also see tweaks.css */
-	margin: 5px 0 10px 0;
-	min-height: 100%;
-	color: #666666;
-	border-left: 1px solid #FFFFFF;
-	width: 22%;
-	float: right;
-	display: inline;
-}
-.pm .postprofile {
-	border-left: 1px solid #DDDDDD;
-}
-
-.postprofile dd, .postprofile dt {
-	line-height: 1.2em;
-	margin-left: 8px;
-}
-
-.postprofile strong {
-	font-weight: normal;
-	color: #000000;
-}
-
-.avatar {
-	border: none;
-	margin-bottom: 3px;
-}
-
-.online {
-	background-image: none;
-	background-position: 100% 0;
-	background-repeat: no-repeat;
-}
-
-/* Poster profile used by search*/
-.search .postprofile {
-	width: 30%;
-}
-
-/* pm list in compose message if mass pm is enabled */
-dl.pmlist dt {
-	width: 60% !important;
-}
-
-dl.pmlist dt textarea {
-	width: 95%;
-}
-
-dl.pmlist dd {
-	margin-left: 61% !important;
-	margin-bottom: 2px;
-}
-/* proSilver Button Styles
----------------------------------------- */
-
-/* Rollover buttons
-   Based on: http://wellstyled.com/css-nopreload-rollovers.html
-----------------------------------------*/
-.buttons {
-	float: left;
-	width: auto;
-	height: auto;
-}
-
-/* Rollover state */
-.buttons div {
-	float: left;
-	margin: 0 5px 0 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-.buttons div a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-	position: relative;
-	overflow: hidden;
-}
-
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-/*.buttons div span		{ display: none; }*/
-/*.buttons div a:hover	{ background-image: none; }*/
-.buttons div span			{ position: absolute; width: 100%; height: 100%; cursor: pointer;}
-.buttons div a:hover span	{ background-position: 0 100%; }
-
-/* Big button images */
-.reply-icon span	{ background: transparent none 0 0 no-repeat; }
-.post-icon span		{ background: transparent none 0 0 no-repeat; }
-.locked-icon span	{ background: transparent none 0 0 no-repeat; }
-.pmreply-icon span	{ background: none 0 0 no-repeat; }
-.newpm-icon span 	{ background: none 0 0 no-repeat; }
-.forwardpm-icon span 	{ background: none 0 0 no-repeat; }
-
-/* Set big button dimensions */
-.buttons div.reply-icon		{ width: {IMG_BUTTON_TOPIC_REPLY_WIDTH}px; height: {IMG_BUTTON_TOPIC_REPLY_HEIGHT}px; }
-.buttons div.post-icon		{ width: {IMG_BUTTON_TOPIC_NEW_WIDTH}px; height: {IMG_BUTTON_TOPIC_NEW_HEIGHT}px; }
-.buttons div.locked-icon	{ width: {IMG_BUTTON_TOPIC_LOCKED_WIDTH}px; height: {IMG_BUTTON_TOPIC_LOCKED_HEIGHT}px; }
-.buttons div.pmreply-icon	{ width: {IMG_BUTTON_PM_REPLY_WIDTH}px; height: {IMG_BUTTON_PM_REPLY_HEIGHT}px; }
-.buttons div.newpm-icon		{ width: {IMG_BUTTON_PM_NEW_WIDTH}px; height: {IMG_BUTTON_PM_NEW_HEIGHT}px; }
-.buttons div.forwardpm-icon	{ width: {IMG_BUTTON_PM_FORWARD_WIDTH}px; height: {IMG_BUTTON_PM_FORWARD_HEIGHT}px; }
-
-/* Sub-header (navigation bar)
---------------------------------------------- */
-a.print, a.sendemail, a.fontsize {
-	display: block;
-	overflow: hidden;
-	height: 24px;
-	text-indent: -5000px;
-	text-align: left;
-	background-repeat: no-repeat;
-}
-
-a.print {
-	background-image: none;
-	width: 24px;
-}
-
-a.sendemail {
-	background-image: none;
-	width: 24px;
-}
-
-a.fontsize {
-	background-image: none;
-	background-position: 0 -1px;
-	width: 29px;
-}
-
-a.fontsize:hover {
-	background-position: 0 -20px;
-	text-decoration: none;
-}
-
-/* Icon images
----------------------------------------- */
-.sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout,
-.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search {
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	background-image: none;
-	padding: 1px 0 0 17px;
-}
-
-/* Poster profile icons
-----------------------------------------*/
-ul.profile-icons {
-	padding-top: 10px;
-	list-style: none;
-}
-
-/* Rollover state */
-ul.profile-icons li {
-	float: left;
-	margin: 0 6px 3px 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-ul.profile-icons li a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-}
-
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-ul.profile-icons li span { display:none; }
-ul.profile-icons li a:hover { background: none; }
-
-/* Positioning of moderator icons */
-.postbody ul.profile-icons {
-	float: right;
-	width: auto;
-	padding: 0;
-}
-
-.postbody ul.profile-icons li {
-	margin: 0 3px;
-}
-
-/* Profile & navigation icons */
-.email-icon, .email-icon a		{ background: none top left no-repeat; }
-.aim-icon, .aim-icon a			{ background: none top left no-repeat; }
-.yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
-.web-icon, .web-icon a			{ background: none top left no-repeat; }
-.msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
-.icq-icon, .icq-icon a			{ background: none top left no-repeat; }
-.jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
-.pm-icon, .pm-icon a				{ background: none top left no-repeat; }
-.quote-icon, .quote-icon a		{ background: none top left no-repeat; }
-
-/* Moderator icons */
-.report-icon, .report-icon a		{ background: none top left no-repeat; }
-.warn-icon, .warn-icon a			{ background: none top left no-repeat; }
-.edit-icon, .edit-icon a			{ background: none top left no-repeat; }
-.delete-icon, .delete-icon a		{ background: none top left no-repeat; }
-.info-icon, .info-icon a			{ background: none top left no-repeat; }
-
-/* Set profile icon dimensions */
-ul.profile-icons li.email-icon		{ width: {IMG_ICON_CONTACT_EMAIL_WIDTH}px; height: {IMG_ICON_CONTACT_EMAIL_HEIGHT}px; }
-ul.profile-icons li.aim-icon	{ width: {IMG_ICON_CONTACT_AIM_WIDTH}px; height: {IMG_ICON_CONTACT_AIM_HEIGHT}px; }
-ul.profile-icons li.yahoo-icon	{ width: {IMG_ICON_CONTACT_YAHOO_WIDTH}px; height: {IMG_ICON_CONTACT_YAHOO_HEIGHT}px; }
-ul.profile-icons li.web-icon	{ width: {IMG_ICON_CONTACT_WWW_WIDTH}px; height: {IMG_ICON_CONTACT_WWW_HEIGHT}px; }
-ul.profile-icons li.msnm-icon	{ width: {IMG_ICON_CONTACT_MSNM_WIDTH}px; height: {IMG_ICON_CONTACT_MSNM_HEIGHT}px; }
-ul.profile-icons li.icq-icon	{ width: {IMG_ICON_CONTACT_ICQ_WIDTH}px; height: {IMG_ICON_CONTACT_ICQ_HEIGHT}px; }
-ul.profile-icons li.jabber-icon	{ width: {IMG_ICON_CONTACT_JABBER_WIDTH}px; height: {IMG_ICON_CONTACT_JABBER_HEIGHT}px; }
-ul.profile-icons li.pm-icon		{ width: {IMG_ICON_CONTACT_PM_WIDTH}px; height: {IMG_ICON_CONTACT_PM_HEIGHT}px; }
-ul.profile-icons li.quote-icon	{ width: {IMG_ICON_POST_QUOTE_WIDTH}px; height: {IMG_ICON_POST_QUOTE_HEIGHT}px; }
-ul.profile-icons li.report-icon	{ width: {IMG_ICON_POST_REPORT_WIDTH}px; height: {IMG_ICON_POST_REPORT_HEIGHT}px; }
-ul.profile-icons li.edit-icon	{ width: {IMG_ICON_POST_EDIT_WIDTH}px; height: {IMG_ICON_POST_EDIT_HEIGHT}px; }
-ul.profile-icons li.delete-icon	{ width: {IMG_ICON_POST_DELETE_WIDTH}px; height: {IMG_ICON_POST_DELETE_HEIGHT}px; }
-ul.profile-icons li.info-icon	{ width: {IMG_ICON_POST_INFO_WIDTH}px; height: {IMG_ICON_POST_INFO_HEIGHT}px; }
-ul.profile-icons li.warn-icon	{ width: {IMG_ICON_USER_WARN_WIDTH}px; height: {IMG_ICON_USER_WARN_HEIGHT}px; }
-
-/* Fix profile icon default margins */
-ul.profile-icons li.edit-icon	{ margin: 0 0 0 3px; }
-ul.profile-icons li.quote-icon	{ margin: 0 0 0 10px; }
-ul.profile-icons li.info-icon, ul.profile-icons li.report-icon	{ margin: 0 3px 0 0; }
-/* proSilver Control Panel Styles
----------------------------------------- */
-
-
-/* Main CP box
-----------------------------------------*/
-#cp-menu {
-	float:left;
-	width: 19%;
-	margin-top: 1em;
-	margin-bottom: 5px;
-}
-
-#cp-main {
-	float: left;
-	width: 81%;
-}
-
-#cp-main .content {
-	padding: 0;
-}
-
-#cp-main h3, #cp-main hr, #cp-menu hr {
-	border-color: #bfbfbf;
-}
-
-#cp-main .panel p {
-	font-size: 1.1em;
-}
-
-#cp-main .panel ol {
-	margin-left: 2em;
-	font-size: 1.1em;
-}
-
-#cp-main .panel li.row {
-	border-bottom: 1px solid #cbcbcb;
-	border-top: 1px solid #F9F9F9;
-}
-
-ul.cplist {
-	margin-bottom: 5px;
-	border-top: 1px solid #cbcbcb;
-}
-
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
-	color: #000000;
-	margin-bottom: 2px;
-}
-
-#cp-main table.table1 {
-	margin-bottom: 1em;
-}
-
-#cp-main table.table1 thead th {
-	color: #333333;
-	font-weight: bold;
-	border-bottom: 1px solid #333333;
-	padding: 5px;
-}
-
-#cp-main table.table1 tbody th {
-	font-style: italic;
-	background-color: transparent !important;
-	border-bottom: none;
-}
-
-#cp-main .pagination {
-	float: right;
-	width: auto;
-	padding-top: 1px;
-}
-
-#cp-main .postbody p {
-	font-size: 1.1em;
-}
-
-#cp-main .pm-message {
-	border: 1px solid #e2e2e2;
-	margin: 10px 0;
-	background-color: #FFFFFF;
-	width: auto;
-	float: none;
-}
-
-.pm-message h2 {
-	padding-bottom: 5px;
-}
-
-#cp-main .postbody h3, #cp-main .box2 h3 {
-	margin-top: 0;
-}
-
-#cp-main .buttons {
-	margin-left: 0;
-}
-
-#cp-main ul.linklist {
-	margin: 0;
-}
-
-/* MCP Specific tweaks */
-.mcp-main .postbody {
-	width: 100%;
-}
-
-/* CP tabbed menu
-----------------------------------------*/
-#tabs {
-	line-height: normal;
-	margin: 20px 0 -1px 7px;
-	min-width: 570px;
-}
-
-#tabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#tabs li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-#tabs a {
-	float: left;
-	background: none no-repeat 0% -35px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 5px;
-	text-decoration: none;
-	position: relative;
-	cursor: pointer;
-}
-
-#tabs a span {
-	float: left;
-	display: block;
-	background: none no-repeat 100% -35px;
-	padding: 6px 10px 6px 5px;
-	color: #828282;
-	white-space: nowrap;
-}
-
-#tabs a:hover span {
-	color: #bcbcbc;
-}
-
-#tabs .activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #ebebeb;
-}
-
-#tabs .activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 7px;
-	color: #333333;
-}
-
-#tabs a:hover {
-	background-position: 0 -70px;
-}
-
-#tabs a:hover span {
-	background-position:100% -70px;
-}
-
-#tabs .activetab a:hover {
-	background-position: 0 0;
-}
-
-#tabs .activetab a:hover span {
-	color: #000000;
-	background-position: 100% 0;
-}
-
-/* Mini tabbed menu used in MCP
-----------------------------------------*/
-#minitabs {
-	line-height: normal;
-	margin: -20px 7px 0 0;
-}
-
-#minitabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#minitabs li {
-	display: block;
-	float: right;
-	padding: 0 10px 4px 10px;
-	font-size: 1em;
-	font-weight: bold;
-	background-color: #f2f2f2;
-	margin-left: 2px;
-}
-
-#minitabs a {
-}
-
-#minitabs a:hover {
-	text-decoration: none;
-}
-
-#minitabs li.activetab {
-	background-color: #F9F9F9;
-}
-
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
-	color: #333333;
-}
-
-/* UCP navigation menu
-----------------------------------------*/
-/* Container for sub-navigation list */
-#navigation {
-	width: 100%;
-	padding-top: 36px;
-}
-
-#navigation ul {
-	list-style:none;
-}
-
-/* Default list state */
-#navigation li {
-	margin: 1px 0;
-	padding: 0;
-	font-weight: bold;
-	display: inline;
-}
-
-/* Link styles for the sub-section links */
-#navigation a {
-	display: block;
-	padding: 5px;
-	margin: 1px 0;
-	text-decoration: none;
-	font-weight: bold;
-	color: #333;
-	background: #cfcfcf none repeat-y 100% 0;
-}
-
-#navigation a:hover {
-	text-decoration: none;
-	background-color: #c6c6c6;
-	color: #bcbcbc;
-	background-image: none;
-}
-
-#navigation #active-subsection a {
-	display: block;
-	color: #d3d3d3;
-	background-color: #F9F9F9;
-	background-image: none;
-}
-
-#navigation #active-subsection a:hover {
-	color: #d3d3d3;
-}
-
-/* Preferences pane layout
-----------------------------------------*/
-#cp-main h2 {
-	border-bottom: none;
-	padding: 0;
-	margin-left: 10px;
-	color: #333333;
-}
-
-#cp-main .panel {
-	background-color: #F9F9F9;
-}
-
-#cp-main .pm {
-	background-color: #FFFFFF;
-}
-
-#cp-main span.corners-top, #cp-menu span.corners-top {
-	background-image: none;
-}
-
-#cp-main span.corners-top span, #cp-menu span.corners-top span {
-	background-image: none;
-}
-
-#cp-main span.corners-bottom, #cp-menu span.corners-bottom {
-	background-image: none;
-}
-
-#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span {
-	background-image: none;
-}
-
-/* Topicreview */
-#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span {
-	background-image: none;
-}
-
-/* Friends list */
-.cp-mini {
-	background-color: #f9f9f9;
-	padding: 0 5px;
-	margin: 10px 15px 10px 5px;
-}
-
-.cp-mini span.corners-top, .cp-mini span.corners-bottom {
-	margin: 0 -5px;
-}
-
-dl.mini dt {
-	font-weight: bold;
-	color: #676767;
-}
-
-dl.mini dd {
-	padding-top: 4px;
-}
-
-.friend-online {
-	font-weight: bold;
-}
-
-.friend-offline {
-	font-style: italic;
-}
-
-/* PM Styles
-----------------------------------------*/
-#pm-menu {
-	line-height: 2.5em;
-}
-
-/* PM Message history */
-.current {
-	color: #999999;
-}
-
-/* Defined rules list for PM options */
-ol.def-rules {
-	padding-left: 0;
-}
-
-ol.def-rules li {
-	line-height: 180%;
-	padding: 1px;
-}
-
-/* PM marking colours */
-.pmlist li.bg1 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
-}
-
-.pmlist li.bg2 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
-	border-left-color: #bcbcbc;
-	border-right-color: #bcbcbc;
-}
-
-.pmlist li.pm_marked_colour, .pm_marked_colour {
-	border: solid 3px #ffffff;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_replied_colour, .pm_replied_colour {
-	border: solid 3px #c2c2c2;
-	border-width: 0 3px;	
-}
-
-.pmlist li.pm_friend_colour, .pm_friend_colour {
-	border: solid 3px #bdbdbd;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_foe_colour, .pm_foe_colour {
-	border: solid 3px #000000;
-	border-width: 0 3px;
-}
-
-.pm-legend {
-	border-left-width: 10px;
-	border-left-style: solid;
-	border-right-width: 0;
-	margin-bottom: 3px;
-	padding-left: 3px;
-}
-
-/* Avatar gallery */
-#gallery label {
-	position: relative;
-	float: left;
-	margin: 10px;
-	padding: 5px;
-	width: auto;
-	background: #FFFFFF;
-	border: 1px solid #CCC;
-	text-align: center;
-}
-
-#gallery label:hover {
-	background-color: #EEE;
-}
-/* proSilver Form Styles
----------------------------------------- */
-
-/* General form styles
-----------------------------------------*/
-fieldset {
-	border-width: 0;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 1.1em;
-}
-
-input {
-	font-weight: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	padding: 0 3px;
-	font-size: 1em;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-}
-
-select {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-weight: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	border: 1px solid #666666;
-	padding: 1px;
-	background-color: #FAFAFA;
-}
-
-option {
-	padding-right: 1em;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-textarea {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	width: 60%;
-	padding: 2px;
-	font-size: 1em;
-	line-height: 1.4em;
-}
-
-label {
-	cursor: default;
-	padding-right: 5px;
-	color: #676767;
-}
-
-label input {
-	vertical-align: middle;
-}
-
-label img {
-	vertical-align: middle;
-}
-
-/* Definition list layout for forms
----------------------------------------- */
-fieldset dl {
-	padding: 4px 0;
-}
-
-fieldset dt {
-	float: left;	
-	width: 40%;
-	text-align: left;
-	display: block;
-}
-
-fieldset dd {
-	margin-left: 41%;
-	vertical-align: top;
-	margin-bottom: 3px;
-}
-
-/* Specific layout 1 */
-fieldset.fields1 dt {
-	width: 15em;
-	border-right-width: 0;
-}
-
-fieldset.fields1 dd {
-	margin-left: 15em;
-	border-left-width: 0;
-}
-
-fieldset.fields1 {
-	background-color: transparent;
-}
-
-fieldset.fields1 div {
-	margin-bottom: 3px;
-}
-
-/* Specific layout 2 */
-fieldset.fields2 dt {
-	width: 15em;
-	border-right-width: 0;
-}
-
-fieldset.fields2 dd {
-	margin-left: 16em;
-	border-left-width: 0;
-}
-
-/* Form elements */
-dt label {
-	font-weight: bold;
-	text-align: left;
-}
-
-dd label {
-	white-space: nowrap;
-	color: #333;
-}
-
-dd input, dd textarea {
-	margin-right: 3px;
-}
-
-dd select {
-	width: auto;
-}
-
-dd textarea {
-	width: 85%;
-}
-
-/* Hover effects */
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset.fields2 dl:hover dt label {
-	color: inherit;
-}
-
-#timezone {
-	width: 95%;
-}
-
-* html #timezone {
-	width: 50%;
-}
-
-/* Quick-login on index page */
-fieldset.quick-login {
-	margin-top: 5px;
-}
-
-fieldset.quick-login input {
-	width: auto;
-}
-
-fieldset.quick-login input.inputbox {
-	width: 15%;
-	vertical-align: middle;
-	margin-right: 5px;
-	background-color: #f3f3f3;
-}
-
-fieldset.quick-login label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-/* Display options on viewtopic/viewforum pages  */
-fieldset.display-options {
-	text-align: center;
-	margin: 3px 0 5px 0;
-}
-
-fieldset.display-options label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-fieldset.display-options a {
-	margin-top: 3px;
-}
-
-/* Display actions for ucp and mcp pages */
-fieldset.display-actions {
-	text-align: right;
-	line-height: 2em;
-	white-space: nowrap;
-	padding-right: 1em;
-}
-
-fieldset.display-actions label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-fieldset.sort-options {
-	line-height: 2em;
-}
-
-/* MCP forum selection*/
-fieldset.forum-selection {
-	margin: 5px 0 3px 0;
-	float: right;
-}
-
-fieldset.forum-selection2 {
-	margin: 13px 0 3px 0;
-	float: right;
-}
-
-/* Jumpbox */
-fieldset.jumpbox {
-	text-align: right;
-	margin-top: 15px;
-	height: 2.5em;
-}
-
-fieldset.quickmod {
-	width: 50%;
-	float: right;
-	text-align: right;
-	height: 2.5em;
-}
-
-/* Submit button fieldset */
-fieldset.submit-buttons {
-	text-align: center;
-	vertical-align: middle;
-	margin: 5px 0;
-}
-
-fieldset.submit-buttons input {
-	vertical-align: middle;
-	padding-top: 3px;
-	padding-bottom: 3px;
-}
-
-/* Posting page styles
-----------------------------------------*/
-
-/* Buttons used in the editor */
-#format-buttons {
-	margin: 15px 0 2px 0;
-}
-
-#format-buttons input, #format-buttons select {
-	vertical-align: middle;
-}
-
-/* Main message box */
-#message-box {
-	width: 80%;
-}
-
-#message-box textarea {
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	width: 100%;
-	font-size: 1.2em;
-	color: #333333;
-}
-
-/* Emoticons panel */
-#smiley-box {
-	width: 18%;
-	float: right;
-}
-
-#smiley-box img {
-	margin: 3px;
-}
-
-/* Input field styles
----------------------------------------- */
-.inputbox {
-	background-color: #FFFFFF;
-	border: 1px solid #c0c0c0;
-	color: #333333;
-	padding: 2px;
-	cursor: text;
-}
-
-.inputbox:hover {
-	border: 1px solid #eaeaea;
-}
-
-.inputbox:focus {
-	border: 1px solid #eaeaea;
-	color: #4b4b4b;
-}
-
-input.inputbox	{ width: 85%; }
-input.medium	{ width: 50%; }
-input.narrow	{ width: 25%; }
-input.tiny		{ width: 140px; }
-
-textarea.inputbox {
-	width: 85%;
-}
-
-.autowidth {
-	width: auto !important;
-}
-
-/* Form button styles
----------------------------------------- */
-input.button1, input.button2 {
-	font-size: 1em;
-}
-
-a.button1, input.button1, input.button3, a.button2, input.button2 {
-	width: auto !important;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	color: #000;
-	background: #FAFAFA none repeat-x top;
-}
-
-a.button1, input.button1 {
-	font-weight: bold;
-	border: 1px solid #666666;
-}
-
-input.button3 {
-	padding: 0;
-	margin: 0;
-	line-height: 5px;
-	height: 12px;
-	background-image: none;
-	font-variant: small-caps;
-}
-
-/* Alternative button */
-a.button2, input.button2, input.button3 {
-	border: 1px solid #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	text-decoration: none;
-	color: #000000;
-	padding: 2px 8px;
-	line-height: 250%;
-	vertical-align: text-bottom;
-	background-position: 0 1px;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
-	border: 1px solid #BCBCBC;
-	background-position: 0 100%;
-	color: #BCBCBC;
-}
-
-input.disabled {
-	font-weight: normal;
-	color: #666666;
-}
-
-/* Topic and forum Search */
-.search-box {
-	margin-top: 3px;
-	margin-left: 5px;
-	float: left;
-}
-
-
-input.search {
-	background-image: none;
-	background-repeat: no-repeat;
-	background-position: left 1px;
-	padding-left: 17px;
-}
-
-.full { width: 95%; }
-.medium { width: 50%;}
-.narrow { width: 25%;}
-.tiny { width: 10%;}
-/* proSilver Style Sheet Tweaks
-
-These style definitions are mainly IE specific 
-tweaks required due to its poor CSS support.
--------------------------------------------------*/
-
-* html table, * html select, * html input { font-size: 100%; }
-* html hr { margin: 0; }
-
-table.table1 {
-	width: 99%;		/* IE < 6 browsers */
-	/* Tantek hack */
-	width: 100%;
-}
-html>body table.table1 { width: 100%; }	/* Reset 100% for opera */
-
-* html ul.topiclist li { position: relative; }
-* html .postbody h3 img { vertical-align: middle; }
-
-/* Form styles */
-html>body dd label input { vertical-align: text-bottom; }	/* Align checkboxes/radio buttons nicely */
-
-* html input.button1, * html input.button2 {
-	padding-bottom: 0;
-	margin-bottom: 1px;
-}
-
-/* Misc layout styles */
-* html .column1, * html .column2 { width: 45%; }
-
-/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above)
-   From http://www.positioniseverything.net/easyclearing.html 
-#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}*/
-
-.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
-	height: 1%;
-	overflow: hidden;
-}
-
-/* viewtopic fix */
-* html .post {
-	height: 25%;
-	overflow: hidden;
-}
-
-/* navbar fix */
-* html .clearfix, * html .navbar, ul.linklist {
-	height: 4%;
-	overflow: hidden;
-}
-
-/* Simple fix so forum and topic lists always have a min-height set, even in IE6
-	From http://www.dustindiaz.com/min-height-fast-hack */
-dl.icon {
-	min-height: 35px;
-	height: auto !important;
-	height: 35px;
-}
-
-* html #search-box {
-	width: 25%;
-}
-
-/* Correctly clear floating for details on profile view */
-*:first-child+html dl.details dd {
-	margin-left: 30%;
-	float: none;
-}
-
-* html dl.details dd {
-	margin-left: 30%;
-	float: none;
-}
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for common.css
--------------------------------------------------------------- */
-
-html, body {
-	color: #404040;
-	background-color: #FFFFFF;
-}
-
-h2 {
-	color: #28313F;
-}
-
-h3 {
-	border-bottom-color: #CCCCCC;
-	color: #D70751;
-}
-
-hr {
-	border-color: #d70751;
-	border-top-color: #CCCCCC;
-}
-
-hr.dashed {
-	border-top-color: #CCCCCC;
-}
-
-/* Search box
---------------------------------------------- 
-
-#search-box {
-	color: #000000;
-}
-
-#search-box #keywords {
-	background-color: #FFF;
-}
-
-#search-box input {
-	border-color: #D70751;
-}
-*/
-/* Round cornered boxes and backgrounds
----------------------------------------- */
-.navbar {
-	background-color: #DBDBDB;
-}
-
-.forabg {
-	background-color: #DBDBDB;
-	border: 1px solid #d0d0d0;
-	border-left: 3px solid #d70751;
-	color: #000000;
-}
-
-.forumbg {
-	background-color: #DBDBDB;
-	border: 1px solid #d0d0d0;
-	border-left: 3px solid #d70751;
-	color: #000000;
-}
-
-.panel {
-	background-color: #F2F2F2;
-}
-
-.panel {
-	background-color: #F2F2F2;
-}
-
-.post:target .content {
-	color: #000000;
-}
-
-.post:target h3 a {
-	color: #000000;
-}
-
-.bg1	{ background-color: #F2F2F2; }
-.bg2	{ background-color: #e3e3e3;  }
-.bg3	{ background-color: #DBDBDB; }
-
-.ucprowbg {
-	background-color: #DCDEE2;
-}
-
-.fieldsbg {
-	background-color: #E7E8EA;
-}
-
-
-/* Horizontal lists
-----------------------------------------*/
-
-ul.navlinks {
-	border-bottom-color: #FFFFFF;
-}
-
-/* Table styles
-----------------------------------------*/
-table.table1 thead th {
-	color: #000000;
-}
-
-table.table1 tbody tr {
-	border-color: #BFC1CF;
-}
-
-table.table1 tbody tr:hover, table.table1 tbody tr.hover {
-	background-color: #F6F4D0;
-	color: #000;
-}
-
-table.table1 td {
-	color: #404040;
-}
-
-table.table1 tbody td {
-	border-top-color: #FAFAFA;
-}
-
-table.table1 tbody th {
-	border-bottom-color: #000000;
-	color: #333333;
-	background-color: #FFFFFF;
-}
-
-table.info tbody th {
-	color: #000000;
-}
-
-/* Misc layout styles
----------------------------------------- */
-dl.details dt {
-	color: #000000;
-}
-
-dl.details dd {
-	color: #404040;
-}
-
-.sep {
-	color: #D70751;
-}
-
-/* Pagination
----------------------------------------- */
-
-.pagination span strong {
-	color: #FFFFFF;
-	background-color: #D70751;
-	border-color: #D70751;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	color: #D70751;
-	background-color: #ECEDEE;
-	border-color: #B4BAC0;
-}
-
-.pagination span a:hover {
-	border-color: #D70751;
-	background-color: #D70751;
-	color: #FFF;
-}
-
-/* Pagination in viewforum for multipage topics */
-.row .pagination {
-	background-image: url("{T_THEME_PATH}/images/icon_pages.gif");
-}
-
-.row .pagination span a, li.pagination span a {
-	background-color: #FFFFFF;
-}
-
-.row .pagination span a:hover, li.pagination span a:hover {
-	background-color: #D70751;
-}
-
-/* Miscellaneous styles
----------------------------------------- */
-
-.error {
-	color: #d70751;
-}
-
-.reported {
-	background-color: #F7ECEF;
-}
-
-li.reported:hover {
-	background-color: #ECD5D8 !important;
-}
-.sticky, .announce {
-	/* you can add a background for stickies and announcements*/
-}
-
-div.rules {
-	background-color: #ECD5D8;
-	color: #d70751;
-}
-
-p.rules {
-	background-color: #ECD5D8;
-	background-image: none;
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for links.css
--------------------------------------------------------------- */
-
-a:link	{ color: #4D4D4D; }
-a:visited	{ color: #4D4D4D; }
-a:hover	{ color: #4D4D4D; }
-a:active	{ color: #4D4D4D; }
-
-/* Links on gradient backgrounds */
-#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link {
-	color: #000000;
-	text-transform: uppercase;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 10pt;
-	width:100%;
-	color:#000000;
-}
-
-#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited {
-	color: #000000;
-	text-transform: uppercase;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 10pt;
-	width:100%;
-}
-
-#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover {
-	color: #000000;
-}
-
-#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active {
-	color: #000000;
-}
-
-/* Links for forum/topic lists */
-a.forumtitle {
-	color: #4D4D4D;
-}
-
-/* a.forumtitle:visited { color: #4D4D4D; } */
-
-a.forumtitle:hover {
-	color: #4D4D4D;
-}
-
-a.forumtitle:active {
-	color: #4D4D4D;
-}
-
-a.topictitle {
-	color: #4D4D4D;
-}
-
-/* a.topictitle:visited { color: #4D4D4D; } */
-
-a.topictitle:hover {
-	color: #4D4D4D;
-}
-
-a.topictitle:active {
-	color: #4D4D4D;
-}
-
-/* Post body links */
-.postlink {
-	text-decoration: none;
-	color: #D70751;
-}
-
-.postlink:visited {
-	text-decoration: none;
-	color: #D70751;
-}
-
-.postlink:active {
-	text-decoration: none;
-	color: #D70751;
-}
-
-.postlink:hover {
-	text-decoration: underline;
-	color: #D70751;
-}
-
-.signature a, .signature a:visited, .signature a:active, .signature a:hover {
-	background-color: transparent;
-}
-
-/* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
-	color: #D70751;
-	text-decoration: none;
-}
-
-.postprofile a:hover, .postprofile dt.author a:hover {
-	text-decoration: underline;
-}
-
-/* Profile searchresults */	
-.search .postprofile a {
-	color: #D70751;
-}
-
-.search .postprofile a:hover {
-	color: #D70751;
-}
-
-/* Back to top of page */
-a.top {
-	background-image: url("{T_IMAGESET_PATH}/icon_back_top.gif");
-}
-
-a.top2 {
-	background-image: url("{T_IMAGESET_PATH}/icon_back_top.gif");
-}
-
-/* Arrow links  */
-a.up		{ background-image: url("{T_THEME_PATH}/images/arrow_up.gif") }
-a.down		{ background-image: url("{T_THEME_PATH}/images/arrow_down.gif") }
-a.left		{ background-image: url("{T_THEME_PATH}/images/arrow_left.gif") }
-a.right		{ background-image: url("{T_THEME_PATH}/images/arrow_right.gif") }
-
-a.up:hover {
-	background-color: transparent;
-}
-
-a.left:hover {
-	color: #D70751;
-}
-
-a.right:hover {
-	color: #D70751;
-}
-
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for content.css
--------------------------------------------------------------- */
-
-ul.forums {
-	background-color: #F0F0F0;
-}
-
-ul.topiclist li {
-	color: #404040;
-}
-
-ul.topiclist dd {
-	border-left-color: #FFFFFF;
-}
-
-.rtl ul.topiclist dd {
-	border-right-color: #fff;
-	border-left-color: transparent;
-}
-
-ul.topiclist li.row dt a.subforum.read {
-	background-image: url("{T_IMAGESET_PATH}/subforum_read.gif");
-}
-
-ul.topiclist li.row dt a.subforum.unread {
-	background-image: url("{T_IMAGESET_PATH}/subforum_unread.gif");
-	background-color: #D70751;
-}
-
-li.row {
-	border-top-color:  #FFFFFF;
-	border-bottom-color: #B0B0B0;
-}
-
-li.row strong {
-	color: #000000;
-}
-
-li.row:hover {
-	background-color: #F6F4D0;
-}
-
-li.row:hover dd {
-	border-left-color: #CCCCCC;
-}
-
-.rtl li.row:hover dd {
-	border-right-color: #CCCCCC;
-	border-left-color: transparent;
-}
-
-li.header dt, li.header dd {
-	color: #000000;
-}
-
-/* Forum list column styles */
-ul.topiclist dd.searchextra {
-	color: #333333;
-}
-
-/* Post body styles
-----------------------------------------*/
-.postbody {
-	color: #333333;
-}
-
-/* Content container styles
-----------------------------------------*/
-.content {
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #D70751;
-	border-bottom-color:  #CCCCCC;
-}
-
-dl.faq dt {
-	color: #333333;
-}
-
-.posthilit {
-	background-color: #F3BFCC;
-	color: #d70751;
-}
-
-/* Post signature */
-.signature {
-	border-top-color: #CCCCCC;
-}
-
-/* Post noticies */
-.notice {
-	border-top-color:  #CCCCCC;
-}
-
-/* BB Code styles
-----------------------------------------*/
-/* Quote block */
-blockquote {
-	background-color: #EBEADD;
-	background-image: url("{T_THEME_PATH}/images/quote.gif");
-	border-color:#DBDBCE;
-}
-
-blockquote blockquote {
-	/* Nested quotes */
-	background-color:#EFEED9;
-}
-
-blockquote blockquote blockquote {
-	/* Nested quotes */
-	background-color: #EBEADD;
-}
-
-/* Code block */
-dl.codebox {
-	background-color: #FFFFFF;
-	border-color: #C9D2D8;
-}
-
-dl.codebox dt {
-	border-bottom-color:  #CCCCCC;
-}
-
-dl.codebox code {
-	color: #2E8B57;
-}
-
-.syntaxbg		{ color: #000000; }
-.syntaxcomment	{ color: #FF8000; }
-.syntaxdefault	{ color: #0000BB; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #007700; }
-.syntaxstring	{ color: #DD0000; }
-
-/* Attachments
-----------------------------------------*/
-.attachbox {
-	background-color: #FFFFFF;
-	border-color:  #C9D2D8;
-}
-
-.pm-message .attachbox {
-	background-color: #F2F3F3;
-}
-
-.attachbox dd {
-	border-top-color: #C9D2D8;
-}
-
-.attachbox p {
-	color: #666666;
-}
-
-.attachbox p.stats {
-	color: #666666;
-}
-
-.attach-image img {
-	border-color: #999999;
-}
-
-/* Inline image thumbnails */
-
-dl.file dd {
-	color: #666666;
-}
-
-dl.thumbnail img {
-	border-color: #666666;
-	background-color: #FFFFFF;
-}
-
-dl.thumbnail dd {
-	color: #666666;
-}
-
-dl.thumbnail dt a:hover {
-	background-color: #EEEEEE;
-}
-
-dl.thumbnail dt a:hover img {
-	border-color: #D70751;
-}
-
-/* Post poll styles
-----------------------------------------*/
-
-fieldset.polls dl {
-	border-top-color: #DCDEE2;
-	color: #666666;
-}
-
-fieldset.polls dl.voted {
-	color: #000000;
-}
-
-fieldset.polls dd div {
-	color: #000000;
-}
-
-.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 {
-	border-right-color: transparent;
-}
-
-.pollbar1 {
-	background-color: #AA2346;
-	border-bottom-color: #74162C;
-	border-right-color: #74162C;
-}
-
-.rtl .pollbar1 {
-	border-left-color: #74162C;
-}
-
-.pollbar2 {
-	background-color: #BE1E4A;
-	border-bottom-color: #8C1C38;
-	border-right-color: #8C1C38;
-}
-
-.rtl .pollbar2 {
-	border-left-color: #8C1C38;
-}
-
-.pollbar3 {
-	background-color: #D11A4E;
-	border-bottom-color: #AA2346;
-	border-right-color: #AA2346;
-}
-
-.rtl .pollbar3 {
-	border-left-color: #AA2346;
-}
-
-.pollbar4 {
-	background-color: #E41653;
-	border-bottom-color: #BE1E4A;
-	border-right-color: #BE1E4A;
-}
-
-.rtl .pollbar4 {
-	border-left-color: #BE1E4A;
-}
-
-.pollbar5 {
-	background-color: #F81157;
-	border-bottom-color: #D11A4E;
-	border-right-color: #D11A4E;
-}
-
-.rtl .pollbar5 {
-	border-left-color: #D11A4E;
-}
-
-/* Poster profile block
-----------------------------------------*/
-.postprofile {
-	color: #666666;
-	border-left-color: #FFFFFF;
-}
-
-.rtl .postprofile {
-	border-right-color: #FFFFFF;
-	border-left-color: transparent;
-}
-
-.pm .postprofile {
-	border-left-color: #DDDDDD;
-}
-
-.rtl .pm .postprofile {
-	border-right-color: #DDDDDD;
-	border-left-color: transparent;
-}
-
-.postprofile strong {
-	color: #000000;
-}
-
-.online {
-	background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online.gif");
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for buttons.css
--------------------------------------------------------------- */
-
-/* Big button images */
-.reply-icon span	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_reply.gif"); }
-.post-icon span		{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_new.gif"); }
-.locked-icon span	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_locked.gif"); }
-.pmreply-icon span	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_reply.gif") ;}
-.newpm-icon span 	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_new.gif") ;}
-.forwardpm-icon span	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_forward.gif") ;}
-
-a.print {
-	background-image: url("{T_THEME_PATH}/images/icon_print.png");
-}
-
-a.sendemail {
-	background-image: url("{T_THEME_PATH}/images/icon_sendemail.png");
-}
-
-a.fontsize {
-	background-image: url("{T_THEME_PATH}/images/icon_fontsize.gif");
-}
-
-/* Icon images
----------------------------------------- */
-.sitehome						{ background-image: url("{T_THEME_PATH}/images/icon_home.gif"); }
-.icon-faq						{ background-image: url("{T_THEME_PATH}/images/icon_faq.gif"); }
-.icon-members					{ background-image: url("{T_THEME_PATH}/images/icon_members.gif"); }
-.icon-home						{ background-image: url("{T_THEME_PATH}/images/icon_home.gif"); }
-.icon-ucp						{ background-image: url("{T_THEME_PATH}/images/icon_ucp.gif"); }
-.icon-register					{ background-image: url("{T_THEME_PATH}/images/icon_register.gif"); }
-.icon-logout					{ background-image: url("{T_THEME_PATH}/images/icon_logout.gif"); }
-.icon-bookmark					{ background-image: url("{T_THEME_PATH}/images/icon_bookmark.gif"); }
-.icon-bump						{ background-image: url("{T_THEME_PATH}/images/icon_bump.gif"); }
-.icon-subscribe					{ background-image: url("{T_THEME_PATH}/images/icon_subscribe.gif"); }
-.icon-unsubscribe				{ background-image: url("{T_THEME_PATH}/images/icon_unsubscribe.gif"); }
-.icon-pages						{ background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); }
-.icon-search					{ background-image: url("{T_THEME_PATH}/images/icon_search.gif"); }
-
-/* Profile & navigation icons */
-.email-icon, .email-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_email.gif"); }
-.aim-icon, .aim-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_aim.gif"); }
-.yahoo-icon, .yahoo-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_yahoo.gif"); }
-.web-icon, .web-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_www.gif"); }
-.msnm-icon, .msnm-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_msnm.gif"); }
-.icq-icon, .icq-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_icq.gif"); }
-.jabber-icon, .jabber-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_jabber.gif"); }
-.pm-icon, .pm-icon a				{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_contact_pm.gif"); }
-.quote-icon, .quote-icon a		{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_quote.gif"); }
-
-/* Moderator icons */
-.report-icon, .report-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_post_report.gif"); }
-.edit-icon, .edit-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_edit.gif"); }
-.delete-icon, .delete-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_post_delete.gif"); }
-.info-icon, .info-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_post_info.gif"); }
-.warn-icon, .warn-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_user_warn.gif"); } /* Need updated warn icon */
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for cp.css
--------------------------------------------------------------- */
-
-/* Main CP box
-----------------------------------------*/
-
-#cp-main h3, #cp-main hr, #cp-menu hr {
-	border-color: #A4B3BF;
-}
-
-#cp-main .panel li.row {
-	border-bottom-color: #B5C1CB;
-	border-top-color: #F9F9F9;
-}
-
-ul.cplist {
-	border-top-color: #B5C1CB;
-}
-
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
-	color: #000000;
-}
-
-#cp-main table.table1 thead th {
-	color: #333333;
-	border-bottom-color: #333333;
-}
-
-#cp-main .pm-message {
-	border-color: #DBDEE2;
-	background-color: #FFFFFF;
-}
-
-/* CP tabbed menu
-----------------------------------------*/
-#tabs a {
-	background-image: url("{T_THEME_PATH}/images/bg_tabs1.gif");
-}
-
-#tabs a span {
-	background-image: url("{T_THEME_PATH}/images/bg_tabs2.gif");
-	color: #404040 ;
-}
-
-#tabs a:hover span {
-	color: #d70751;
-}
-
-#tabs .activetab a {
-	border-bottom-color: #DBDBDB;
-}
-
-#tabs .activetab a span {
-	color: #333333;
-}
-
-#tabs .activetab a:hover span {
-	color: #000000;
-}
-
-/* Mini tabbed menu used in MCP
-----------------------------------------*/
-#minitabs li {
-	background-color: #EAEAEA;
-}
-
-#minitabs li.activetab {
-	background-color: #F9F9F9;
-}
-
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
-	color: #333333;
-}
-
-/* UCP navigation menu
-----------------------------------------*/
-
-/* Link styles for the sub-section links */
-#navigation a {
-	color: #333;
-	background-color: #C1C1C1;
-	background-image: url("{T_THEME_PATH}/images/bg_menu.gif");
-}
-
-#navigation a:hover {
-	background-color: #B8B8B8;
-	color: #d70751;
-}
-
-#navigation #active-subsection a {
-	color: #D31141;
-	background-color: #F9F9F9;
-	background-image: none;
-}
-
-#navigation #active-subsection a:hover {
-	color: #D31141;
-}
-
-/* Preferences pane layout
-----------------------------------------*/
-#cp-main h2 {
-	color: #333333;
-}
-
-#cp-main .panel {
-	background-color: #F9F9F9;
-}
-
-#cp-main .pm {
-	background-color: #FFFFFF;
-}
-
-/* Friends list */
-.cp-mini {
-	background-color: #f0f0f0;
-}
-
-dl.mini dt {
-	color: #425067;
-}
-
-/* PM Styles
-----------------------------------------*/
-/* PM Message history */
-.current {
-	color: #999999 !important;
-}
-
-/* PM marking colours */
-.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
-	border-left-color: #d70751;
-	border-right-color: #d70751;
-}
-
-.pmlist li.pm_marked_colour, .pm_marked_colour {
-	border-color: #FF6600;
-}
-
-.pmlist li.pm_replied_colour, .pm_replied_colour {
-	border-color: #A9B8C2;
-}
-
-.pmlist li.pm_friend_colour, .pm_friend_colour {
-	border-color: #D70751;
-}
-
-pmlist li.pm_foe_colour, .pm_foe_colour {
-	border-color: #000000;
-}
-
-/* Avatar gallery */
-#gallery label {
-	background-color: #FFFFFF;
-	border-color: #CCC;
-}
-
-#gallery label:hover {
-	background-color: #EEE;
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for forms.css
--------------------------------------------------------------- */
-
-/* General form styles
-----------------------------------------*/
-select {
-	border-color: #666666;
-	background-color: #FAFAFA;
-}
-
-label {
-	color: #425067;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-/* Definition list layout for forms
----------------------------------------- */
-dd label {
-	color: #333;
-}
-
-/* Hover effects */
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset.fields2 dl:hover dt label {
-	color: inherit;
-}
-
-/* Quick-login on index page */
-fieldset.quick-login input.inputbox {
-	background-color: #F2F3F3;
-}
-
-/* Posting page styles
-----------------------------------------*/
-
-#message-box textarea {
-	color: #333333;
-}
-
-/* Input field styles
----------------------------------------- */
-.inputbox {
-	background-color: #FFFFFF; 
-	border-color: #B4BAC0;
-	color: #333333;
-}
-
-.inputbox:hover {
-	border-color: #D70751;
-}
-
-.inputbox:focus {
-	border-color: #D70751;
-	color: #4b4b4b;
-}
-
-/* Form button styles
----------------------------------------- */
-
-a.button1, input.button1, input.button3, a.button2, input.button2 {
-	color: #000;
-	background-color: #FAFAFA;
-	background-image: url("{T_THEME_PATH}/images/bg_button.gif");
-}
-
-a.button1, input.button1 {
-	border-color: #666666;
-}
-
-input.button3 {
-	background-image: none;
-}
-
-/* Alternative button */
-a.button2, input.button2, input.button3 {
-	border-color: #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	color: #000000;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
-	border-color: #d70751;
-	color: #d70751;
-}
-
-input.search {
-	background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif");
-}
-
-input.disabled {
-	color: #666666;
-}
-
-.page-sidebar-left {
-	float:left;
-	margin-top:4px;
-	width:10%;
-}
-
-/* Menu item */
-.menuitem
-{
-	padding: 0.1em 0.2em 0.1em 0.2em;
-	-moz-border-radius-topright: 10%;
-	-webkit-border-radius-topright: 10%;
-	background-color: #f0f0f0;
-	border: 1px solid #d0d0d0;
-	border-left: 3px solid #d70751;
-	margin: 0.5em 0 0 0;
-	text-transform: uppercase;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 10pt;
-	width:100%;
-	color:#000000;
-}
-
-.menuitem-active
-{
-	padding: 0.1em 0.2em 0.1em 0.2em;
-	background-color: #f0f0f0;
-	border: 1px solid #d0d0d0;
-	border-left: 3px solid #d70751;
-        -moz-border-radius-topright: 10%;
-        -webkit-border-top-right-radius: 10%;
-        border-radius-topright: 10%;
-	margin: 0.5em 0 0 0;
-	text-transform: uppercase;
-	font-weight: bolder;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	font-size: 10pt;
-	width:100%;
-	color:#000000;
-}
-
-.menusubitem
-{
-	list-style: none;
-	margin: 0 0 0 1em;
-	font-size: 8pt;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	margin-bottom: 6px;
-	line-height: 1.2;
-	color:#000000;
-}
-
-.menusubitem a
-{
-	color:#606060;
-	text-decoration: underline;
-}
-
-.menusubitem-active
-{
-	margin: 0 0 0 1em;
-	font-size: 9pt;
-	font-weight: bolder;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Helvetica, Verdana;
-	line-height: 1.5;
-	color:#000000;
-}
-
-.menusubitem a:hover
-{
-	background-color: #f0f0f0;
-}
-
-.navijump {
-	position: absolute;
-	left: -1000px;
-	top: -1000px;
-	width: 0px;
-	height: 0px;
-}
-
-.headersearchbox {
-	background-color: #FFFFFF;
-	border: 1px solid #B0B0B0;
-	color: #333333;
-	cursor: text;
-}
-
-.headersearchbox:hover {
-	border: 1px solid #D70751;
-}
-
-.headersearchbox:focus {
-	border: 1px solid #D70751;
-	color: #4b4b4b;
-}
 
-div#dfsection {
-	z-index: 1;
-	position: absolute;
-	left: 400px;
-	top: 25px;
-	font-family: "Bitstream Vera Serif", Georgia, Palatino, serif;
-	font-size: 20px;
-	color: #D70751;
-	font-weight: bold;
-	font-style: italic;
-}
\ No newline at end of file
diff --git a/theme/theme.cfg b/theme/theme.cfg
deleted file mode 100644
index 52eabe5..0000000
--- a/theme/theme.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# phpBB Theme Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# Available and used values:
-# parse_css_file
-# 
-
-# General Information about this theme
-name = debianforum.de
-copyright = &copy; 2008 Timo Salmen for debianforum.de
-version = 1.0.1
-
-# Some configuration options
-
-#
-# You have to turn this option on if you want to use the 
-# path template variables ({T_IMAGESET_PATH} for example) within
-# your css file.
-# This is mostly the case if you want to use language specific
-# images within your css file.
-#
-parse_css_file = 1
-- 
2.39.5