From fab45e0566ddc14b74edfbc13c9d6acf261bea44 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Fri, 06 Jul 2012 08:07:32 -0400
Subject: [PATCH] init for default-v2

---
 interface/web/themes/default-v2/icons/x16/tags__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x32/login.png                                 |    0 
 interface/web/themes/default-v2/icons/x64/server.png                                |    0 
 interface/web/themes/default-v2/icons/x16/arrow_180_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/star__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/books_stack.png                           |    0 
 interface/web/themes/default-v2/icons/x16/sort__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/chain_unchain.png                         |    0 
 interface/web/themes/default-v2/icons/x16/drawer.png                                |    0 
 interface/web/themes/default-v2/icons/x16/newspaper_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/disks__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/bank_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/feed__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/tag_small.png                             |    0 
 interface/web/themes/default-v2/images/header_bg.png                                |    0 
 interface/web/themes/default-v2/icons/x16/book__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/database_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/tux.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/picture_small.png                         |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png              |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm      |   66 
 interface/web/themes/default-v2/icons/x16/blogs_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x64/dashboard.png                             |    0 
 interface/web/themes/default-v2/templates/dns/dns_template_list.htm                 |   53 
 interface/web/themes/default-v2/icons/x16/sort_number.png                           |    0 
 interface/web/themes/default-v2/templates/help/faq_sections_edit.htm                |   20 
 interface/web/themes/default-v2/icons/x16/broom_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/heart__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/tables_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/star_half.png                             |    0 
 interface/web/themes/default-v2/templates/login/index.htm                           |   33 
 interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm              |   41 
 interface/web/themes/default-v2/icons/x16/hammer__arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/document__minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/key__pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x12/flag_black.png                            |    0 
 interface/web/themes/default-v2/icons/x12/article.png                               |    0 
 interface/web/themes/default-v2/templates/sites/shell_user_list.htm                 |   59 
 interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png           |    0 
 interface/web/themes/default-v2/icons/x16/bell__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x12/clock.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/drill_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/magnet__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/sort__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/bookmark.png                              |    0 
 interface/web/themes/default-v2/icons/x16/media_player.png                          |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb__minus.png                     |    0 
 interface/web/themes/default-v2/icons/x16/balloons_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/newspapers_minus.png                      |    0 
 interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm                 |   73 
 interface/web/themes/default-v2/icons/x16/clock__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/auction_hammer.png                        |    0 
 interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm              |   59 
 interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm                  |   39 
 interface/web/themes/default-v2/icons/x16/pipette_plus.png                          |    0 
 interface/web/themes/default-v2/icons/x12/world2.png                                |    0 
 interface/web/themes/default-v2/templates/tools/user_settings.htm                   |   39 
 interface/web/themes/default-v2/icons/x16/books__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png                   |    0 
 interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png          |    0 
 interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/shield__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16-list/pictures.png                         |    0 
 interface/web/themes/default-v2/icons/x16/wallet_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/wand_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png                   |    0 
 interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm             |   34 
 interface/web/themes/default-v2/icons/x16-list/question_blue.png                    |    0 
 interface/web/themes/default-v2/icons/x16/heart_small_half.png                      |    0 
 interface/web/themes/default-v2/icons/x16/key.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/microphone_minus.png                      |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm             |  146 
 interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm |   37 
 interface/web/themes/default-v2/icons/x16/document_shred.png                        |    0 
 interface/web/themes/default-v2/icons/x16/heart__minus.png                          |    0 
 interface/web/themes/default-v2/templates/sites/shell_user_edit.htm                 |   72 
 interface/web/themes/default-v2/icons/x16/disc_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x12/article_text.png                          |    0 
 interface/web/themes/default-v2/icons/x16/disk_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pictures_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/blog__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/folder.png                                |    0 
 interface/web/themes/default-v2/icons/x16/magnet_small.png                          |    0 
 interface/web/themes/default-v2/icons/x16/script__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/disk__minus.png                           |    0 
 interface/web/themes/default-v2/templates/dns/dns_template_edit.htm                 |   38 
 interface/web/themes/default-v2/icons/x16/calendar__exclamation.png                 |    0 
 interface/web/themes/default-v2/templates/mail/mail_domain_list.htm                 |   56 
 interface/web/themes/default-v2/icons/x16/layout_header_2.png                       |    0 
 interface/web/themes/default-v2/icons/x16/arrow_stop_180.png                        |    0 
 interface/web/themes/default-v2/icons/x64/monitor.png                               |    0 
 interface/web/themes/default-v2/templates/mail/mail_get_edit.htm                    |   60 
 interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm      |   22 
 interface/web/themes/default-v2/icons/x16/balloon__exclamation.png                  |    0 
 interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm             |   30 
 interface/web/themes/default-v2/icons/x16/door.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/puzzle__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/documents.png                             |    0 
 interface/web/themes/default-v2/icons/x16-list/minus_round.png                      |    0 
 interface/web/themes/default-v2/icons/x16/briefcase.png                             |    0 
 interface/web/themes/default-v2/icons/x16/broom_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/clock_frame.png                           |    0 
 interface/web/themes/default-v2/icons/x16/notebooks_plus.png                        |    0 
 interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x16/printer__pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/cassette_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png                  |    0 
 interface/web/themes/default-v2/templates/admin/language_edit.htm                   |   29 
 interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm          |   38 
 interface/web/themes/default-v2/icons/x16/photo_album__arrow.png                    |    0 
 interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png              |    0 
 interface/web/themes/default-v2/icons/x16/star__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/folders_arrow.png                         |    0 
 interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm            |   86 
 interface/web/themes/default-v2/icons/x16/switch_minus.png                          |    0 
 interface/web/themes/default-v2/templates/sites/cron_list.htm                       |   74 
 interface/web/themes/default-v2/icons/x16/paint_can_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/picture_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/gear__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/inbox_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/layout_join.png                           |    0 
 interface/web/themes/default-v2/icons/x16/calculator.png                            |    0 
 interface/web/themes/default-v2/templates/mail/mail_get_list.htm                    |   62 
 interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm            |   53 
 interface/web/themes/default-v2/icons/x16-list/cancel.png                           |    0 
 interface/web/themes/default-v2/icons/x16/clock.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/clock_small.png                           |    0 
 interface/web/themes/default-v2/templates/sites/aps_packages_list.htm               |   50 
 interface/web/themes/default-v2/templates/mail/mail_alias_list.htm                  |   56 
 interface/web/themes/default-v2/icons/x16/newspapers_plus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/cassette_plus.png                         |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm             |   76 
 interface/web/themes/default-v2/templates/client/client_template_edit_template.htm  |   28 
 interface/web/themes/default-v2/icons/x16/contrast__exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/book__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/ticket_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/lightning_disable.png                     |    0 
 interface/web/themes/default-v2/icons/x16/briefcase_plus.png                        |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm            |   80 
 interface/web/themes/default-v2/icons/x12/flag_red.png                              |    0 
 interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm         |   38 
 interface/web/themes/default-v2/icons/x16/wall__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/media_players_pencil.png                  |    0 
 interface/web/themes/default-v2/icons/x16/picture.png                               |    0 
 interface/web/themes/default-v2/icons/x16/tables_stacks.png                         |    0 
 interface/web/themes/default-v2/icons/flags_sprite.png                              |    0 
 interface/web/themes/default-v2/icons/x16/receipts_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/plus_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/tick_small_circle.png                     |    0 
 interface/web/themes/default-v2/images/header_logo.png                              |    0 
 interface/web/themes/default-v2/icons/x16/safe_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/envelope_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium.png                   |    0 
 interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css                     |  444 +
 interface/web/themes/default-v2/icons/x16/chain_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16-list/accept.png                           |    0 
 interface/web/themes/default-v2/icons/x16/minus_small_circle.png                    |    0 
 interface/web/themes/default-v2/icons/x16/puzzle__arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/discs.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/image_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/report_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/palette_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/ruler__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/tick_circle.png                           |    0 
 interface/web/themes/default-v2/icons/x16/trophy_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/films_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/wall_disable.png                          |    0 
 interface/web/themes/default-v2/icons/x12/security_red.png                          |    0 
 interface/web/themes/default-v2/icons/x16/bookmark__plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/contrast__arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/funnel_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/ticket_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/bandaid_plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/cross.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/magnet__pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/receipt_shred.png                         |    0 
 interface/web/themes/default-v2/icons/x32/state_warning.png                         |    0 
 interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm           |   43 
 interface/web/themes/default-v2/icons/x16/drawer_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/cards__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png                    |    0 
 interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm                    |   38 
 interface/web/themes/default-v2/icons/x16/calendar_month.png                        |    0 
 interface/web/themes/default-v2/templates/form.tpl.htm                              |    1 
 interface/web/themes/default-v2/icons/x16/disk__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/feed_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/trophy.png                                |    0 
 interface/web/themes/default-v2/icons/x16/plug_plus.png                             |    0 
 interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm        |   22 
 interface/web/themes/default-v2/icons/x16/wallet_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/tags__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/arrow_045.png                             |    0 
 interface/web/themes/default-v2/icons/x16/database_arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/folders_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/tag__plus.png                             |    0 
 interface/web/themes/default-v2/CHANGELOG                                           |   20 
 interface/web/themes/default-v2/icons/x16/bell_disable.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/refresh.png                          |    0 
 interface/web/themes/default-v2/icons/x16/discs_minus.png                           |    0 
 interface/web/themes/default-v2/templates/admin/server_config_list.htm              |   40 
 interface/web/themes/default-v2/icons/x16/bookmark_document.png                     |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/clock__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/film_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/camera_small_black.png                    |    0 
 interface/web/themes/default-v2/icons/x16-list/bar_graph.png                        |    0 
 interface/web/themes/default-v2/icons/x16-list/money.png                            |    0 
 interface/web/themes/default-v2/icons/x16/plus_small_circle.png                     |    0 
 interface/web/themes/default-v2/icons/x16/arrow_135_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/paint_can_plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/music_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/newspaper_plus.png                        |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm            |   50 
 interface/web/themes/default-v2/icons/x16/clipboard__plus.png                       |    0 
 interface/web/themes/default-v2/templates/monitor/show_sys_state.htm                |   25 
 interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png          |    0 
 interface/web/themes/default-v2/icons/x16/lock.png                                  |    0 
 interface/web/themes/default-v2/images/favicon.ico                                  |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_3.png                       |    0 
 interface/web/themes/default-v2/icons/x16/media_players.png                         |    0 
 interface/web/themes/default-v2/icons/x12/folder.png                                |    0 
 interface/web/themes/default-v2/icons/x16/funnel_small.png                          |    0 
 interface/web/themes/default-v2/icons/x16/tag.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/equalizer_plus.png                        |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm    |   38 
 interface/web/themes/default-v2/icons/x16-list/plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/document_horizontal.png                   |    0 
 interface/web/themes/default-v2/icons/x16/disk_black.png                            |    0 
 interface/web/themes/default-v2/icons/x16/notebook_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/calendar__pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/contrast__pencil.png                      |    0 
 interface/web/themes/default-v2/templates/monitor/datalog_list.htm                  |   49 
 interface/web/themes/default-v2/icons/x16/cards__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/flag_blue.png                        |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png                    |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes.png                          |    0 
 interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm           |   54 
 interface/web/themes/default-v2/icons/x16/mail_open_document.png                    |    0 
 interface/web/themes/default-v2/icons/x16/slash_small.png                           |    0 
 interface/web/themes/default-v2/icons/x12/comment_blue.png                          |    0 
 interface/web/themes/default-v2/icons/x16/address_book__arrow.png                   |    0 
 interface/web/themes/default-v2/icons/x16/blogs_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/cassette_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/user.png                                  |    0 
 interface/web/themes/default-v2/templates/help/support_message_list.htm             |   53 
 interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm        |   49 
 interface/web/themes/default-v2/icons/x16/media_player_small_green.png              |    0 
 interface/web/themes/default-v2/icons/x16/feed__exclamation.png                     |    0 
 interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm            |   34 
 interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm            |   56 
 interface/web/themes/default-v2/templates/client/client_template_list.htm           |   56 
 interface/web/themes/default-v2/icons/x16/bell__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/pill_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/folders_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/address_book.png                          |    0 
 interface/web/themes/default-v2/icons/x16/bin_full.png                              |    0 
 interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png    |    0 
 interface/web/themes/default-v2/icons/x16/crown__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/notebook_arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x12/new.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/scripts__minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16-list/stop.png                             |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm      |   22 
 interface/web/themes/default-v2/icons/x16/stamp_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/arrow_skip_090.png                        |    0 
 interface/web/themes/default-v2/icons/x16/report_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x12/burst.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/images_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/mails_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/books__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/envelope_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x32/help.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/wall__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/wall_brick.png                            |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png                   |    0 
 interface/web/themes/default-v2/icons/x12/cancel_round.png                          |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png                   |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16-list/rss_round.png                        |    0 
 interface/web/themes/default-v2/templates/mail/mail_transport_list.htm              |   62 
 interface/web/themes/default-v2/icons/x16/tags__exclamation.png                     |    0 
 interface/web/themes/default-v2/css/styles.css                                      | 1830 +++++++
 interface/web/themes/default-v2/icons/x16-list/accept_blue.png                      |    0 
 interface/web/themes/default-v2/icons/x16/pictures.png                              |    0 
 interface/web/themes/default-v2/icons/x16/layout_2.png                              |    0 
 interface/web/themes/default-v2/templates/admin/users_user_edit.htm                 |   73 
 interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm           |   58 
 interface/web/themes/default-v2/icons/x32/sites.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/ruler__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note__plus.png                     |    0 
 interface/web/themes/default-v2/icons/x16/question_small.png                        |    0 
 interface/web/themes/default-v2/icons/x16/folder__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/feed__pencil.png                          |    0 
 interface/web/themes/default-v2/templates/client/client_del.htm                     |   25 
 interface/web/themes/default-v2/icons/x16/magnet.png                                |    0 
 interface/web/themes/default-v2/icons/x16/printer__arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/arrow_045_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/star_empty.png                            |    0 
 interface/web/themes/default-v2/icons/x16/sort.png                                  |    0 
 interface/web/themes/default-v2/templates/module_tree.tpl.htm                       |   42 
 interface/web/themes/default-v2/icons/x16/database_exclamation.png                  |    0 
 interface/web/themes/default-v2/templates/admin/software_package_install.htm        |   30 
 interface/web/themes/default-v2/icons/x12/star.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/images_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/ruler__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x12/dollar.png                                |    0 
 interface/web/themes/default-v2/icons/x16/safe_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/films.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/key__plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/drawer_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/stop_round.png                       |    0 
 interface/web/themes/default-v2/icons/x16/drill.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png                |    0 
 interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png                    |    0 
 interface/web/themes/default-v2/icons/x16/pencil_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/microphone_exclamation.png                |    0 
 interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x16/lock_disable.png                          |    0 
 interface/web/themes/default-v2/icons/x16/piano_pencil.png                          |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm                  |   64 
 interface/web/themes/default-v2/icons/x16/door_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/funnel_pencil.png                         |    0 
 interface/web/themes/default-v2/templates/sites/cron_edit.htm                       |   68 
 interface/web/themes/default-v2/templates/admin/software_repo_list.htm              |   56 
 interface/web/themes/default-v2/icons/x16/receipts_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/shield__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png                    |    0 
 interface/web/themes/default-v2/icons/x16/cards.png                                 |    0 
 interface/web/themes/default-v2/icons/x12/accept_green.png                          |    0 
 interface/web/themes/default-v2/icons/x16/database_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/bin.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/palette_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/vcard.png                                 |    0 
 interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm        |   52 
 interface/web/themes/default-v2/icons/x16/cassette_small.png                        |    0 
 interface/web/themes/default-v2/templates/client/client_circle_list.htm             |   59 
 interface/web/themes/default-v2/icons/x16/balloon.png                               |    0 
 interface/web/themes/default-v2/icons/x16/camera.png                                |    0 
 interface/web/themes/default-v2/templates/help/help_faq_list.htm                    |   19 
 interface/web/themes/default-v2/icons/x16/wrench_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/book__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/minus_circle_frame.png                    |    0 
 interface/web/themes/default-v2/icons/x16/book.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/lock__exclamation.png                     |    0 
 interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm         |   30 
 interface/web/themes/default-v2/icons/x16/binocular.png                             |    0 
 interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png                 |    0 
 interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm    |  176 
 interface/web/themes/default-v2/icons/x16/home_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x32/state_info.png                            |    0 
 interface/web/themes/default-v2/icons/x12/calendar2.png                             |    0 
 interface/web/themes/default-v2/images/lists_thead_bg.png                           |    0 
 interface/web/themes/default-v2/icons/x16/broom_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/blogs_stack.png                           |    0 
 interface/web/themes/default-v2/icons/x16/mail_open_film.png                        |    0 
 interface/web/themes/default-v2/icons/x16/camera__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/bank.png                                  |    0 
 interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm              |   41 
 interface/web/themes/default-v2/icons/x16/image_minus.png                           |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm       |   44 
 interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm                |   37 
 interface/web/themes/default-v2/icons/x16/disc_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/media_player_small_red.png                |    0 
 interface/web/themes/default-v2/templates/mail/mail_forward_list.htm                |   56 
 interface/web/themes/default-v2/icons/x16/card_small.png                            |    0 
 interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm        |   43 
 interface/web/themes/default-v2/icons/x16/discs_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/drawer_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/balloons_arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/drill_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/notebook_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png           |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png         |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png                    |    0 
 interface/web/themes/default-v2/icons/x16/home_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png                |    0 
 interface/web/themes/default-v2/icons/x16/document__arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/pictures_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/box_label.png                             |    0 
 interface/web/themes/default-v2/icons/x16/arrow_225.png                             |    0 
 interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png              |    0 
 interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm              |   59 
 interface/web/themes/default-v2/icons/x16/script_code.png                           |    0 
 interface/web/themes/default-v2/icons/x16/film.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/flag_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/piano_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/plug_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/tags__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/lock.png                             |    0 
 interface/web/themes/default-v2/icons/x16/folder__pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/pill_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/document_text.png                         |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png            |    0 
 interface/web/themes/default-v2/icons/x16/receipt_exclamation.png                   |    0 
 interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm        |   56 
 interface/web/themes/default-v2/icons/x16/mail.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/bell__minus.png                           |    0 
 interface/web/themes/default-v2/templates/admin/users_list.htm                      |   60 
 interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png                   |    0 
 interface/web/themes/default-v2/icons/x32/dashboard.png                             |    0 
 interface/web/themes/default-v2/icons/x16/crown__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/tables_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/contrast__plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/calendar_day.png                          |    0 
 interface/web/themes/default-v2/icons/x16/disks__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/clipboard_empty.png                       |    0 
 interface/web/themes/default-v2/icons/x16-list/envelope.png                         |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb_off.png                        |    0 
 interface/web/themes/default-v2/icons/x16/tags_label.png                            |    0 
 interface/web/themes/default-v2/icons/x16/bank_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/clipboard.png                             |    0 
 interface/web/themes/default-v2/icons/x16/bandaid_small.png                         |    0 
 interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png                 |    0 
 interface/web/themes/default-v2/icons/x16/media_players_exclamation.png             |    0 
 interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png   |    0 
 interface/web/themes/default-v2/icons/x16/wand_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x12/money.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/media_players_arrow.png                   |    0 
 interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/minus_shield.png                          |    0 
 interface/web/themes/default-v2/icons/x16/databases_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/piano_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/book_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/script.png                                |    0 
 interface/web/themes/default-v2/icons/x16/drawer_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/socket_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/disc_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/magnet__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/user_edit.png                             |    0 
 interface/web/themes/default-v2/icons/x16/user_orange.png                           |    0 
 interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm                      |   38 
 interface/web/themes/default-v2/icons/x16/card__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/mails_stack.png                           |    0 
 interface/web/themes/default-v2/icons/x16/palette_exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/sort_number_descending.png                |    0 
 interface/web/themes/default-v2/icons/x16/discs_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/gear_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/disks__plus.png                           |    0 
 interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm              |  112 
 interface/web/themes/default-v2/icons/x16/hammer__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/blog__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/stamp_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16-list/double_comment.png                   |    0 
 interface/web/themes/default-v2/templates/client/client_circle_edit.htm             |   39 
 interface/web/themes/default-v2/images/buttonHolder_bg.gif                          |    0 
 interface/web/themes/default-v2/icons/x16/newspapers_arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/image_sunset.png                          |    0 
 interface/web/themes/default-v2/icons/x16/wand_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x12/security_orange.png                       |    0 
 interface/web/themes/default-v2/icons/x16/arrow_135.png                             |    0 
 interface/web/themes/default-v2/icons/x16/films_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/blog__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/image_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/heart_small_empty.png                     |    0 
 interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm      |   33 
 interface/web/themes/default-v2/icons/x16/palette_arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/tick.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/clipboard__arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/script__arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/inbox_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/pipette_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/disk_small_black.png                      |    0 
 interface/web/themes/default-v2/icons/x16/wrench.png                                |    0 
 interface/web/themes/default-v2/icons/x16/shield.png                                |    0 
 interface/web/themes/default-v2/icons/x16/binocular_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/vcard_delete.png                          |    0 
 interface/web/themes/default-v2/icons/x16/minus_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/music_plus.png                            |    0 
 interface/web/themes/default-v2/templates/help/faq_edit.htm                         |   29 
 interface/web/themes/default-v2/icons/x16-list/article.png                          |    0 
 interface/web/themes/default-v2/icons/x16/broom_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/ticket_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_zoom.png                        |    0 
 interface/web/themes/default-v2/icons/x16/puzzle.png                                |    0 
 interface/web/themes/default-v2/icons/x16/disk__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/table__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_medium.png                      |    0 
 interface/web/themes/default-v2/icons/x16/ticket.png                                |    0 
 interface/web/themes/default-v2/icons/x16/card_address.png                          |    0 
 interface/web/themes/default-v2/icons/x16/printer__plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/report_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/folder_shred.png                          |    0 
 interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm                     |   58 
 interface/web/themes/default-v2/icons/x16/address_book_blue.png                     |    0 
 interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png           |    0 
 interface/web/themes/default-v2/icons/x16/microphone_arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/media_player_small_blue.png               |    0 
 interface/web/themes/default-v2/icons/x16/plus_shield.png                           |    0 
 interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm                 |   56 
 interface/web/themes/default-v2/templates/admin/server_edit_services.htm            |   70 
 interface/web/themes/default-v2/icons/x16/balloons_exclamation.png                  |    0 
 interface/web/themes/default-v2/images/screen_bg.png                                |    0 
 interface/web/themes/default-v2/icons/x16/pin_minus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png                    |    0 
 interface/web/themes/default-v2/icons/x32/state_ok.png                              |    0 
 interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm             |   48 
 interface/web/themes/default-v2/icons/x16/palette.png                               |    0 
 interface/web/themes/default-v2/icons/x32/calculator.png                            |    0 
 interface/web/themes/default-v2/icons/x16/gear__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/wand_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/inbox_exclamation.png                     |    0 
 interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm            |   37 
 interface/web/themes/default-v2/icons/x16/music_minus.png                           |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_stats.htm                |   37 
 interface/web/themes/default-v2/icons/x16/blog.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png                  |    0 
 interface/web/themes/default-v2/icons/x16/logout.png                                |    0 
 interface/web/themes/default-v2/icons/x16/notebook.png                              |    0 
 interface/web/themes/default-v2/icons/x16/switch_plus.png                           |    0 
 interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm                     |  107 
 interface/web/themes/default-v2/icons/x12/printer.png                               |    0 
 interface/web/themes/default-v2/icons/x16/clipboard__pencil.png                     |    0 
 interface/web/themes/default-v2/icons/x16/door_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/calculator_arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/database_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png                |    0 
 interface/web/themes/default-v2/icons/x16/report_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/crown__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/documents_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/document__plus.png                        |    0 
 interface/web/themes/default-v2/templates/dashlets/modules.htm                      |   10 
 interface/web/themes/default-v2/icons/x32/state_unknown.png                         |    0 
 interface/web/themes/default-v2/templates/admin/remote_user_list.htm                |   52 
 interface/web/themes/default-v2/icons/x16/minus_circle.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/briefcase_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/pin.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/bank_arrow.png                            |    0 
 interface/web/themes/default-v2/templates/dns/dns_wizard.htm                        |   95 
 interface/web/themes/default-v2/icons/x16/cassette_arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png                    |    0 
 interface/web/themes/default-v2/icons/x16/bin__minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/books__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/magnifier__plus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/trophy_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/magnify.png                          |    0 
 interface/web/themes/default-v2/icons/x16/drill_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/ruler__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/wand.png                                  |    0 
 interface/web/themes/default-v2/icons/x12/star_blue.png                             |    0 
 interface/web/themes/default-v2/icons/x16/disc_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/photo_album_blue.png                      |    0 
 interface/web/themes/default-v2/icons/x16/image_resize_actual.png                   |    0 
 interface/web/themes/default-v2/icons/x16/box__exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium_red.png               |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png             |    0 
 interface/web/themes/default-v2/icons/x16-list/info.png                             |    0 
 interface/web/themes/default-v2/icons/x16/star_small_half.png                       |    0 
 interface/web/themes/default-v2/icons/x16/arrow_stop_270.png                        |    0 
 interface/web/themes/default-v2/icons/x16/chain_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/picture_plus.png                          |    0 
 interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm            |   52 
 interface/web/themes/default-v2/icons/x16/gear.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/eraser_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/funnel_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/balloons_plus.png                         |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm            |   62 
 interface/web/themes/default-v2/icons/x16/tables.png                                |    0 
 interface/web/themes/default-v2/icons/x16/home.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/mail__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/tag__pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/media_player__arrow.png                   |    0 
 interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm             |   61 
 interface/web/themes/default-v2/icons/x16/music.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/receipt_plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/tag_label.png                             |    0 
 interface/web/themes/default-v2/icons/x16/blogs_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/arrow_skip.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pipette.png                               |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png               |    0 
 interface/web/themes/default-v2/icons/x12/rss.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/door_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/calendar__minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/puzzle__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/receipts_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/user_female.png                           |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png               |    0 
 interface/web/themes/default-v2/icons/x16/wall.png                                  |    0 
 interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x16/box__minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/color_pencil.png                          |    0 
 interface/web/themes/default-v2/templates/monitor/show_log.htm                      |   25 
 interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm           |   64 
 interface/web/themes/default-v2/icons/x16/flag_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x12/pencil.png                                |    0 
 interface/web/themes/default-v2/icons/x16/home_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/mail_open_image.png                       |    0 
 interface/web/themes/default-v2/icons/x16/playing_card_minus.png                    |    0 
 interface/web/themes/default-v2/icons/x16/plug.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/disk.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/disks.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/bell__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/script__plus.png                          |    0 
 interface/web/themes/default-v2/templates/client/reseller_edit_address.htm          |  116 
 interface/web/themes/default-v2/icons/x16/picture_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/layout.png                                |    0 
 interface/web/themes/default-v2/icons/x16/receipt_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/mails.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/stamp.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/arrow_000_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/pill.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/tags__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png                    |    0 
 interface/web/themes/default-v2/icons/x16/magnifier__arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/table__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/color_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/wallet_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/document_small.png                        |    0 
 interface/web/themes/default-v2/icons/x16/ruler.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/script__pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png                |    0 
 interface/web/themes/default-v2/icons/x16/arrow_stop.png                            |    0 
 interface/web/themes/default-v2/icons/x16/socket_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/screwdriver_minus.png                     |    0 
 interface/web/themes/default-v2/icons/x16-list/world.png                            |    0 
 interface/web/themes/default-v2/templates/tabbed_form.tpl.htm                       |   27 
 interface/web/themes/default-v2/icons/x16/bin__exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/lock__pencil.png                          |    0 
 interface/web/themes/default-v2/templates/admin/language_list.htm                   |   47 
 interface/web/themes/default-v2/icons/x16/layout_split.png                          |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x12/stop.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/address_book__plus.png                    |    0 
 interface/web/themes/default-v2/icons/x16/film_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/safe_minus.png                            |    0 
 interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x12/stop_round.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pictures_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy.png                              |    0 
 interface/web/themes/default-v2/icons/x32/state_error.png                           |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png                     |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/receipt_text.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/star_blue.png                        |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png                 |    0 
 interface/web/themes/default-v2/icons/x16/clock_fill.png                            |    0 
 interface/web/themes/default-v2/icons/x16/cards__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/gear_disable.png                          |    0 
 interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png    |    0 
 interface/web/themes/default-v2/icons/x16/camera__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/pictures_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/tick_circle_frame.png                     |    0 
 interface/web/themes/default-v2/icons/x16/wallet.png                                |    0 
 interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm                     |   54 
 interface/web/themes/default-v2/templates/main.tpl.htm                              |  116 
 interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png            |    0 
 interface/web/themes/default-v2/templates/sites/aps_instances_list.htm              |   62 
 interface/web/themes/default-v2/icons/x16/database.png                              |    0 
 interface/web/themes/default-v2/icons/x16/ruler_crop.png                            |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm        |   62 
 interface/web/themes/default-v2/icons/x16/document__exclamation.png                 |    0 
 interface/web/themes/default-v2/templates/module.tpl.htm                            |   41 
 interface/web/themes/default-v2/icons/x12/upload.png                                |    0 
 interface/web/themes/default-v2/icons/x16/images_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/bookmark__pencil.png                      |    0 
 interface/web/themes/default-v2/templates/mailuser/index.htm                        |   34 
 interface/web/themes/default-v2/icons/x16-list/security_green.png                   |    0 
 interface/web/themes/default-v2/icons/x16/playing_card_pencil.png                   |    0 
 interface/web/themes/default-v2/icons/x12/download.png                              |    0 
 interface/web/themes/default-v2/images/ajax-loader.gif                              |    0 
 interface/web/themes/default-v2/icons/x16-list/clock.png                            |    0 
 interface/web/themes/default-v2/icons/x16/arrow.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/flag_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x32/monitor.png                               |    0 
 interface/web/themes/default-v2/icons/x16/bandaid_arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/cross_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/trophy_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/clock__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/databases_plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle.png                          |    0 
 interface/web/themes/default-v2/icons/x16/envelope_exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/feed_balloon.png                          |    0 
 interface/web/themes/default-v2/icons/x16/receipts_text.png                         |    0 
 interface/web/themes/default-v2/icons/x16/shield__pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/tables_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/printer_empty.png                         |    0 
 interface/web/themes/default-v2/icons/x16/color_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/blogs.png                                 |    0 
 interface/web/themes/default-v2/icons/x12/question_blue.png                         |    0 
 interface/web/themes/default-v2/icons/x16/card__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/heart.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/arrow_180.png                             |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_footer.png                  |    0 
 interface/web/themes/default-v2/icons/x16/calculator_plus.png                       |    0 
 interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm        |   55 
 interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm                    |   38 
 interface/web/themes/default-v2/icons/x16/socket_exclamation.png                    |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm         |   52 
 interface/web/themes/default-v2/icons/x16/cards_stack.png                           |    0 
 interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm                      |  131 
 interface/web/themes/default-v2/icons/x16/piano_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/lock__plus.png                            |    0 
 interface/web/themes/default-v2/templates/admin/firewall_edit.htm                   |   38 
 interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm               |   74 
 interface/web/themes/default-v2/icons/x16/balloon_small.png                         |    0 
 interface/web/themes/default-v2/templates/admin/firewall_list.htm                   |   60 
 interface/web/themes/default-v2/icons/x16/sticky_note_pin.png                       |    0 
 interface/web/themes/default-v2/icons/x16/script__exclamation.png                   |    0 
 interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm      |   52 
 interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm         |   94 
 interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png                  |    0 
 interface/web/themes/default-v2/icons/x16/wallet_arrow.png                          |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm   |   22 
 interface/web/themes/default-v2/icons/x16/mail__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pill_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/blogs_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/shield__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png          |    0 
 interface/web/themes/default-v2/icons/x32/state_critical.png                        |    0 
 interface/web/themes/default-v2/icons/x16-list/download.png                         |    0 
 interface/web/themes/default-v2/icons/x16/puzzle_disable.png                        |    0 
 interface/web/themes/default-v2/templates/dashboard/custom_menu.htm                 |    9 
 interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm       |   44 
 interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png                 |    0 
 interface/web/themes/default-v2/icons/x16/user_go.png                               |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle_135.png                      |    0 
 interface/web/themes/default-v2/icons/x16/eraser_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/notebooks_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/lightning.png                             |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/burst.png                            |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png                 |    0 
 interface/web/themes/default-v2/icons/x16/cards__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x64/network.png                               |    0 
 interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm        |   50 
 interface/web/themes/default-v2/templates/dns/dns_a_edit.htm                        |   54 
 interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm                       |   42 
 interface/web/themes/default-v2/icons/x16/information_small.png                     |    0 
 interface/web/themes/default-v2/icons/x16/disks_black.png                           |    0 
 interface/web/themes/default-v2/icons/x16/user_comment.png                          |    0 
 interface/web/themes/default-v2/icons/x16/crown__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/lightning__pencil.png                     |    0 
 interface/web/themes/default-v2/icons/x16/lightning__exclamation.png                |    0 
 interface/web/themes/default-v2/icons/x16/mails_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/documents_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/box.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/box__plus.png                             |    0 
 interface/web/themes/default-v2/templates/admin/users_groups_edit.htm               |   30 
 interface/web/themes/default-v2/icons/x16/cross_circle_frame.png                    |    0 
 interface/web/themes/default-v2/icons/x16/receipt_arrow.png                         |    0 
 interface/web/themes/default-v2/templates/vm/openvz_template_list.htm               |   52 
 interface/web/themes/default-v2/icons/x16/plug_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/scripts__exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x12/accept_blue.png                           |    0 
 interface/web/themes/default-v2/icons/x16/exclamation_small.png                     |    0 
 interface/web/themes/default-v2/css/print.css                                       |  112 
 interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm            |   49 
 interface/web/themes/default-v2/icons/x16/film_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16-list/calendar2.png                        |    0 
 interface/web/themes/default-v2/icons/x16/switch_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16-list/link.png                             |    0 
 interface/web/themes/default-v2/templates/sites/aps_install_package.htm             |   56 
 interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm         |   52 
 interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm                    |   38 
 interface/web/themes/default-v2/icons/x16/mail__minus.png                           |    0 
 interface/web/themes/default-v2/templates/dns/dns_a_list.htm                        |   88 
 interface/web/themes/default-v2/icons/x16/bookmark_book.png                         |    0 
 interface/web/themes/default-v2/icons/x16/document_horizontal_text.png              |    0 
 interface/web/themes/default-v2/icons/x16/bin__pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/pin_pencil.png                            |    0 
 interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png                    |    0 
 interface/web/themes/default-v2/icons/x16/feed__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/lock_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/paint_can_pencil.png                      |    0 
 interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_film.png                      |    0 
 interface/web/themes/default-v2/icons/x16/binocular_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/lock__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/magnet_disable.png                        |    0 
 interface/web/themes/default-v2/icons/x16/media_player_small.png                    |    0 
 interface/web/themes/default-v2/icons/x12/calendar.png                              |    0 
 interface/web/themes/default-v2/icons/x16/gear__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/pin_plus.png                              |    0 
 interface/web/themes/default-v2/icons/x16/pencil_small.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png           |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb_small.png                      |    0 
 interface/web/themes/default-v2/templates/sites/database_edit.htm                   |  121 
 interface/web/themes/default-v2/icons/x16-list/comment_blue.png                     |    0 
 interface/web/themes/default-v2/icons/x12/link.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/table__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/photo_album__pencil.png                   |    0 
 interface/web/themes/default-v2/icons/x16/stamp_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png                        |    0 
 interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm          |  240 
 interface/web/themes/default-v2/templates/sites/web_folder_list.htm                 |   58 
 interface/web/themes/default-v2/icons/x16/tag__arrow.png                            |    0 
 interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm            |   26 
 interface/web/themes/default-v2/templates/tools/import_ispconfig.htm                |  103 
 interface/web/themes/default-v2/icons/x16/pill_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/films_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/calendar__plus.png                        |    0 
 interface/web/themes/default-v2/templates/dns/dns_records_edit.htm                  |   12 
 interface/web/themes/default-v2/icons/x16/broom.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/folders_plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/security_red.png                     |    0 
 interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png                  |    0 
 interface/web/themes/default-v2/icons/x16/star_small_empty.png                      |    0 
 interface/web/themes/default-v2/icons/x16/mails_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/arrow_090.png                             |    0 
 interface/web/themes/default-v2/icons/x16/mails_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/music_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/bell__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/paper_bag_plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/film_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/scripts_code.png                          |    0 
 interface/web/themes/default-v2/templates/admin/server_ip_edit.htm                  |   50 
 interface/web/themes/default-v2/templates/admin/language_complete.htm               |   29 
 interface/web/themes/default-v2/icons/x16/image_resize.png                          |    0 
 interface/web/themes/default-v2/templates/admin/iptables_edit.htm                   |   67 
 interface/web/themes/default-v2/templates/sites/database_list.htm                   |   66 
 interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png                |    0 
 interface/web/themes/default-v2/icons/x16/playing_card_plus.png                     |    0 
 interface/web/themes/default-v2/icons/x16/receipt_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/lightning__minus.png                      |    0 
 interface/web/themes/default-v2/icons/x16/sort_small.png                            |    0 
 interface/web/themes/default-v2/templates/sites/web_folder_edit.htm                 |   34 
 interface/web/themes/default-v2/licences.txt                                        |   11 
 interface/web/themes/default-v2/icons/x64/help.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/door_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pipette_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/sort__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/images.png                                |    0 
 interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png              |    0 
 interface/web/themes/default-v2/icons/x16/contrast.png                              |    0 
 interface/web/themes/default-v2/templates/dns/dns_import.htm                        |   55 
 interface/web/themes/default-v2/icons/x16/film_pencil.png                           |    0 
 interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm           |  225 
 interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm         |   59 
 interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm            |   44 
 interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm           |   81 
 interface/web/themes/default-v2/icons/x16/cards__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/question_shield.png                       |    0 
 interface/web/themes/default-v2/icons/x16/mail_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/key__arrow.png                            |    0 
 interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png              |    0 
 interface/web/themes/default-v2/templates/login/password_reset.htm                  |   33 
 interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png                |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium_black.png             |    0 
 interface/web/themes/default-v2/icons/x16/clipboard__minus.png                      |    0 
 interface/web/themes/default-v2/templates/vm/openvz.conf.tpl                        |   50 
 interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png                  |    0 
 interface/web/themes/default-v2/icons/x16/inbox_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/hammer__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/bank_plus.png                             |    0 
 interface/web/themes/default-v2/templates/domain/domain_list.htm                    |   62 
 interface/web/themes/default-v2/icons/x16/disc_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/tables_exclamation.png                    |    0 
 interface/web/themes/default-v2/templates/sidenav.tpl.htm                           |   24 
 interface/web/themes/default-v2/icons/x16/information_frame.png                     |    0 
 interface/web/themes/default-v2/icons/x16-list/world2.png                           |    0 
 interface/web/themes/default-v2/icons/x16/magnet__arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/wall_small_brick.png                      |    0 
 interface/web/themes/default-v2/templates/monitor/show_data.htm                     |   12 
 interface/web/themes/default-v2/icons/x16/exclamation_frame.png                     |    0 
 interface/web/themes/default-v2/icons/x16/magnet__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png                |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note__minus.png                    |    0 
 interface/web/themes/default-v2/templates/dns/dns_soa_list.htm                      |   62 
 interface/web/themes/default-v2/icons/x12/accept.png                                |    0 
 interface/web/themes/default-v2/icons/x16-list/flag_green.png                       |    0 
 interface/web/themes/default-v2/icons/x16/disc_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/ticket_arrow.png                          |    0 
 interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm                |   64 
 interface/web/themes/default-v2/icons/x32/network.png                               |    0 
 interface/web/themes/default-v2/icons/x16/layout_header.png                         |    0 
 interface/web/themes/default-v2/templates/admin/server_php_list.htm                 |   55 
 interface/web/themes/default-v2/icons/x16/table_insert.png                          |    0 
 interface/web/themes/default-v2/icons/x16/eraser_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/films_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/pill_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/socket.png                                |    0 
 interface/web/themes/default-v2/icons/x16/question.png                              |    0 
 interface/web/themes/default-v2/icons/x16/binocular_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/envelope_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/printer_small.png                         |    0 
 interface/web/themes/default-v2/icons/x16/safe.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/pipette_exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/plug_exclamation.png                      |    0 
 interface/web/themes/default-v2/templates/tools/resync.htm                          |   67 
 interface/web/themes/default-v2/icons/x16/folders_exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/funnel.png                                |    0 
 interface/web/themes/default-v2/icons/x12/flag_yellow.png                           |    0 
 interface/web/themes/default-v2/icons/x12/code.png                                  |    0 
 interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm                      |   50 
 interface/web/themes/default-v2/icons/x16/balloon__minus.png                        |    0 
 interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm            |   51 
 interface/web/themes/default-v2/templates/client/clients_list.htm                   |   68 
 interface/web/themes/default-v2/icons/x16/printer__minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/sort_date.png                             |    0 
 interface/web/themes/default-v2/icons/x16/microphone.png                            |    0 
 interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm                    |   97 
 interface/web/themes/default-v2/icons/x16/photo_album__plus.png                     |    0 
 interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png                 |    0 
 interface/web/themes/default-v2/icons/x16/pencil_minus.png                          |    0 
 interface/web/themes/default-v2/templates/admin/language_add.htm                    |   29 
 interface/web/themes/default-v2/icons/x16/binocular_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/key__minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png              |    0 
 interface/web/themes/default-v2/icons/x16/screwdriver.png                           |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm           |   61 
 interface/web/themes/default-v2/icons/x16/light_bulb__plus.png                      |    0 
 interface/web/themes/default-v2/icons/x16/cards_address.png                         |    0 
 interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png               |    0 
 interface/web/themes/default-v2/images/lists_tfoot_bg.png                           |    0 
 interface/web/themes/default-v2/icons/x16/books__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/cancel_round.png                     |    0 
 interface/web/themes/default-v2/icons/x16/newspapers_pencil.png                     |    0 
 interface/web/themes/default-v2/icons/x32/tools.png                                 |    0 
 interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm        |   33 
 interface/web/themes/default-v2/icons/x16/newspaper_pencil.png                      |    0 
 interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm         |  139 
 interface/web/themes/default-v2/icons/x16/loading.gif                               |    0 
 interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm                     |   46 
 interface/web/themes/default-v2/icons/x16/document_music.png                        |    0 
 interface/web/themes/default-v2/icons/x16/stamp_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/bookmark__minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/drawer_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/user_add.png                              |    0 
 interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm      |   22 
 interface/web/themes/default-v2/icons/x16-list/dollar.png                           |    0 
 interface/web/themes/default-v2/icons/x16/wrench_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/image_small_sunset.png                    |    0 
 interface/web/themes/default-v2/css/iehacks.css                                     |  184 
 interface/web/themes/default-v2/icons/x16-list/folder.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/article_text.png                     |    0 
 interface/web/themes/default-v2/icons/x16/balloon_left.png                          |    0 
 interface/web/themes/default-v2/icons/x16/balloon__pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x12/bar_graph.png                             |    0 
 interface/web/themes/default-v2/icons/x16/calendar.png                              |    0 
 interface/web/themes/default-v2/templates/admin/language_import.htm                 |   44 
 interface/web/themes/default-v2/icons/x12/rss_round.png                             |    0 
 interface/web/themes/default-v2/icons/x16/scripts__plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/stamp_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/balloon_small_left.png                    |    0 
 interface/web/themes/default-v2/icons/x16/color.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes_text.png                     |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm             |   53 
 interface/web/themes/default-v2/icons/x16/cross_small_circle.png                    |    0 
 interface/web/themes/default-v2/templates/client/client_edit_address.htm            |  140 
 interface/web/themes/default-v2/icons/x16/newspapers.png                            |    0 
 interface/web/themes/default-v2/icons/x16-list/rss.png                              |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png                  |    0 
 interface/web/themes/default-v2/icons/x16/camera_black.png                          |    0 
 interface/web/themes/default-v2/templates/tools/import_plesk.htm                    |   74 
 interface/web/themes/default-v2/icons/x16/sort_date_descending.png                  |    0 
 interface/web/themes/default-v2/icons/x16/scripts.png                               |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder.png                       |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm        |   63 
 interface/web/themes/default-v2/icons/x12/minus_round.png                           |    0 
 interface/web/themes/default-v2/icons/x16/gear__pencil.png                          |    0 
 interface/web/themes/default-v2/images/chevron.png                                  |    0 
 interface/web/themes/default-v2/icons/x16-list/accept_green.png                     |    0 
 interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/tag__exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x32/dns.png                                   |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle_225.png                      |    0 
 interface/web/themes/default-v2/icons/x16/crown_silver.png                          |    0 
 interface/web/themes/default-v2/icons/x16/photo_album.png                           |    0 
 interface/web/themes/default-v2/icons/x16/heart__pencil.png                         |    0 
 interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm         |   50 
 interface/web/themes/default-v2/icons/x16/equalizer_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/media_player__plus.png                    |    0 
 interface/web/themes/default-v2/icons/x16/pencil_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/disks__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/heart_half.png                            |    0 
 interface/web/themes/default-v2/templates/client/client_message.htm                 |   39 
 interface/web/themes/default-v2/icons/x16/arrow_skip_270.png                        |    0 
 interface/web/themes/default-v2/icons/x16/chain.png                                 |    0 
 interface/web/themes/default-v2/templates/sites/webdav_user_list.htm                |   59 
 interface/web/themes/default-v2/icons/x16/wrench_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/newspaper.png                             |    0 
 interface/web/themes/default-v2/icons/x16/balloon__arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/paper_bag_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/address_book__pencil.png                  |    0 
 interface/web/themes/default-v2/icons/x16/tick_shield.png                           |    0 
 interface/web/themes/default-v2/icons/x16/book__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/wrench_pencil.png                         |    0 
 interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm                      |   38 
 interface/web/themes/default-v2/icons/x16-list/flag_black.png                       |    0 
 interface/web/themes/default-v2/icons/x16/receipts.png                              |    0 
 interface/web/themes/default-v2/icons/x16/star__minus.png                           |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm           |   63 
 interface/web/themes/default-v2/icons/x16/plus_circle.png                           |    0 
 interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png              |    0 
 interface/web/themes/default-v2/icons/x16/disks__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png             |    0 
 interface/web/themes/default-v2/icons/x16/flag.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/books__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/pin_exclamation.png                       |    0 
 interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm                     |   68 
 interface/web/themes/default-v2/icons/x16/switch.png                                |    0 
 interface/web/themes/default-v2/icons/x16/image_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/receipts_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/folders_stack.png                         |    0 
 interface/web/themes/default-v2/icons/x16/picture_sunset.png                        |    0 
 interface/web/themes/default-v2/icons/x16/arrow_225_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/discs_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb.png                            |    0 
 interface/web/themes/default-v2/icons/x16/star__arrow.png                           |    0 
 interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm        |   35 
 interface/web/themes/default-v2/icons/x16/mails_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/eraser_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/home_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_document_music.png            |    0 
 interface/web/themes/default-v2/icons/x16/lock__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/camera__pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/document__pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/receipt.png                               |    0 
 interface/web/themes/default-v2/icons/x16/images_stack.png                          |    0 
 interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm      |   34 
 interface/web/themes/default-v2/templates/admin/remote_user_edit.htm                |   47 
 interface/web/themes/default-v2/icons/x16/equalizer_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/contrast_small.png                        |    0 
 interface/web/themes/default-v2/icons/x16/pill_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/chain_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/pictures_arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/key_disable.png                           |    0 
 interface/web/themes/default-v2/templates/monitor/syslog_list.htm                   |   56 
 interface/web/themes/default-v2/icons/x16/bookmark__arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/media_players_plus.png                    |    0 
 interface/web/themes/default-v2/icons/x16/sort_alphabet.png                         |    0 
 interface/web/themes/default-v2/icons/x16/table_delete_column.png                   |    0 
 interface/web/themes/default-v2/icons/x64/drawer.png                                |    0 
 interface/web/themes/default-v2/icons/x16/arrow_315_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/folder__arrow.png                         |    0 
 interface/web/themes/default-v2/templates/admin/server_edit_config.htm              |   22 
 interface/web/themes/default-v2/icons/x16/layout_3.png                              |    0 
 interface/web/themes/default-v2/icons/x16/images_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x64/client.png                                |    0 
 interface/web/themes/default-v2/icons/x16/documents_stack.png                       |    0 
 interface/web/themes/default-v2/templates/admin/language_export.htm                 |   31 
 interface/web/themes/default-v2/icons/x16/screwdriver_plus.png                      |    0 
 interface/web/themes/default-v2/icons/x16/table.png                                 |    0 
 interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm               |   50 
 interface/web/themes/default-v2/icons/x16/wallet_minus.png                          |    0 
 interface/web/themes/default-v2/templates/dashlets/limits.htm                       |   11 
 interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm        |   36 
 interface/web/themes/default-v2/icons/x16/palette_plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/ticket_small.png                          |    0 
 interface/web/themes/default-v2/icons/x16/shield_disable.png                        |    0 
 interface/web/themes/default-v2/icons/x16/wall_small.png                            |    0 
 interface/web/themes/default-v2/icons/x16/crown__minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/star.png                                  |    0 
 interface/web/themes/default-v2/templates/admin/software_package_list.htm           |   46 
 interface/web/themes/default-v2/icons/x16/receipts_arrow.png                        |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_backup.htm               |   32 
 interface/web/themes/default-v2/icons/x16/crown.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/blog__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/book_small_brown.png                      |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png                 |    0 
 interface/web/themes/default-v2/icons/x16/media_player_small_purple.png             |    0 
 interface/web/themes/default-v2/icons/x16/arrow_skip_180.png                        |    0 
 interface/web/themes/default-v2/icons/x16/book__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/user_red.png                              |    0 
 interface/web/themes/default-v2/icons/x16/equalizer_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/picture_small_sunset.png                  |    0 
 interface/web/themes/default-v2/icons/x16/hammer__minus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/camera__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/exclamation.png                           |    0 
 interface/web/themes/default-v2/icons/x16/key__exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/newspaper_arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/pencil_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x64/system.png                                |    0 
 interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm            |  125 
 interface/web/themes/default-v2/icons/x16/paper_bag.png                             |    0 
 interface/web/themes/default-v2/templates/topnav.tpl.htm                            |    9 
 interface/web/themes/default-v2/icons/x16/films_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/eraser_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/media_player__pencil.png                  |    0 
 interface/web/themes/default-v2/icons/x16/plus_circle_frame.png                     |    0 
 interface/web/themes/default-v2/icons/x16/bookmark__small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/notebook_plus.png                         |    0 
 interface/web/themes/default-v2/icons/x16/tables_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/scripts__pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/playing_card.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/flag_orange.png                      |    0 
 interface/web/themes/default-v2/icons/x16/user_green.png                            |    0 
 interface/web/themes/default-v2/icons/x16/database_small.png                        |    0 
 interface/web/themes/default-v2/icons/x16/folders.png                               |    0 
 interface/web/themes/default-v2/icons/x16/card__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/camera_small.png                          |    0 
 interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm            |   59 
 interface/web/themes/default-v2/icons/x16-list/flag_red.png                         |    0 
 interface/web/themes/default-v2/icons/x16/safe_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/envelope_arrow.png                        |    0 
 interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm         |   26 
 interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png               |    0 
 interface/web/themes/default-v2/icons/x16/databases_exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/star__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/disc.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/user_gray.png                             |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_list.htm                   |   66 
 interface/web/themes/default-v2/templates/admin/server_list.htm                     |   58 
 interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png               |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_document.png                  |    0 
 interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png                 |    0 
 interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm                   |   54 
 interface/web/themes/default-v2/icons/x16/box__pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/minus.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/briefcase_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/sort_quantity.png                         |    0 
 interface/web/themes/default-v2/icons/x16-list/new.png                              |    0 
 interface/web/themes/default-v2/icons/x16/inbox_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/wrench_plus.png                           |    0 
 interface/web/themes/default-v2/templates/admin/software_repo_edit.htm              |   40 
 interface/web/themes/default-v2/icons/x16/playing_card_arrow.png                    |    0 
 interface/web/themes/default-v2/icons/x16/safe_exclamation.png                      |    0 
 interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm            |   64 
 interface/web/themes/default-v2/icons/x16/plus.png                                  |    0 
 interface/web/themes/default-v2/icons/x12/flag_orange.png                           |    0 
 interface/web/themes/default-v2/icons/x16-list/flag_yellow.png                      |    0 
 interface/web/themes/default-v2/icons/x16/exclamation_shield.png                    |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note_small.png                     |    0 
 interface/web/themes/default-v2/icons/x16/lightning__plus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/arrow_315.png                             |    0 
 interface/web/themes/default-v2/icons/x16/blog_blue.png                             |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png                |    0 
 interface/web/themes/default-v2/icons/x16/cross_shield.png                          |    0 
 interface/web/themes/default-v2/icons/x16/hammer_left.png                           |    0 
 interface/web/themes/default-v2/icons/x16/layout_3_mix.png                          |    0 
 interface/web/themes/default-v2/icons/x12/plus.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/feed__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/information.png                           |    0 
 interface/web/themes/default-v2/icons/x16/magnifier__minus.png                      |    0 
 interface/web/themes/default-v2/icons/x16/image_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/documents_text.png                        |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle_double.png                   |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_left.png                        |    0 
 interface/web/themes/default-v2/icons/x16/flag_exclamation.png                      |    0 
 interface/web/themes/default-v2/icons/x16/ticket_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/report_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/wall__arrow.png                           |    0 
 interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm              |   60 
 interface/web/themes/default-v2/icons/x16/databases.png                             |    0 
 interface/web/themes/default-v2/icons/x16/tick_small.png                            |    0 
 interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm                       |   38 
 interface/web/themes/default-v2/icons/x16/switch_arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/binocular_plus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png                    |    0 
 interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png                   |    0 
 interface/web/themes/default-v2/icons/x16/address_book__minus.png                   |    0 
 interface/web/themes/default-v2/icons/x16/heart_break.png                           |    0 
 interface/web/themes/default-v2/templates/admin/groups_list.htm                     |   54 
 interface/web/themes/default-v2/icons/x16/chain_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x12/refresh.png                               |    0 
 interface/web/themes/default-v2/icons/x16/folder_zipper.png                         |    0 
 interface/web/themes/default-v2/icons/x16/calculator_minus.png                      |    0 
 interface/web/themes/default-v2/icons/x16/pipette_arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png                        |    0 
 interface/web/themes/default-v2/icons/x16/wall__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/table__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/documents_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/mail__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/card.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/heart__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/address_book__exclamation.png             |    0 
 interface/web/themes/default-v2/icons/x16/arrow_090_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/equalizer.png                             |    0 
 interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png          |    0 
 interface/web/themes/default-v2/icons/x16/notebook_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/paint_can_minus.png                       |    0 
 interface/web/themes/default-v2/templates/client/resellers_list.htm                 |   63 
 interface/web/themes/default-v2/icons/x12/info.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/clock__pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/folder__plus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/contrast_small_low.png                    |    0 
 interface/web/themes/default-v2/icons/x16/notebooks_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x32/drawer.png                                |    0 
 interface/web/themes/default-v2/icons/x16/broom_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/images_arrow.png                          |    0 
 interface/web/themes/default-v2/templates/sites/web_backup_list.htm                 |   41 
 interface/web/themes/default-v2/icons/x16/photo_album__minus.png                    |    0 
 interface/web/themes/default-v2/icons/x12/flag_blue.png                             |    0 
 interface/web/themes/default-v2/icons/x16/drill_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/vcard_edit.png                            |    0 
 interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm       |   67 
 interface/web/themes/default-v2/icons/x16/lightning__arrow.png                      |    0 
 interface/web/themes/default-v2/icons/x32/client.png                                |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm        |   26 
 interface/web/themes/default-v2/icons/x16/magnifier.png                             |    0 
 interface/web/themes/default-v2/icons/x16/piano_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/documents_plus.png                        |    0 
 interface/web/themes/default-v2/icons/x32/email.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/arrow_270_small.png                       |    0 
 interface/web/themes/default-v2/icons/x64/sites.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/folder_small.png                          |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_image.png                     |    0 
 interface/web/themes/default-v2/icons/x16/box__arrow.png                            |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm        |   49 
 interface/web/themes/default-v2/icons/x16/bandaid.png                               |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_list.htm                 |   59 
 interface/web/themes/default-v2/icons/x16/plug_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/vcard_add.png                             |    0 
 interface/web/themes/default-v2/icons/x16/picture_arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/books.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/crown_bronze.png                          |    0 
 interface/web/themes/default-v2/icons/x12/envelope.png                              |    0 
 interface/web/themes/default-v2/icons/x16/bell.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/document.png                              |    0 
 interface/web/themes/default-v2/icons/x16/envelope.png                              |    0 
 interface/web/themes/default-v2/icons/x12/minus.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/image.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note_text.png                      |    0 
 interface/web/themes/default-v2/icons/x64/domain.png                                |    0 
 interface/web/themes/default-v2/icons/x16/tag__minus.png                            |    0 
 interface/web/themes/default-v2/icons/x12/flag_green.png                            |    0 
 interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm                       |   38 
 interface/web/themes/default-v2/icons/x16/heart_empty.png                           |    0 
 interface/web/themes/default-v2/icons/x16/mail__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/scripts__arrow.png                        |    0 
 interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png                 |    0 
 interface/web/themes/default-v2/icons/x16/film_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/table_insert_column.png                   |    0 
 interface/web/themes/default-v2/icons/x16/chain_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/contrast_low.png                          |    0 
 interface/web/themes/default-v2/icons/x32/domain.png                                |    0 
 interface/web/themes/default-v2/templates/vm/openvz_action.htm                      |   53 
 interface/web/themes/default-v2/icons/x16/piano.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/databases_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note_shred.png                     |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_document_text.png             |    0 
 interface/web/themes/default-v2/icons/x16/arrow_circle_315.png                      |    0 
 interface/web/themes/default-v2/templates/admin/software_update_list.htm            |   49 
 interface/web/themes/default-v2/icons/x16/printer.png                               |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png              |    0 
 interface/web/themes/default-v2/icons/x16-list/star.png                             |    0 
 interface/web/themes/default-v2/icons/x16/cassette_minus.png                        |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm            |   38 
 interface/web/themes/default-v2/icons/x16-list/pencil.png                           |    0 
 interface/web/themes/default-v2/templates/sites/web_domain_edit.htm                 |  227 
 interface/web/themes/default-v2/icons/x16/media_player__minus.png                   |    0 
 interface/web/themes/default-v2/icons/x16/discs_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/briefcase_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/document_music_playlist.png               |    0 
 interface/web/themes/default-v2/icons/x16-list/calendar.png                         |    0 
 interface/web/themes/default-v2/icons/x16/image_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x12/cancel.png                                |    0 
 interface/web/themes/default-v2/icons/x16/disk__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/media_player__exclamation.png             |    0 
 interface/web/themes/default-v2/icons/x16/music_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/color_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png                     |    0 
 interface/web/themes/default-v2/icons/x16/printer__exclamation.png                  |    0 
 interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png   |    0 
 interface/web/themes/default-v2/icons/x16/inbox.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/report.png                                |    0 
 interface/web/themes/default-v2/icons/x16/feed.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/socket_pencil.png                         |    0 
 interface/web/themes/default-v2/icons/x16/pin_arrow.png                             |    0 
 interface/web/themes/default-v2/icons/x16/blogs_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png                 |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png              |    0 
 interface/web/themes/default-v2/icons/x16/bin__plus.png                             |    0 
 interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm          |   25 
 interface/web/themes/default-v2/icons/x16/bandaid_pencil.png                        |    0 
 interface/web/themes/default-v2/icons/x16/tags.png                                  |    0 
 interface/web/themes/default-v2/icons/x16/chain_minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png                 |    0 
 interface/web/themes/default-v2/templates/admin/iptables_list.htm                   |   73 
 interface/web/themes/default-v2/templates/admin/server_ip_list.htm                  |   64 
 interface/web/themes/default-v2/templates/domain/domain_edit.htm                    |   40 
 interface/web/themes/default-v2/icons/x16/calculator_pencil.png                     |    0 
 interface/web/themes/default-v2/icons/x16/trophy_arrow.png                          |    0 
 interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm    |   28 
 interface/web/themes/default-v2/icons/x16/heart_small.png                           |    0 
 interface/web/themes/default-v2/icons/x16/switch_exclamation.png                    |    0 
 interface/web/themes/default-v2/templates/help/support_message_view.htm             |   22 
 interface/web/themes/default-v2/icons/x16/card__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/wand_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x12/double_comment.png                        |    0 
 interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm           |   51 
 interface/web/themes/default-v2/icons/x16/home_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/drill_pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x16/picture_exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/layout_2_equal.png                        |    0 
 interface/web/themes/default-v2/icons/x16/bank_minus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/media_player_black.png                    |    0 
 interface/web/themes/default-v2/icons/x16/contrast__minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/bandaid_minus.png                         |    0 
 interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png                |    0 
 interface/web/themes/default-v2/icons/x16/paint_can.png                             |    0 
 interface/web/themes/default-v2/icons/x16/wall__pencil.png                          |    0 
 interface/web/themes/default-v2/icons/x12/world.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/balloons.png                              |    0 
 interface/web/themes/default-v2/icons/x16/table__exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/documents_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x64/email.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/home_pencil.png                           |    0 
 interface/web/themes/default-v2/icons/x16/flag_arrow.png                            |    0 
 interface/web/themes/default-v2/icons/x16/color_plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/hammer.png                                |    0 
 interface/web/themes/default-v2/templates/dns/dns_slave_list.htm                    |   59 
 interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png                    |    0 
 interface/web/themes/default-v2/icons/x16/door_plus.png                             |    0 
 interface/web/themes/default-v2/icons/x16/puzzle__pencil.png                        |    0 
 interface/web/themes/default-v2/templates/listpage.tpl.htm                          |    1 
 interface/web/themes/default-v2/icons/x16/balloon__plus.png                         |    0 
 interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm      |   37 
 interface/web/themes/default-v2/icons/x12/magnify.png                               |    0 
 interface/web/themes/default-v2/templates/admin/groups_edit.htm                     |   26 
 interface/web/themes/default-v2/icons/x16/arrow_270.png                             |    0 
 interface/web/themes/default-v2/icons/x16/camera__arrow.png                         |    0 
 interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png              |    0 
 interface/web/themes/default-v2/icons/x16/magnifier__pencil.png                     |    0 
 interface/web/themes/default-v2/templates/dashboard/dashboard.htm                   |   39 
 interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm          |   66 
 interface/web/themes/default-v2/templates/sites/ftp_user_list.htm                   |   62 
 interface/web/themes/default-v2/templates/client/client_edit_limits.htm             |  230 
 interface/web/themes/default-v2/icons/x64/tools.png                                 |    0 
 interface/web/themes/default-v2/icons/x16/sort__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/book_brown.png                            |    0 
 interface/web/themes/default-v2/icons/x16/trophy_exclamation.png                    |    0 
 interface/web/themes/default-v2/icons/x16/media_player_medium_green.png             |    0 
 interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png                      |    0 
 interface/web/themes/default-v2/icons/x16/bin__arrow.png                            |    0 
 interface/web/themes/default-v2/templates/help/support_message_edit.htm             |   33 
 interface/web/themes/default-v2/icons/x16/disk__exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/star_small.png                            |    0 
 interface/web/themes/default-v2/templates/sites/database_admin_list.htm             |   68 
 interface/web/themes/default-v2/icons/x64/dns.png                                   |    0 
 interface/web/themes/default-v2/icons/x16-list/upload.png                           |    0 
 interface/web/themes/default-v2/icons/x16/lock_unlock.png                           |    0 
 interface/web/themes/default-v2/icons/x16/user_suit.png                             |    0 
 interface/web/themes/default-v2/icons/x32/system.png                                |    0 
 interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm      |  110 
 interface/web/themes/default-v2/icons/x16/clock__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16/document_text_image.png                   |    0 
 interface/web/themes/default-v2/icons/x16/eraser.png                                |    0 
 interface/web/themes/default-v2/icons/x16/slash.png                                 |    0 
 interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png          |    0 
 interface/web/themes/default-v2/icons/x16/notebooks_pencil.png                      |    0 
 interface/web/themes/default-v2/icons/x16/balloons_pencil.png                       |    0 
 interface/web/themes/default-v2/icons/x16/gear__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/mail_open.png                             |    0 
 interface/web/themes/default-v2/icons/x16/hammer__pencil.png                        |    0 
 interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm        |   38 
 interface/web/themes/default-v2/icons/x16/socket_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/user_delete.png                           |    0 
 interface/web/themes/default-v2/icons/x16/color_arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x12/pictures.png                              |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png              |    0 
 interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/microphone_pencil.png                     |    0 
 interface/web/themes/default-v2/icons/x16/clipboard_text.png                        |    0 
 interface/web/themes/default-v2/icons/x16/cross_circle.png                          |    0 
 interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm              |   56 
 interface/web/themes/default-v2/icons/x16/folder_open.png                           |    0 
 interface/web/themes/default-v2/icons/x16/arrow_stop_090.png                        |    0 
 interface/web/themes/default-v2/icons/x16/cassette.png                              |    0 
 interface/web/themes/default-v2/icons/x16/question_frame.png                        |    0 
 interface/web/themes/default-v2/icons/x16/table_delete.png                          |    0 
 interface/web/themes/default-v2/icons/x64/login.png                                 |    0 
 interface/web/themes/default-v2/images/meter_bg.gif                                 |    0 
 interface/web/themes/default-v2/icons/x16/sort__arrow.png                           |    0 
 interface/web/themes/default-v2/icons/x16/document_zipper.png                       |    0 
 interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm            |   55 
 interface/web/themes/default-v2/icons/x16-list/security_orange.png                  |    0 
 interface/web/themes/default-v2/icons/x16/blog__plus.png                            |    0 
 interface/web/themes/default-v2/icons/x16/databases_minus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/notebooks.png                             |    0 
 interface/web/themes/default-v2/icons/x16/card__minus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/funnel_plus.png                           |    0 
 interface/web/themes/default-v2/icons/x16/pencil.png                                |    0 
 interface/web/themes/default-v2/icons/x16-list/printer.png                          |    0 
 interface/web/themes/default-v2/templates/error.tpl.htm                             |    8 
 interface/web/themes/default-v2/icons/x16/microphone_plus.png                       |    0 
 interface/web/themes/default-v2/icons/x16/calendar__arrow.png                       |    0 
 interface/web/themes/default-v2/icons/x16/lightning_small.png                       |    0 
 interface/web/themes/default-v2/icons/x16/calculator_exclamation.png                |    0 
 interface/web/themes/default-v2/icons/x16/music_exclamation.png                     |    0 
 interface/web/themes/default-v2/icons/x16/folder__exclamation.png                   |    0 
 interface/web/themes/default-v2/icons/x16/information_shield.png                    |    0 
 interface/web/themes/default-v2/icons/x16/books_brown.png                           |    0 
 interface/web/themes/default-v2/icons/x16/shield__arrow.png                         |    0 
 interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png               |    0 
 interface/web/themes/default-v2/icons/x12/security_green.png                        |    0 
 interface/web/themes/default-v2/icons/x32/server.png                                |    0 
 interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png                   |    0 
 interface/web/themes/default-v2/icons/x16/media_players_minus.png                   |    0 
 interface/web/themes/default-v2/icons/x16/funnel_minus.png                          |    0 
 interface/web/themes/default-v2/icons/x16/heart__plus.png                           |    0 
 interface/web/themes/default-v2/icons/x12/lock.png                                  |    0 
 interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm     |   44 
 interface/web/themes/default-v2/icons/x16/ruler__arrow.png                          |    0 
 interface/web/themes/default-v2/icons/x16-list/code.png                             |    0 
 1,390 files changed, 14,896 insertions(+), 0 deletions(-)

diff --git a/interface/web/themes/default-v2/CHANGELOG b/interface/web/themes/default-v2/CHANGELOG
new file mode 100644
index 0000000..b9e98be
--- /dev/null
+++ b/interface/web/themes/default-v2/CHANGELOG
@@ -0,0 +1,20 @@
+CHANGELOG
+default -> default-v2
+source: default $3241 07/06/2012 @ 12:00 UTC+2
+
+- rm yaml/*
+- rm css/patches/*
+- cp yaml/patches/iehacks.css css/*
+- rm <!--[if lte ie 6]> from templates/main.tpl.htm
+- rm IE6 support from css/iehacks.css
+- mv css/nav/* into css/style.css
+- mv css/print/* into css/print.css
+- add css/print.css to templates/main.tpl.htm
+- rm css/print/*
+- rm css/nav/*
+- rm css projection-type support
+- mv css/screen/redmond/* css/*
+- rm css/screen/*
+- mv css media-recognition from css-files to <head>-link tag
+- change most div-containers to new html5 tags in main.tpl.htm
+- 
diff --git a/interface/web/themes/default-v2/css/iehacks.css b/interface/web/themes/default-v2/css/iehacks.css
new file mode 100644
index 0000000..a6048da
--- /dev/null
+++ b/interface/web/themes/default-v2/css/iehacks.css
@@ -0,0 +1,184 @@
+@charset "UTF-8";
+/**
+ * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
+ *
+ * (en) YAML core stylesheet - structure-independent bugfixes of IE/Win CSS-bugs
+ * (de) YAML Basis-Stylesheet - Strukturunabhängige Bugfixes von CSS-Bugs des IE/Win
+ *
+ * Don't make any changes in this file!
+ * Your changes should be added to a separate patch-file.
+ *
+ * @copyright       Copyright 2005-2008, Dirk Jesse
+ * @license         CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
+ *                  YAML-C (http://www.yaml.de/en/license/license-conditions.html)
+ * @link            http://www.yaml.de
+ * @package         yaml
+ * @version         3.0.6
+ * @revision        $Revision: 202 $
+ * @lastmodified    $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
+ * @appdef yaml
+ */
+
+@media all
+{
+  /**
+   * (en) Debugging: When you see a green background, IE is getting this stylesheet
+   * (de) Fehlersuche: Hintergrund leuchtet grün, wenn das Stylesheet korrekt geladen wurde
+   *
+   * @debug
+   * @app-yaml-default disabled
+   */
+
+  /* body { background: #0f0; background-image: none; }  */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Forcing vertical scrollbars is not needed in IE (only for Firefox/Netscape/Safari)
+   * (de) Erzwingen vertikaler Scrollbalken im IE nicht benötigt (nur im Firefox/Netscape/Safari)
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  html { height: auto; margin-bottom:0; }
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+   /**
+   * (en) Stability fixes with 'position:relative' 
+   * (de) Stabilitätsverbesserungen durch 'position:relative'
+   *
+   * @bugfix
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  body { position:relative; }  /* Essential in IE7 for correct layout scaling ... */
+  * html body { position:static; }  /* ... but not for IE5.x and IE6 */
+  #main { position: relative; } /* helpful for several problems in older IE versions*/
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Clearfix Method for containing floats in IE
+   * (de) Clearfix-Anpassung für diverse IE-Versionen
+   *
+   * @workaround
+   * @see        http://www.456bereastreet.com/archive/200603/new_clearing_method_needed_for_ie7/#comment28
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+
+  .clearfix { display: inline-block; }  /* ... especial for IE7 */
+  .clearfix { display: block; }      /* ... für IE5,IE6,IE7 */
+  * html .clearfix { height: 1%; }   /* ... für IE5 + IE6/Win | hasLayout aktivieren */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Preventing several css bugs by forcing "hasLayout"
+   * (de) Vermeidung verschiedenster Bugs durch Erzwingen von "hasLayout"
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      no
+   */
+   
+  body { height: 1%; }
+  #page_margins, #page, #header, #nav, #main, #footer { zoom:1; }             /* IE6 & IE7    */
+  #page_margins, #page { height: 1%; }                                        /* IE 5.x       */
+  * html #header, * html #nav, * html #main, * html #footer { width: 100%; }  /* IE 5.x & IE6 */
+  * html #header, * html #nav, * html #main, * html #footer { wid\th: auto; } /* IE 6         */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * List-Numbering Bug
+   *
+   * @bugfix
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+  body ol li { display:list-item; }
+  
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Workaround for 'collapsing margin at #col3' when using CSS-property clear
+   *      Left margin of #col3 collapses when using clear:both in 1-3-2 (or 2-3-1) layout and right column is the
+   *      longest and left column is the shortest one. For IE6 and IE7 a special workaround was developed
+   *      in YAML.
+   *
+   * (de) Workaround für 'kollabierenden Margin an #col3' bei Verwendung der CSS-Eigenschaft clear
+   *      Der linke Margin von #col3 kollabiert bei der Verwendung von clear:both im 1-3-2 (oder 2-3-1) Layout
+   *      wenn gleichzeitig die rechte Spalte die kürzeste und die rechte die Längste ist. Im IE6 und IE7 lässt
+   *      sich der Bug durch eine speziell für YAML entwickelten Workaround umgehen.
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      no
+   */
+
+  #ie_clearing {
+    /* (en) Only a small help for debugging */
+    /* (de) Nur eine kleine Hilfe zur Fehlersuche */
+    position:static;
+
+    /* (en) Make container visible in IE */
+    /* (de) Container sichtbar machen im IE */
+    display:block;
+
+    /* (en) No fix possible in IE5.x, normal clearing used instead */
+    /* (de) Kein Fix im IE5.x möglich, daher normales Clearing */
+    \clear:both;
+
+    /* (en) forcing clearing-like behavior with a simple oversized container in IE6 & IE7*/
+    /* (de) IE-Clearing mit 100%-DIV für IE6 bzw. übergroßem Container im IE7 */
+    width: 100%;
+    font-size:0px;
+    margin: -2px 0 -1em 1px;
+  }
+
+  * html #ie_clearing { margin: -2px 0 -1em 0; }
+  #col3_content {margin-bottom:-2px; }
+
+  /* (en) avoid horizontal scrollbars in IE7 in borderless layouts because of negative margins */
+  /* (de) Vermeidung horizontaler Scrollbalken bei randabfallenden Layouts im IE7 */
+  html { margin-right: 1px; }
+  * html { margin-right: 0 }
+
+
+  /* (en) Bugfix: Essential for IE7 */
+  /* (de) Bugfix: Notwendig im IE7 */
+  #col3 { position:relative; z-index: -1; }
+
+  /*------------------------------------------------------------------------------------------------------*/
+}
+
+@media screen, projection
+{
+  }
+
+@media print
+{
+  /**
+   * (en) Avoid unneeded page breaks of #col3 content in print layout.
+   * (de) Vermeiden von unnötigen Seitenumbrüchen beim Ausdruck der Spalte #col3.
+   *
+   * @bugfix
+   * @affected   IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  #col3 { height: 1%; }
+}
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000..5b5dab2
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png b/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png
new file mode 100644
index 0000000..47acaad
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png
new file mode 100644
index 0000000..9fb564f
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png
new file mode 100644
index 0000000..0149515
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 0000000..4443fdc
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
new file mode 100644
index 0000000..81ecc36
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
new file mode 100644
index 0000000..4f3faf8
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
new file mode 100644
index 0000000..38c3833
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png
new file mode 100644
index 0000000..6f4bd87
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000..09d1cdc
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png
new file mode 100644
index 0000000..bd2cf07
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png
new file mode 100644
index 0000000..9f3eafa
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000..2ab019b
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png
new file mode 100644
index 0000000..ad2dc6f
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png
new file mode 100644
index 0000000..c7c53cb
--- /dev/null
+++ b/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png
Binary files differ
diff --git a/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css
new file mode 100644
index 0000000..88353fe
--- /dev/null
+++ b/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css
@@ -0,0 +1,444 @@
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=0px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=0px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/css/print.css b/interface/web/themes/default-v2/css/print.css
new file mode 100644
index 0000000..ede8d4a
--- /dev/null
+++ b/interface/web/themes/default-v2/css/print.css
@@ -0,0 +1,112 @@
+@charset "UTF-8";
+/* 
+    Document   : print.css
+    Created on : 06.07.2012, 12:21:59
+    Author     : Christian Foellmann (foe-services.de)
+    Description:
+        Basis was css-code from the "ISPConfig 3: default theme" which was based on
+        "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework 3.0.6
+        by Copyright 2005-2008, Dirk Jesse (http://www.yaml.de)
+*/
+
+#col1, #col1_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; }
+
+#col2 { display:none; }
+#col3 { display:none; }
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section layout preparation
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/* (en) Preparing base layout for print */
+/* (de) Basislayout für Druck aufbereiten */
+body, #page_margins, #page, #main { margin:0; padding: 0; border: 0; }
+#page_margins, #page { width: 100% !important; min-width:0; max-width: none; }
+#header { height: auto; }
+
+/* (en) Hide unneeded container of the screenlayout in print layout */
+/* (de) Für den Druck nicht benötigte Container des Layouts abschalten */
+#topnav, #nav, #search, #footer { display: none; }
+
+/* (en) Linearising subtemplates */
+/* (de) Linearisierung der Subtemplates */
+.c25l, .c33l, .c38l, .c50l, .c62l, .c66l, .c75l,
+.c25r, .c33r, .c38r, .c50r, .c62r, .c66r, .c75r {
+    width: 100%; margin:0; float:none; overflow:visible; display:table;
+}
+.subc, .subcl, .subcr  { margin: 0; padding: 0; }
+
+/* (en) make .print class visible */
+/* (de) .print-Klasse sichtbar schalten */
+.print { position: static; top: 0; left: 0; height: auto; width: auto; }
+
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section content preparation
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/* (en) Change font to serif */
+/* (de) Zeichensatz auf Serifen umstellen */
+body * { font-family: "Times New Roman", Times, serif; }
+code, pre { font-family:"Courier New", Courier, mono; }
+body { font-size: 12pt; }
+
+/* (en) Avoid page breaks right after headings */
+/* (de) Vermeidung von Seitenumbrüchen direkt nach einer Überschrift */
+h1,h2,h3,h4,h5,h6 { page-break-after:avoid; }
+
+/* (en) Format acronyms and abbreviations for print*/
+/* (de) Auszeichnung von Abkürzungen */
+abbr[title]:after, 
+acronym[title]:after { content: '(' attr(title) ')'; }
+
+/* (en) Disable background graphics of links  */
+/* (de) Abschalten evlt. vorhandener Hintergrundgrafiken zur Linkkennzeichnung */
+#page a[href^="http:"], 
+#page a[href^="https:"] { padding-left: 0; background-image: none; }
+
+/* (en) Enable URL output in print layout */
+/* (de) Sichtbare Auszeichnung der URLs von Links */
+a[href]:after {
+    content:" <URL: "attr(href)">";
+    color:#444;
+    background:inherit;
+    font-style:italic;
+}
+
+/* (en) Preparation for optional column labels */
+/* (de) Vorbereitung für optionale Spaltenauszeichnung */
+#col1_content:before, #col2_content:before, #col3_content:before {
+    content: "";
+    color:#888;
+    background:inherit;
+    display:block;
+    font-weight:bold;
+    font-size:1.5em;
+}
+
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section browser fixes for print layouts
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/**
+ * (en) overflow:hidden Bug in print layouts
+ * (de) overflow:hidden Bug in Drucklayouts
+ *
+ * @bugfix
+ * @since     3.0
+ * @affected  FF2.0, IE7
+ * @css-for   all browsers
+ * @valid     yes
+*/
+
+.floatbox,
+.subcolumns, 
+.subcolums_oldgecko { overflow:visible; display: table; }
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default-v2/css/styles.css
new file mode 100644
index 0000000..cdb19ac
--- /dev/null
+++ b/interface/web/themes/default-v2/css/styles.css
@@ -0,0 +1,1830 @@
+@charset "UTF-8";
+/* 
+    Document   : styles.css
+    Created on : 06.07.2012, 12:21:59
+    Author     : Christian Foellmann (foe-services.de)
+    Description:
+        Basis was css-code from the "ISPConfig 3: default theme" which was based on
+        "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework 3.0.6
+        by Copyright 2005-2008, Dirk Jesse (http://www.yaml.de)
+*/
+
+/* overall
+-------------------------------------------------------------- */
+* {
+    margin: 0;
+    padding: 0;
+}
+header, #nav, #main, footer {
+    clear: both;
+}
+ul, ol, dl {
+    margin: 0 0 1em 1em;
+}
+.skip, .hideme, .print {
+    height: 1px;
+    left: -1000em;
+    position: absolute;
+    top: -1000em;
+    width: 1px;
+}
+
+/* header
+-------------------------------------------------------------- */
+header {
+    position: relative;
+    color: #faf0e6;
+    padding: 15px 2em 5px 20px;
+    background: #9a9a9a url(../images/header_bg.png) repeat-x top left;
+}
+header h1 {
+    font-size:2.5em;
+    letter-spacing:-2px;
+    line-height:65%;
+    color: silver;
+}
+header span {
+    color: #333333;
+}
+
+/* header/topsubnav
+-------------------------------------------------------------- */
+#topsubnav {
+    position:absolute;
+    top: 10px;
+    right: 10px;
+    text-align: right;
+}
+#topsubnav a { color: #f0f8ff; font-weight: normal; background:transparent; text-decoration:none; }
+#topsubnav a:focus, 
+#topsubnav a:hover,
+#topsubnav a:active { text-decoration:underline; background-color: transparent;}
+
+/* nav
+    TODO: sprite image
+-------------------------------------------------------------- */
+#topNav ul {
+    list-style: none;
+    padding: 0 0 0 20px;
+    margin: 0;
+    background: #9a9a9a
+}
+
+#topNav ul li {
+    display: inline;
+    margin: 0 2px 0 0;
+}
+
+#topNav a {
+    background-color: #D3D3D3;
+    background-position: center 5px;
+    background-repeat: no-repeat;
+    color:black;
+    display:inline-block;
+    height:20px;
+    padding-top:37px;
+    text-align:center;
+    text-decoration:none;
+    width:78px;
+}
+
+#topNav a:hover {
+    background-color: #eeeeee;
+    color: #000000;
+}
+
+#topNav #topNav_current {
+}
+
+#topNav #topNav_current a {
+    font-weight: bold;
+    color: black;
+    background-color: #ffffff;
+}
+
+.topnav-admin {
+    background-image: url('../icons/x32/system.png') !important;
+}
+
+.topnav-client {
+    background-image: url('../icons/x32/client.png') !important;
+}
+
+.topnav-mail {
+    background-image: url('../icons/x32/email.png') !important;
+}
+
+.topnav-mailuser {
+    background-image: url('../icons/x32/email.png') !important;
+}
+
+.topnav-monitor {
+    background-image: url('../icons/x32/monitor.png') !important;
+}
+
+.topnav-sites {
+    background-image: url('../icons/x32/sites.png') !important;
+}
+
+.topnav-dns {
+    background-image: url('../icons/x32/dns.png') !important;
+}
+
+.topnav-tools {
+    background-image: url('../icons/x32/tools.png') !important;
+}
+
+.topnav-help {
+    background-image: url('../icons/x32/help.png') !important;
+}
+
+.topnav- {
+    background-image: url('../icons/x32/login.png') !important;
+}
+
+.topnav-domain {
+    background-image: url('../icons/x32/domain.png') !important;
+}
+
+.topnav-dashboard {
+    background-image: url('../icons/x32/dashboard.png') !important;
+}
+
+.topnav-vm{
+    background-image: url('../icons/x32/drawer.png') !important;
+}
+
+.topnav-billing{
+    background-image: url('../icons/x32/calculator.png') !important;
+}
+
+/* main
+-------------------------------------------------------------- */
+#main { 
+    background: #fff;
+    padding: 1em 0;
+}
+
+/* main/sideNav + submenu
+-------------------------------------------------------------- */
+#sideNav { width: 200px; 
+           float:left;
+           padding: 0 10px 0 0; 
+}
+
+#submenu {
+    width: 100%;
+    overflow: hidden;
+    margin: 0px;
+    list-style-type: none;
+    border-bottom: 2px #ddd solid;
+}
+
+#submenu ul { list-style-type: none; margin:0; padding: 0; }
+#submenu li { float:left; width: 100%; margin:0; padding: 0; font-size:0.9em; }
+
+#submenu a,
+#submenu strong {
+    display:block;
+    width: 90%;
+    padding: 2px 0px 2px 10%;
+    text-decoration: none;
+    background-color:#fff;
+    color: #444;
+    border-bottom: 1px #eee solid;
+}
+
+/* Menu Title */
+#submenu li.title {
+    width: 100%;
+    padding: 0px;
+    font-weight: bold;
+    color: #444;
+    background-color: #fff;
+    border-top: 2px #888 solid;
+    font-size: 1.1em;
+}
+
+#submenu li.title a {
+    background-color: #f0f8ff;
+    color: #444;
+}
+#submenu li.title a:hover {
+    color: white;
+}
+
+#submenu li span {
+    display:block;
+    width: 90%;
+    padding: 3px 0px 3px 10%;
+    font-weight: bold;
+    border-bottom: 1px #ddd solid;
+}
+
+/* Level 1 */
+#submenu li.active,
+#submenu li strong {
+    width: 90%;
+    padding: 3px 0px 3px 10%;
+    font-weight: bold;
+    color: #fff;
+    background-color:#aab;
+    border-bottom: 1px #eee solid;
+}
+
+#submenu li a { width: 90%; padding-left: 10%; background-color:#fff; color: #444; }
+#submenu li a:focus,
+#submenu li a:hover,
+#submenu li a:active { background-color:#f63; color: #fff; }
+
+/* Form-Elements in the Menu*/
+#submenu * select#server_id {
+    margin: 3px 10%;
+    padding: 1px;
+    width: 80%;
+}
+
+/* main/content
+-------------------------------------------------------------- */
+#content { 
+    margin-left: 200px; 
+    margin-right: 0;
+    padding: 0px 10px 10px 20px;
+    border-left: 1px #ddd solid;
+}
+
+/* footer
+-------------------------------------------------------------- */
+
+footer { 
+    color:#666; 
+    background: #f9f9f9;
+    padding: 10px 20px;
+    border-top: 5px #efefef solid;
+    font-size: 0.8em;
+    text-align: center;
+}
+footer a { color: #999; background:transparent; font-weight: bold;}
+footer a:hover, footer a:active {
+    color: #4D87C7; 
+    background-color: transparent; 
+    text-decoration:underline;
+}
+
+
+
+
+/* basemod
+-------------------------------------------------------------- */
+
+/**
+* (en) Formatting YAML's  basic layout elements
+* (de) Gestaltung des YAML Basis-Layouts
+*/
+
+/* (en) Marginal areas & page background */
+/* (de) Randbereiche & Seitenhintergrund */
+body { background: #EEEEEE url("../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
+
+/* (en) Centering layout in old IE-versions */
+/* (de) Zentrierung des Layouts in alten IE-versionen */
+body { text-align: center; }
+#page { text-align:left; margin: 0 auto; }
+
+/* (en) Layout: width, background, borders */
+/* (de) Layout: Breite, Hintergrund, Rahmen */
+/*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/
+/* #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}*/
+
+/*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers,
+This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the 
+display: table; attribute correctly*/
+#page { min-width: 980px; max-width: 80%; background: #fff;}
+/*#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}*/
+
+#page{ padding: 10px; }
+
+
+
+
+/* content
+-------------------------------------------------------------- */
+
+/**
+    * Fonts
+    * (en) font-family and font-size selection for headings and standard text elements
+    * (de) Zeichensatz und Schriftgrößen für Überschriften und übliche Text-Elemente
+    *
+    * @section content-fonts
+*/
+
+/* (en) reset font size for all elements to standard (16 Pixel) */
+/* (de) Alle Schriftgrößen auf Standardgröße (16 Pixel) zurücksetzen */
+html * { font-size: 100.01% }
+
+/* (en) reset monospaced elements to font size 16px in Gecko browsers */
+/* (de) Schriftgröße von monospaced Elemente auf 16 Pixel setzen */
+textarea, pre, tt, code {
+    font-family: Consolas,"Lucida Console","Courier New",monospace;
+    font-size: 0.9em;	
+}
+
+/* (en) base layout gets standard font size 12px */
+/* (de) Basis-Layout erhält Standardschriftgröße von 12 Pixeln */
+body {
+    font-family: 'Trebuchet MS', sans-serif;
+    font-size: 75.00%; 
+    color: #444;  
+}
+
+h1,h2,h3,h4,h5,h6 { 
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight:bold; 
+    color:#666;
+    margin: 0 0 0.25em 0; 
+}
+
+h1 { font-size: 200% }                        /* 24px */
+h2 { font-size: 200% }          /* 24px */
+h3 { font-size: 150% }                        /* 18px */
+h4 { font-size: 133.33% }                     /* 16px */
+h5 { font-size: 116.67% }                     /* 14px */
+h6 { font-size: 116.67%; font-style:italic }  /* 14px */
+
+
+
+p { line-height: 1.5em; margin: 0 0 1em 0; }
+
+/* ### Lists | Listen  #### */
+
+ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em }
+li { margin-left: 1.5em; line-height: 1.5em }
+
+dt { font-weight: bold }
+dd { margin: 0 0 1em 2em }
+
+/* ### text formatting | Textauszeichnung ### */
+
+cite, blockquote { font-style:italic }
+blockquote { margin: 0 0 1em 1.5em }
+
+strong,b { font-weight: bold }
+em,i { font-style:italic }
+
+pre, code { font-family: monospace; font-size: 1.1em; }
+
+acronym, abbr {
+    letter-spacing: .07em;
+    border-bottom: .1em dashed #c00;
+    cursor: help;
+}
+
+/* Set a background-color, no system backgorund used anymore */
+select, input, textarea {
+    background: #FFFFFF;
+    border: 1px solid #DFDFDF;
+    padding: 1px;
+    outline:none;
+}
+
+
+/**
+ * Generic Content Classes
+ * (en) standard classes for positioning and highlighting
+ * (de) Standardklassen zur Positionierung und Hervorhebung
+ *
+ * @section content-generic-classes
+*/
+
+.note {background: #dfd; padding: 1em; border-top: 1px #bdb dotted; border-bottom: 1px #bdb dotted;}
+.important {background: #ffd; padding: 1em; border-top: 1px #ddb dotted; border-bottom: 1px #ddb dotted;}
+.warning {background: #fdd; padding: 1em; border-top: 1px #dbb dotted; border-bottom: 1px #dbb dotted;}
+
+.float_left { float: left; display:inline; margin-right: 1em; margin-bottom: 0.15em;  }
+.float_right { float: right; display:inline; margin-left: 1em; margin-bottom: 0.15em;  }
+.center { text-align:center; margin: 0.5em auto }
+
+/**
+ * External Links
+ *
+ * (en) Formatting of hyperlinks
+ * (de) Gestaltung von Hyperlinks
+ *
+*/
+
+a {color: #4D87C7; text-decoration:none;}
+a:focus,
+a:hover,
+a:active {color:#182E7A; text-decoration:underline;}
+
+
+
+
+
+/**
+ * (en) Emphasizing external Hyperlinks via CSS
+ * (de) Hervorhebung externer Hyperlinks mit CSS
+ *
+ * @section             content-external-links
+ * @app-yaml-default    disabled
+*/
+
+/*
+#main a[href^="http://www.my-domain.com"],
+#main a[href^="https://www.my-domain.com"]
+{
+  padding-left: 12px;
+  background-image: url('your_image.gif');
+  background-repeat: no-repeat;
+  background-position: 0 0.45em;
+}
+*/
+
+/**
+ * Tables | Tabellen
+ * (en) Generic classes for table-width and design definition
+ * (de) Generische Klassen für die Tabellenbreite und Gestaltungsvorschriften für Tabellen
+ *
+ * @section content-tables
+*/
+
+table { width: auto; border-collapse:collapse; margin-bottom: 0.5em; }
+table.full { width: 100%; }
+table.fixed { table-layout:fixed }
+
+table.list td{max-width:350px;min-width: 32px;white-space: nowrap;overflow:hidden;text-overflow: ellipsis; -o-text-overflow: ellipsis; -icab-text-overflow: ellipsis; -khtml-text-overflow: ellipsis; -moz-text-overflow: ellipsis; -webkit-text-overflow: ellipsis;}
+th,td { padding: 0.5em;text-align:left;}
+thead th { background: #444 url(../images/lists_thead_bg.png) repeat-x; color: #fff }
+tbody th { background: #ccc; color: #333 }
+tbody th.sub { background: #ddd; color: #333 }
+
+/**
+ * Miscellaneous | Sonstiges
+ *
+ * @section content-misc
+*/
+
+hr {
+    color: #fff;
+    background:transparent;
+    margin: 0 0 0.5em 0;
+    padding: 0 0 0.5em 0;
+    border:0;
+    border-bottom: 1px #eee solid;
+}
+
+/* Sorting cusror and backgorund */
+.pnl_listarea th[class^="tbl_col"]{cursor:pointer}
+.pnl_listarea th[class^="tbl_col"]:hover{background-position:0 -15px!important}
+
+/* content_ispc
+-------------------------------------------------------------- */
+
+.pageForm_description {
+    font-size: 12px;
+}
+
+/* Tab-Box */
+.tabbox_tabs {
+    border-bottom: 1px solid #d3d3d3;
+}
+.tabbox_tabs ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+.tabbox_tabs li {
+    display: inline;
+    margin: 0 2px 0 0;
+}
+.tabbox_tabs a {
+    padding: 0 1em;
+    text-decoration: none;
+    color: black;
+    background: #d3d3d3;
+    border: 1px solid #d3d3d3;
+}
+.tabbox_tabs a:hover {
+    background: #fc0;
+    color: #540;
+}
+.tabbox_tabs .active a {
+    font-weight: bold;
+    color: #ff6600;
+    background: #ffffff;
+}
+
+.pnl_toolsarea fieldset, .pnl_listarea fieldset, .pnl_formsarea fieldset {
+    border-top: 1px solid #949494;
+    margin: 20px 0;
+}
+.pnl_toolsarea fieldset legend , .pnl_listarea fieldset legend {
+    font-weight: bold;
+    color: #6299c5;
+}
+.pnl_formarea fieldset {
+    font-weight: bold;
+}
+
+/* hide line and legend when inside tabbed content */
+#tabbox_content * .pnl_toolsarea fieldset, #tabbox_content * .pnl_listarea fieldset, #tabbox_content * .pnl_formsarea fieldset { border: none !important; }
+#tabbox_content * .pnl_toolsarea fieldset legend, #tabbox_content * .pnl_listarea fieldset legend, #tabbox_content * .pnl_formsarea fieldset legend { display: none !important; }
+
+.codeview {
+    margin:20px 0;
+    padding:2px;
+    border: 1px solid #ffcc00;
+    background: #fffaea;
+    font-family: Consolas, "Lucida Console", "Courier New", monospace;
+    font-size: 0.9em;
+}
+
+/* Lists */
+table.list {
+    width: 100%;
+    border: 1px solid #d3d3d3 !important;
+}
+table.list thead th { font-size: 10px; }
+table.list tbody { border: 1px solid #d3d3d3 !important; }
+table.list tfoot td { text-align: center;  background: #f8f8f8 url(../images/lists_tfoot_bg.png) repeat-x bottom left;  padding: 24px 8px 8px 8px; }
+table.list .tbl_row_even { background: #fcfcfc; }
+table.list .tbl_row_uneven { background: #f0f8ff; }
+table.list tr:hover { background: #fffacd; }
+table.list td { word-wrap:break-word;white-space:pre-wrap; }
+table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
+
+/* Password Strength */
+#passBar {
+    width: 101px; height: 10px;
+    background: url(../images/meter_bg.gif) repeat-x bottom left;
+    margin: 2px 0;
+    float: left;
+}
+#passText {
+    padding: 0;
+    float: left;
+}
+
+/* Systemmonitor */
+.systemmonitor-state {
+    margin: 10px 5px;
+    font-family: Consolas, "Lucida Console", "Courier New", monospace;
+    font-size: 0.9em;
+    float: left;
+    width: 100%;
+}
+.systemmonitor-state.state-no_state {
+    border-top: 4px solid #95A19F;
+    background-color: #f8f8ff;
+}
+.systemmonitor-state.state-unknown {
+    border-top: 4px solid #30302e;
+    background-color: #cecfc5;
+}
+.systemmonitor-state.state-ok {
+    border-top: 4px solid #23fb00;
+    background-color: #adffa2;
+}
+.systemmonitor-state.state-info {
+    border-top: 4px solid #183e99;
+    background-color: #d4e2ff;
+}
+.systemmonitor-state.state-warning {
+    border-top: 4px solid #ffa800;
+    background-color: #ffda93;
+}
+.systemmonitor-state.state-critical {
+    border-top: 4px solid #ff0000;
+    background-color: #ffb9b9;
+}
+.systemmonitor-state.state-error {
+    border-top: 4px solid #ff0000;
+    background-color: #ff7f7f;
+}
+.systemmonitor-state.state-no_state-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #95A19F;
+    background-color: #f8f8ff;
+}
+.systemmonitor-state.state-unknown-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #30302e;
+    background-color: #cecfc5;
+}
+.systemmonitor-state.state-ok-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #23fb00;
+    background-color: #adffa2;
+}
+.systemmonitor-state.state-info-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #183e99;
+    background-color: #d4e2ff;
+}
+.systemmonitor-state.state-warning-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ffa800;
+    background-color: #ffda93;
+}
+.systemmonitor-state.state-critical-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ff0000;
+    background-color: #ffb9b9;
+}
+.systemmonitor-state.state-error-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ff0000;
+    background-color: #ff7f7f;
+}
+.systemmonitor-state:hover {
+    background-color: #FFFACD;
+}
+.systemmonitor-state p {
+    float:left;
+    margin: 5px;
+}
+.systemmonitor-device {
+    background-position: -6px 4px;
+    background-repeat: no-repeat;
+    min-height: 80px;
+}
+.systemmonitor-device.device-system { background-image: url("../icons/x64/network.png"); }
+.systemmonitor-device.device-server { 
+    background-image: url("../icons/x64/server.png");
+}
+.systemmonitor-device.device-ve {
+    background-image: url("../icons/x64/server.png");
+    width: 213px;
+    float: left;
+    border: 1px dashed #aaaaaa;
+    border-top: none;
+}
+
+.systemmonitor-content.icons32 {
+    padding:2px 10px 2px 56px;
+    background-repeat: no-repeat;
+    background-position: 12px 4px;
+}
+.systemmonitor-content.icons32.ico-no_state { /*background-image:url("../icons/x32/state_no.png"); */ }
+.systemmonitor-content.icons32.ico-unknown { background-image:url("../icons/x32/state_unknown.png"); }
+.systemmonitor-content.icons32.ico-ok { background-image:url("../icons/x32/state_ok.png"); }
+.systemmonitor-content.icons32.ico-info { background-image:url("../icons/x32/state_info.png"); }
+.systemmonitor-content.icons32.ico-warning { background-image:url("../icons/x32/state_warning.png"); }
+.systemmonitor-content.icons32.ico-critical { background-image:url("../icons/x32/state_critical.png"); }
+.systemmonitor-content.icons32.ico-error { background-image:url("../icons/x32/state_error.png"); }
+
+.systemmonitor-content table {
+    border: none;
+    margin-top: 10px;
+}
+
+.systemmonitor-content * .online {
+    border: 1px solid #ffffff;
+    background-color: #E3FFB8;
+    color: #000000;
+    padding:0px 5px;
+}
+.systemmonitor-content * .offline {
+    border: 1px solid #ffffff;
+    background-color: #d12f19; 
+    color:#ffffff;
+    padding:0px 5px;
+}
+
+/* Dashboard */
+.dashboard-modules {
+    float:left;
+    width:60px;
+    height: 60px;
+    border:1px dotted #888888;
+    background-color: #cccccc;
+    margin:10px;
+    background-position: center 5px;
+    background-repeat: no-repeat;
+    text-align: center;
+}
+
+.dashboard-modules a, .dashboard-modules a:hover{
+    color:Black;
+    display:block;
+    font-weight:bold;
+    height:30px;
+    padding-top:42px;
+    width:60px;
+    text-decoration: none;
+}
+
+.dashboard-modules.admin { background-image: url('../icons/x32/system.png') !important; }
+.dashboard-modules.vm { background-image: url('../icons/x32/drawer.png') !important; }
+.dashboard-modules.client { background-image: url('../icons/x32/client.png') !important; }
+.dashboard-modules.mail { background-image: url('../icons/x32/email.png') !important; }
+.dashboard-modules.monitor { background-image: url('../icons/x32/monitor.png') !important; }
+.dashboard-modules.dns { background-image: url('../icons/x32/dns.png') !important; }
+.dashboard-modules.tools { background-image: url('../icons/x32/tools.png') !important; }
+.dashboard-modules.help { background-image: url('../icons/x32/help.png') !important; }
+.dashboard-modules.domain { background-image: url('../icons/x32/domain.png') !important; }
+.dashboard-modules.sites { background-image: url('../icons/x32/sites.png') !important; }
+.dashboard-modules.billing { background-image: url('../icons/x32/calculator.png') !important; }
+
+.panel_dashboard h2 {
+    font-size:20px;
+}
+
+/* Image-Replacement */
+.swap { background-repeat:no-repeat; }
+.swap span { display:none; height:16px; } 
+#ir-HeaderLogo { background-image:url("../images/header_logo.png"); height:32px;margin:0 0 0.2em; } 
+#ir-Yes { background-image:url("../icons/x16/tick_circle.png"); height:16px; } 
+#ir-No { background-image:url("../icons/x16/cross_circle.png"); height:16px; } 
+
+/* BUTTONS */
+.buttons a, .buttons button{
+    display:block;
+    float:left;
+    margin:0 7px 0 0;
+    background-color:#f5f5f5;
+    border:1px solid #777777;
+    border-top: 1px solid #c8c8c8;
+    border-left:1px solid #c8c8c8;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:90%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    cursor:pointer;
+    padding:5px 10px 6px 7px; /* Links */
+}
+.buttons button{
+    width:auto;
+    overflow:visible;
+    padding:4px 10px 3px 7px; /* IE6 */
+}
+.buttons button[type]{
+    padding:5px 10px 5px 7px; /* Firefox */
+    line-height:17px; /* Safari */
+}
+*:first-child+html button[type]{
+    padding:4px 10px 3px 7px; /* IE7 */
+}
+.buttons button img, .buttons a img{
+    margin:0 3px -3px 0 !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+
+/* BUTTONS STANDARD */
+button:hover, .buttons a:hover{
+    background-color:#dff4ff;
+    border:1px solid #c2e1ef;
+    color:#336699;
+}
+.buttons a:active{
+    background-color:#6299c5;
+    border:1px solid #6299c5;
+    color:#fff;
+}
+
+/* BUTTONS POSITIVE */
+button.positive, .buttons a.positive{
+    color:#529214;
+}
+.buttons a.positive:hover, button.positive:hover{
+    background-color:#E6EFC2;
+    border:1px solid #C6D880;
+    color:#529214;
+}
+.buttons a.positive:active{
+    background-color:#529214;
+    border:1px solid #529214;
+    color:#fff;
+}
+
+/* BUTTONS NEGATIVE */
+.buttons a.negative, button.negative{
+    color:#d12f19;
+}
+.buttons a.negative:hover, button.negative:hover{
+    background-color:#fbe3e4;
+    border:1px solid #fbc2c4;
+    color:#d12f19;
+}
+.buttons a.negative:active{
+    background-color:#d12f19;
+    border:1px solid #d12f19;
+    color:#fff;
+}
+
+/* Button with icon and text */
+.iconstxt {
+    background-repeat: no-repeat; 
+    background-position: 4px center;
+}
+.iconstxt span { padding-left: 20px; }
+.iconstxt.icoPositive { background-image: url("../icons/x16/tick_circle_frame.png"); }
+.iconstxt.icoNegative { background-image: url("../icons/x16/cross_circle_frame.png"); }
+.iconstxt.icoAdd { background-image: url(../icons/x16/plus_circle_frame.png); }
+.iconstxt.icoKey { background-image: url("../icons/x16/key.png"); }
+.iconstxt.icoDelete { background-image: url("../icons/x16/minus_circle_frame.png"); }
+.iconstxt.icoDownload { background-image: url("../icons/x16/arrow_270.png"); }
+.iconstxt.icoRestore { background-image: url("../icons/x16/arrow_circle_225.png"); }
+
+/* Button with icon and without text */
+.icons16 span { display: none; }
+a.icons16 { height: 18px; width: 18px; padding: 0; background-repeat: no-repeat; background-position: 1px 1px;}
+button.icons16 { height: 20px; width: 20px; padding: 0; background-repeat: no-repeat; background-position: 1px 1px;}
+
+.icons16.icoDelete { background-image: url("../icons/x16/minus_circle_frame.png"); }
+.icons16.icoFilter { background-image: url(../icons/x16/funnel.png); }
+.icons16.icoEdit { background-image: url("../icons/x16/wrench.png"); }
+.icons16.icoDbAdmin { background-image: url("../icons/x16/database.png"); }
+.icons16.icoLoginAs { background-image: url("../icons/x16/user_go.png"); }
+.icons16.icoWebmailer { background-image: url("../icons/x16/mails_arrow.png"); }
+
+#ajaxloader {
+    text-align:center;
+    margin-top: 180px;
+}
+
+.blockLabel.email_at {
+    width: 20px !important;
+    margin: 1.6em 0.3em 0 0 !important
+}
+.textDisplay { display: block; }
+
+/* Form Length Classes */
+.textInput.formLengthBool { width: 25px !important; }
+.selectInput.formLengthBool { width: 60px !important; }
+.textInput.formLengthLimit { width: 50px !important; }
+.selectInput.formLengthLimit { width: 85px !important; }
+.formLengthDate { width: 75px !important; }
+.formLengthIPv4 { width: 125px !important; }
+.formLengthIPv6 { width: 100% !important; }
+.formLengthEmailUser { width: 30% !important; }
+.formLengthEmailDomain { width: 30% !important; }
+.formLengthHalf { width: 15% !important; }
+.formLengthDouble { width: 50% !important; }
+
+/* Individual Form Lengths */
+.textInput#username, .textInput#password, .textInput#passwort, .textInput#source_password { width: 100px; }
+.selectInput#language {	width: 75px; }
+.selectInput#client_group_id, .selectInput#default_group { width: 125px; }
+input#refresh, input#retry, input#expire, input#minimum, input#ttl { width: 50px !important; }
+
+/* --- */
+
+a[href $='#logout'] { padding-right: 18px; background: transparent url("../icons/x16/logout.png") no-repeat right top !important;	}
+
+/* Select Menu with Images */
+select.withicons option {
+    background-repeat:no-repeat;
+    background-position: 1px;
+    padding-left:24px;
+}	
+select.flags option {
+    background-image: url("../icons/flags_sprite.png");
+    background-repeat: no-repeat;
+    padding: 1px 0 1px 30px;
+}
+
+select.flags option[value=EL] {background-position:0 -1475px}
+select.flags option[value=AD], select.flags option[value=ad] {background-position:0 -1px}
+select.flags option[value=AE], select.flags option[value=ae] {background-position:0 -23px}
+select.flags option[value=AF], select.flags option[value=af] {background-position:0 -45px}
+select.flags option[value=AG], select.flags option[value=ag] {background-position:0 -67px}
+select.flags option[value=AI], select.flags option[value=ai] {background-position:0 -89px}
+select.flags option[value=AL], select.flags option[value=al] {background-position:0 -111px}
+select.flags option[value=AM], select.flags option[value=am] {background-position:0 -133px}
+select.flags option[value=AN], select.flags option[value=an] {background-position:0 -155px}
+select.flags option[value=AO], select.flags option[value=ao] {background-position:0 -177px}
+select.flags option[value=AQ], select.flags option[value=aq] {background-position:0 -199px}
+select.flags option[value=AR], select.flags option[value=ar] {background-position:0 -221px}
+select.flags option[value=AS], select.flags option[value=as] {background-position:0 -243px}
+select.flags option[value=AT], select.flags option[value=at] {background-position:0 -265px}
+select.flags option[value=AU], select.flags option[value=au] {background-position:0 -287px}
+select.flags option[value=AW], select.flags option[value=aw] {background-position:0 -309px}
+select.flags option[value=AX], select.flags option[value=ax] {background-position:0 -331px}
+select.flags option[value=AZ], select.flags option[value=az] {background-position:0 -353px}
+select.flags option[value=BA], select.flags option[value=ba] {background-position:0 -375px}
+select.flags option[value=BB], select.flags option[value=bb] {background-position:0 -397px}
+select.flags option[value=BD], select.flags option[value=bd] {background-position:0 -419px}
+select.flags option[value=BE], select.flags option[value=be] {background-position:0 -441px}
+select.flags option[value=BF], select.flags option[value=bf] {background-position:0 -463px}
+select.flags option[value=BG], select.flags option[value=bg] {background-position:0 -485px}
+select.flags option[value=BH], select.flags option[value=bh] {background-position:0 -507px}
+select.flags option[value=BI], select.flags option[value=bi] {background-position:0 -529px}
+select.flags option[value=BJ], select.flags option[value=bj] {background-position:0 -551px}
+select.flags option[value=BM], select.flags option[value=bm] {background-position:0 -573px}
+select.flags option[value=BN], select.flags option[value=bn] {background-position:0 -595px}
+select.flags option[value=BO], select.flags option[value=bo] {background-position:0 -617px}
+select.flags option[value=BR], select.flags option[value=br] {background-position:0 -639px}
+select.flags option[value=BS], select.flags option[value=bs] {background-position:0 -661px}
+select.flags option[value=BT], select.flags option[value=bt] {background-position:0 -683px}
+select.flags option[value=BV], select.flags option[value=bv] {background-position:0 -705px}
+select.flags option[value=BW], select.flags option[value=bw] {background-position:0 -727px}
+select.flags option[value=BY], select.flags option[value=by] {background-position:0 -749px}
+select.flags option[value=BZ], select.flags option[value=bz] {background-position:0 -771px}
+select.flags option[value=CA], select.flags option[value=ca] {background-position:0 -793px}
+select.flags option[value=CC], select.flags option[value=cc] {background-position:0 -837px}
+select.flags option[value=CD], select.flags option[value=cd] {background-position:0 -859px}
+select.flags option[value=CF], select.flags option[value=cf] {background-position:0 -881px}
+select.flags option[value=CG], select.flags option[value=cg] {background-position:0 -903px}
+select.flags option[value=CH], select.flags option[value=ch] {background-position:0 -925px}
+select.flags option[value=CI], select.flags option[value=ci] {background-position:0 -947px}
+select.flags option[value=CK], select.flags option[value=ck] {background-position:0 -969px}
+select.flags option[value=CL], select.flags option[value=cl] {background-position:0 -991px}
+select.flags option[value=CM], select.flags option[value=cm] {background-position:0 -1013px}
+select.flags option[value=CN], select.flags option[value=cn] {background-position:0 -1035px}
+select.flags option[value=CO], select.flags option[value=co] {background-position:0 -1057px}
+select.flags option[value=CR], select.flags option[value=cr] {background-position:0 -1079px}
+select.flags option[value=CS], select.flags option[value=cs] {background-position:0 -1101px}
+select.flags option[value=CU], select.flags option[value=cu] {background-position:0 -1123px}
+select.flags option[value=CV], select.flags option[value=cv] {background-position:0 -1145px}
+select.flags option[value=CX], select.flags option[value=cx] {background-position:0 -1167px}
+select.flags option[value=CY], select.flags option[value=cy] {background-position:0 -1189px}
+select.flags option[value=CZ], select.flags option[value=cz] {background-position:0 -1211px}
+select.flags option[value=DE], select.flags option[value=de] {background-position:0 -1233px}
+select.flags option[value=DJ], select.flags option[value=dj] {background-position:0 -1255px}
+select.flags option[value=DK], select.flags option[value=dk] {background-position:0 -1277px}
+select.flags option[value=DM], select.flags option[value=dm] {background-position:0 -1299px}
+select.flags option[value=DO], select.flags option[value=do] {background-position:0 -1321px}
+select.flags option[value=DZ], select.flags option[value=dz] {background-position:0 -1343px}
+select.flags option[value=EC], select.flags option[value=ec] {background-position:0 -1365px}
+select.flags option[value=EE], select.flags option[value=ee] {background-position:0 -1387px}
+select.flags option[value=EG], select.flags option[value=eg] {background-position:0 -1409px}
+select.flags option[value=EH], select.flags option[value=eh] {background-position:0 -1431px}
+select.flags option[value=ER], select.flags option[value=er] {background-position:0 -1497px}
+select.flags option[value=ES], select.flags option[value=ET], select.flags option[value=es], select.flags option[value=et] {background-position:0 -1519px}
+select.flags option[value=FI], select.flags option[value=fi] {background-position:0 -1585px}
+select.flags option[value=FJ], select.flags option[value=fj] {background-position:0 -1607px}
+select.flags option[value=FK], select.flags option[value=fk] {background-position:0 -1629px}
+select.flags option[value=FM], select.flags option[value=fm] {background-position:0 -1651px}
+select.flags option[value=FO], select.flags option[value=fo] {background-position:0 -1673px}
+select.flags option[value=FR], select.flags option[value=fr] {background-position:0 -1695px}
+select.flags option[value=GA], select.flags option[value=ga] {background-position:0 -1717px}
+select.flags option[value=GB], select.flags option[value=en], select.flags option[value=gb] {background-position:0 -1739px}
+select.flags option[value=GD], select.flags option[value=gd] {background-position:0 -1761px}
+select.flags option[value=GE], select.flags option[value=ge] {background-position:0 -1783px}
+select.flags option[value=GF], select.flags option[value=gf] {background-position:0 -1805px}
+select.flags option[value=GH], select.flags option[value=gh] {background-position:0 -1827px}
+select.flags option[value=GI], select.flags option[value=gi] {background-position:0 -1849px}
+select.flags option[value=GL], select.flags option[value=gl] {background-position:0 -1871px}
+select.flags option[value=GM], select.flags option[value=gm] {background-position:0 -1893px}
+select.flags option[value=GN], select.flags option[value=gn] {background-position:0 -1915px}
+select.flags option[value=GP], select.flags option[value=gp] {background-position:0 -1937px}
+select.flags option[value=GQ], select.flags option[value=gq] {background-position:0 -1959px}
+select.flags option[value=GR], select.flags option[value=el], select.flags option[value=gr] {background-position:0 -1981px}
+select.flags option[value=GS], select.flags option[value=gs] {background-position:0 -2003px}
+select.flags option[value=GT], select.flags option[value=gt] {background-position:0 -2025px}
+select.flags option[value=GU], select.flags option[value=gu] {background-position:0 -2047px}
+select.flags option[value=GW], select.flags option[value=gw] {background-position:0 -2069px}
+select.flags option[value=GY], select.flags option[value=gy] {background-position:0 -2091px}
+select.flags option[value=HK], select.flags option[value=hk] {background-position:0 -2113px}
+select.flags option[value=HM], select.flags option[value=hm] {background-position:0 -2135px}
+select.flags option[value=HN], select.flags option[value=hn] {background-position:0 -2157px}
+select.flags option[value=HR], select.flags option[value=hr] {background-position:0 -2179px}
+select.flags option[value=HT], select.flags option[value=ht] {background-position:0 -2201px}
+select.flags option[value=HU], select.flags option[value=hu] {background-position:0 -2223px}
+select.flags option[value=ID], select.flags option[value=id] {background-position:0 -2245px}
+select.flags option[value=IE], select.flags option[value=ie] {background-position:0 -2267px}
+select.flags option[value=IL], select.flags option[value=il] {background-position:0 -2289px}
+select.flags option[value=IN], select.flags option[value=in] {background-position:0 -2311px}
+select.flags option[value=IO], select.flags option[value=io] {background-position:0 -2333px}
+select.flags option[value=IQ], select.flags option[value=iq] {background-position:0 -2355px}
+select.flags option[value=IR], select.flags option[value=ir] {background-position:0 -2377px}
+select.flags option[value=IS], select.flags option[value=is] {background-position:0 -2399px}
+select.flags option[value=IT], select.flags option[value=it] {background-position:0 -2421px}
+select.flags option[value=JM], select.flags option[value=jm] {background-position:0 -2443px}
+select.flags option[value=JO], select.flags option[value=jo] {background-position:0 -2465px}
+select.flags option[value=JP], select.flags option[value=ja], select.flags option[value=jp] {background-position:0 -2487px}
+select.flags option[value=KE], select.flags option[value=ke] {background-position:0 -2509px}
+select.flags option[value=KG], select.flags option[value=kg] {background-position:0 -2531px}
+select.flags option[value=KH], select.flags option[value=kh] {background-position:0 -2553px}
+select.flags option[value=KI], select.flags option[value=ki] {background-position:0 -2575px}
+select.flags option[value=KM], select.flags option[value=km] {background-position:0 -2597px}
+select.flags option[value=KN], select.flags option[value=kn] {background-position:0 -2619px}
+select.flags option[value=KP], select.flags option[value=kp] {background-position:0 -2641px}
+select.flags option[value=KR], select.flags option[value=kr] {background-position:0 -2663px}
+select.flags option[value=KW], select.flags option[value=kw] {background-position:0 -2685px}
+select.flags option[value=KY], select.flags option[value=ky] {background-position:0 -2707px}
+select.flags option[value=KZ], select.flags option[value=kz] {background-position:0 -2729px}
+select.flags option[value=LA], select.flags option[value=la] {background-position:0 -2751px}
+select.flags option[value=LB], select.flags option[value=lb] {background-position:0 -2773px}
+select.flags option[value=LC], select.flags option[value=lc] {background-position:0 -2795px}
+select.flags option[value=LI], select.flags option[value=li] {background-position:0 -2817px}
+select.flags option[value=LK], select.flags option[value=lk] {background-position:0 -2839px}
+select.flags option[value=LR], select.flags option[value=lr] {background-position:0 -2861px}
+select.flags option[value=LS], select.flags option[value=ls] {background-position:0 -2883px}
+select.flags option[value=LT], select.flags option[value=lt] {background-position:0 -2905px}
+select.flags option[value=LU], select.flags option[value=lu] {background-position:0 -2927px}
+select.flags option[value=LV], select.flags option[value=lv] {background-position:0 -2949px}
+select.flags option[value=LY], select.flags option[value=ly] {background-position:0 -2971px}
+select.flags option[value=MA], select.flags option[value=ma] {background-position:0 -2993px}
+select.flags option[value=MC], select.flags option[value=mc] {background-position:0 -3015px}
+select.flags option[value=MD], select.flags option[value=md] {background-position:0 -3037px}
+select.flags option[value=ME], select.flags option[value=me] {background-position:0 -3059px}
+select.flags option[value=MG], select.flags option[value=mg] {background-position:0 -3081px}
+select.flags option[value=MH], select.flags option[value=mh] {background-position:0 -3103px}
+select.flags option[value=MK], select.flags option[value=mk] {background-position:0 -3125px}
+select.flags option[value=ML], select.flags option[value=ml] {background-position:0 -3147px}
+select.flags option[value=MM], select.flags option[value=mm] {background-position:0 -3169px}
+select.flags option[value=MN], select.flags option[value=mn] {background-position:0 -3191px}
+select.flags option[value=MO], select.flags option[value=mo] {background-position:0 -3213px}
+select.flags option[value=MP], select.flags option[value=mp] {background-position:0 -3235px}
+select.flags option[value=MQ], select.flags option[value=mq] {background-position:0 -3257px}
+select.flags option[value=MR], select.flags option[value=mr] {background-position:0 -3279px}
+select.flags option[value=MS], select.flags option[value=ms] {background-position:0 -3301px}
+select.flags option[value=MT], select.flags option[value=mt] {background-position:0 -3323px}
+select.flags option[value=MU], select.flags option[value=mu] {background-position:0 -3345px}
+select.flags option[value=MV], select.flags option[value=mv] {background-position:0 -3367px}
+select.flags option[value=MW], select.flags option[value=mw] {background-position:0 -3389px}
+select.flags option[value=MX], select.flags option[value=mx] {background-position:0 -3411px}
+select.flags option[value=MY], select.flags option[value=my] {background-position:0 -3433px}
+select.flags option[value=MZ], select.flags option[value=mz] {background-position:0 -3455px}
+select.flags option[value=NA], select.flags option[value=na] {background-position:0 -3477px}
+select.flags option[value=NC], select.flags option[value=nc] {background-position:0 -3499px}
+select.flags option[value=NE], select.flags option[value=ne] {background-position:0 -3521px}
+select.flags option[value=NF], select.flags option[value=nf] {background-position:0 -3543px}
+select.flags option[value=NG], select.flags option[value=ng] {background-position:0 -3565px}
+select.flags option[value=NI], select.flags option[value=ni] {background-position:0 -3587px}
+select.flags option[value=NL], select.flags option[value=nl] {background-position:0 -3609px}
+select.flags option[value=NO], select.flags option[value=no] {background-position:0 -3631px}
+select.flags option[value=NP], select.flags option[value=np] {background-position:0 -3653px}
+select.flags option[value=NR], select.flags option[value=nr] {background-position:0 -3675px}
+select.flags option[value=NU], select.flags option[value=nu] {background-position:0 -3697px}
+select.flags option[value=NZ], select.flags option[value=nz] {background-position:0 -3719px}
+select.flags option[value=OM], select.flags option[value=om] {background-position:0 -3741px}
+select.flags option[value=PA], select.flags option[value=pa] {background-position:0 -3763px}
+select.flags option[value=PE], select.flags option[value=pe] {background-position:0 -3785px}
+select.flags option[value=PF], select.flags option[value=pf] {background-position:0 -3807px}
+select.flags option[value=PG], select.flags option[value=pg] {background-position:0 -3829px}
+select.flags option[value=PH], select.flags option[value=ph] {background-position:0 -3851px}
+select.flags option[value=PK], select.flags option[value=pk] {background-position:0 -3873px}
+select.flags option[value=PL], select.flags option[value=pl] {background-position:0 -3895px}
+select.flags option[value=PM], select.flags option[value=pm] {background-position:0 -3917px}
+select.flags option[value=PN], select.flags option[value=pn] {background-position:0 -3939px}
+select.flags option[value=PR], select.flags option[value=pr] {background-position:0 -3961px}
+select.flags option[value=PS], select.flags option[value=ps] {background-position:0 -3983px}
+select.flags option[value=PT], select.flags option[value=pt] {background-position:0 -4005px}
+select.flags option[value=PW], select.flags option[value=pw] {background-position:0 -4027px}
+select.flags option[value=PY], select.flags option[value=py] {background-position:0 -4049px}
+select.flags option[value=QA], select.flags option[value=qa] {background-position:0 -4071px}
+select.flags option[value=RE], select.flags option[value=re] {background-position:0 -4093px}
+select.flags option[value=RO], select.flags option[value=ro] {background-position:0 -4115px}
+select.flags option[value=RS], select.flags option[value=rs] {background-position:0 -4137px}
+select.flags option[value=RU], select.flags option[value=ru] {background-position:0 -4159px}
+select.flags option[value=RW], select.flags option[value=rw] {background-position:0 -4181px}
+select.flags option[value=SA], select.flags option[value=sa] {background-position:0 -4203px}
+select.flags option[value=SB], select.flags option[value=sb] {background-position:0 -4225px}
+select.flags option[value=SC], select.flags option[value=sc] {background-position:0 -4247px}
+select.flags option[value=SD], select.flags option[value=sd] {background-position:0 -4291px}
+select.flags option[value=SE], select.flags option[value=se] {background-position:0 -4313px}
+select.flags option[value=SG], select.flags option[value=sg] {background-position:0 -4335px}
+select.flags option[value=SH], select.flags option[value=sh] {background-position:0 -4357px}
+select.flags option[value=SI], select.flags option[value=si] {background-position:0 -4379px}
+select.flags option[value=SJ], select.flags option[value=sj] {background-position:0 -4401px}
+select.flags option[value=SK], select.flags option[value=sk] {background-position:0 -4423px}
+select.flags option[value=SL], select.flags option[value=sl] {background-position:0 -4445px}
+select.flags option[value=SM], select.flags option[value=sm] {background-position:0 -4467px}
+select.flags option[value=SN], select.flags option[value=sn] {background-position:0 -4489px}
+select.flags option[value=SO], select.flags option[value=so] {background-position:0 -4511px}
+select.flags option[value=SR], select.flags option[value=sr] {background-position:0 -4533px}
+select.flags option[value=ST], select.flags option[value=st] {background-position:0 -4555px}
+select.flags option[value=SV], select.flags option[value=sv] {background-position:0 -4577px}
+select.flags option[value=SY], select.flags option[value=sy] {background-position:0 -4599px}
+select.flags option[value=SZ], select.flags option[value=sz] {background-position:0 -4621px}
+select.flags option[value=TC], select.flags option[value=tc] {background-position:0 -4643px}
+select.flags option[value=TD], select.flags option[value=td] {background-position:0 -4665px}
+select.flags option[value=TF], select.flags option[value=tf] {background-position:0 -4687px}
+select.flags option[value=TG], select.flags option[value=tg] {background-position:0 -4709px}
+select.flags option[value=TH], select.flags option[value=th] {background-position:0 -4731px}
+select.flags option[value=TJ], select.flags option[value=tj] {background-position:0 -4753px}
+select.flags option[value=TK], select.flags option[value=tk] {background-position:0 -4775px}
+select.flags option[value=TL], select.flags option[value=tl] {background-position:0 -4797px}
+select.flags option[value=TM], select.flags option[value=tm] {background-position:0 -4819px}
+select.flags option[value=TN], select.flags option[value=tn] {background-position:0 -4841px}
+select.flags option[value=TO], select.flags option[value=to] {background-position:0 -4863px}
+select.flags option[value=TR], select.flags option[value=tr] {background-position:0 -4885px}
+select.flags option[value=TT], select.flags option[value=tt] {background-position:0 -4907px}
+select.flags option[value=TV], select.flags option[value=tv] {background-position:0 -4929px}
+select.flags option[value=TW], select.flags option[value=tw] {background-position:0 -4951px}
+select.flags option[value=TZ], select.flags option[value=tz] {background-position:0 -4973px}
+select.flags option[value=UA], select.flags option[value=ua] {background-position:0 -4995px}
+select.flags option[value=UG], select.flags option[value=ug] {background-position:0 -5017px}
+select.flags option[value=UM], select.flags option[value=um] {background-position:0 -5039px}
+select.flags option[value=US], select.flags option[value=us] {background-position:0 -5061px}
+select.flags option[value=UY], select.flags option[value=uy] {background-position:0 -5083px}
+select.flags option[value=UZ], select.flags option[value=uz] {background-position:0 -5105px}
+select.flags option[value=VA], select.flags option[value=va] {background-position:0 -5127px}
+select.flags option[value=VC], select.flags option[value=vc] {background-position:0 -5149px}
+select.flags option[value=VE], select.flags option[value=ve] {background-position:0 -5171px}
+select.flags option[value=VG], select.flags option[value=vg] {background-position:0 -5193px}
+select.flags option[value=VI], select.flags option[value=vi] {background-position:0 -5215px}
+select.flags option[value=VN], select.flags option[value=vn] {background-position:0 -5237px}
+select.flags option[value=VU], select.flags option[value=vu] {background-position:0 -5259px}
+select.flags option[value=WF], select.flags option[value=wf] {background-position:0 -5303px}
+select.flags option[value=WS], select.flags option[value=ws] {background-position:0 -5325px}
+select.flags option[value=YE], select.flags option[value=ye] {background-position:0 -5347px}
+select.flags option[value=YT], select.flags option[value=yt] {background-position:0 -5369px}
+select.flags option[value=ZA], select.flags option[value=za] {background-position:0 -5391px}
+select.flags option[value=ZM], select.flags option[value=zm] {background-position:0 -5413px}
+select.flags option[value=ZW], select.flags option[value=zw] {background-position:0 -5435px}
+
+.panel_login {
+    max-width: 80%;
+    min-width: 680px;
+}
+
+div.subsectiontoggle {
+    border:1px solid #ccc;
+    font-weight:bold;
+    font-size:14px;
+    padding-top:10px;
+    padding-bottom:0;
+    margin-top:5px;
+    text-indent:15px;
+    cursor:pointer;
+    margin-bottom:10px;
+    background-color:#f4f4f4;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+div.subsectiontoggle span{
+    display:inline-block;
+    margin-bottom:-3px;
+    margin-right:10px;
+    width:16px;
+    height:16px;
+    background:url(../icons/x16/plus_circle_frame.png) top left no-repeat;
+}
+div.subsectiontoggle span.showing{
+    background:url(../icons/x16/minus_circle_frame.png) top left no-repeat;
+}
+div.subsectiontoggle em{
+    display:block;
+    position:relative;
+    left:425px;
+    top:-13px;
+    margin-bottom:-3px;
+    width:13px;
+    height:13px;
+    background:url(../images/chevron.png) top left no-repeat;
+    -webkit-transform:none;
+    -moz-transform:none;
+    -khtml-transform:none;
+    -o-transform:none;
+    -ms-transform:none;
+    transform:none;
+    -webkit-transition-duration: .2s;
+    -moz-transition-duration: .2s;
+    -khtml-transition-duration: .2s;
+    -o-transition-duration: .2s;
+    -ms-transition-duration: .2s;
+    transition-duration: .2s;
+    -webkit-transition-property: -webkit-transform;
+    -moz-transition-property: -moz-transform;
+    -khtml-transition-property: -khtml-transform;
+    -o-transition-property: -o-transform;
+    -ms-transition-property: -ms-transform;
+    transition-property: transform;
+}
+div.subsectiontoggle em.showing{
+    display:block;
+    position:relative;
+    left:425px;
+    top:-13px;
+    background:url(../images/chevron.png) top left no-repeat;
+    width:13px;
+    height:13px;
+    -webkit-transform:rotate(90deg);
+    -moz-transform:rotate(90deg);
+    -khtml-transform:rotate(90deg);
+    -o-transform:rotate(90deg);
+    -ms-transform:rotate(90deg);
+    transform:rotate(90deg);
+}
+div.subsectiontoggle:hover em{
+    -webkit-transform:rotate(90deg);
+    -moz-transform:rotate(90deg);
+    -khtml-transform:rotate(90deg);
+    -o-transform:rotate(90deg);
+    -ms-transform:rotate(90deg);
+    transform:rotate(90deg);
+}
+
+div.gs-container{
+    margin-top:10px;
+}
+div.gs-container *{
+    margin: 0;
+    padding: 0;
+    background-position: 0 0;
+    text-decoration: none;
+    font-size: 1em;
+}
+div.gs-container input{
+    background: url("../icons/x16/magnifier_left.png") no-repeat 4px 3px #FFFFFF;
+    height:20px;
+    border:1px solid #444;
+    padding:0 22px 2px;
+    color:#444;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+input.gs-loading{
+    background-image: url(../icons/x16/loading.gif);
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+ul.gs-resultbox{
+    margin: 0 !important;
+    padding: 0 !important;
+    width: 300px;
+    z-index: 999999;
+    border: 1px solid #777;
+    font-size: 11px;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -webkit-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -khtml-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -o-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    box-shadow: 2px 2px 5px 0 #c5c5c5;
+    list-style: none;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+ul.gs-resultbox li{
+    float: left;
+    width: 100%;
+    clear: both;
+    cursor: pointer;
+}
+ul.gs-resultbox li.gs-cheader{
+    height: 13px;
+    overflow: hidden;
+    padding: 5px 0;
+    color: #fff;
+    background: #6ea6d1;
+    cursor:default;
+    padding-bottom:10px;
+}
+ul.gs-resultbox li.gs-cheader p.gs-cheader-title{
+    margin: 0 !important;
+    padding: 0 0 0 10px !important;
+    float: left;
+    font-size: 12px;
+    font-weight: bold;
+}
+ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{
+    margin: 0 !important;
+    padding: 0 10px 0 0 !important;
+    float: right;
+    font-size: 11px;
+    font-weight: normal;
+}
+ul.gs-resultbox li.gs-cdata{
+    margin: 0 !important;
+    padding: 0 !important;
+    border-bottom: 1px solid #c5c5c5;
+}
+ul.gs-resultbox li.gs-cdata:last-child{
+    border-bottom: none;
+}
+ul.gs-resultbox li.gs-cdata:hover{
+    background: #eaf4fd;
+}
+ul.gs-resultbox li.gs-cdata a{
+    display: block;
+    padding: 5px 10px;
+    text-decoration: none !important;
+    background: #fff;
+}
+ul.gs-resultbox li.gs-cdata a:hover{
+    background: #cde0ff;
+}
+ul.gs-resultbox li.gs-cdata img{
+    margin-right: 12px;
+}
+ul.gs-resultbox li.gs-cdata p{
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #444;
+    font-size: 10px;
+    min-height:30px;
+}
+ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{
+    display: inline !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: 11px;
+    font-weight: bold;
+    color: #000;
+}
+ul.gs-resultbox li:first-child{
+    -moz-border-radius:5px 5px 0 0;
+    -webkit-border-radius:5px 5px 0 0;
+    -khtml-border-radius:5px 5px 0 0;
+    -o-border-radius:5px 5px 0 0;
+    -ms-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+ul.gs-resultbox li:last-child{
+    -moz-border-radius:0 0 5px 5px;
+    -webkit-border-radius:0 0 5px 5px;
+    -khtml-border-radius:0 0 5px 5px;
+    -o-border-radius:0 0 5px 5px;
+    -ms-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+
+div.df-container{
+}
+div.df-container *{
+    margin: 0;
+    padding: 0;
+    background-position: 0 0;
+    text-decoration: none;
+    font-size: 1em;
+}
+div.df-container input{
+}
+input.df-loading{
+    background-image: url(../icons/x16/loading.gif);
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+ul.df-resultbox{
+    margin: 0 !important;
+    padding: 0 !important;
+    min-width: 250px;
+    max-width: 500px;
+    z-index: 999999;
+    border: 1px solid #777;
+    font-size: 11px;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -webkit-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -khtml-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -o-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    box-shadow: 2px 2px 5px 0 #c5c5c5;
+    list-style: none;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+ul.df-resultbox li{
+    float: left;
+    width: 100%;
+    clear: both;
+    cursor: pointer;
+}
+ul.df-resultbox li.df-cheader{
+    height: 13px;
+    overflow: hidden;
+    padding: 5px 0;
+    color: #fff;
+    background: #6ea6d1;
+    cursor:default;
+    padding-bottom:10px;
+}
+ul.df-resultbox li.df-cheader p.df-cheader-title{
+    margin: 0 !important;
+    padding: 0 0 0 10px !important;
+    float: left;
+    font-size: 12px;
+    font-weight: bold;
+}
+ul.df-resultbox li.df-cheader p.df-cheader-limit{
+    margin: 0 !important;
+    padding: 0 10px 0 0 !important;
+    float: right;
+    font-size: 11px;
+    font-weight: normal;
+}
+ul.df-resultbox li.df-cdata{
+    margin: 0 !important;
+    padding: 0 !important;
+    border-bottom: 1px solid #c5c5c5;
+}
+ul.df-resultbox li.df-cdata:last-child{
+    border-bottom: none;
+}
+ul.df-resultbox li.df-cdata:hover{
+    background: #eaf4fd;
+}
+ul.df-resultbox li.df-cdata a{
+    display: block;
+    padding: 5px 10px;
+    text-decoration: none !important;
+    background: #fff;
+}
+ul.df-resultbox li.df-cdata a:hover{
+    background: #cde0ff;
+}
+ul.df-resultbox li.df-cdata img{
+    margin-right: 12px;
+}
+ul.df-resultbox li.df-cdata p{
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #444;
+    font-size: 10px;
+    min-height:30px;
+}
+ul.df-resultbox li.df-cdata p span.df-cdata-title{
+    display: inline !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: 11px;
+    font-weight: bold;
+    color: #000;
+}
+ul.df-resultbox li:first-child{
+    -moz-border-radius:5px 5px 0 0;
+    -webkit-border-radius:5px 5px 0 0;
+    -khtml-border-radius:5px 5px 0 0;
+    -o-border-radius:5px 5px 0 0;
+    -ms-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+ul.df-resultbox li:last-child{
+    -moz-border-radius:0 0 5px 5px;
+    -webkit-border-radius:0 0 5px 5px;
+    -khtml-border-radius:0 0 5px 5px;
+    -o-border-radius:0 0 5px 5px;
+    -ms-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+
+span.icons16-empty{
+    float:left;
+    display:block;
+    height:20px;
+    width:20px;
+    margin:0 7px 0 0;
+}
+
+.ttip{
+    width:16px;
+    height:16px;
+    cursor:pointer;
+    background: url(../icons/x16/question_frame.png) no-repeat center center;
+    float:right;
+    display:inline;
+    position:relative;
+    right:-2px;
+    top:-2px;
+}
+
+p.prefix {
+    float: left;
+    margin: 0;
+    text-align: right;
+}
+p.label {
+    float: left;
+    margin: 5px 15px 0 0;
+}
+p.value {
+    float:left;
+    margin: 0 0 0 2px;
+}
+
+/* content_ispc
+-------------------------------------------------------------- */
+.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
+.tipsy-inner { background-color: #000; color: #FFF; max-width: 350px; padding: 5px 8px 4px 8px; text-align: left; }
+
+/* Rounded corners */
+.tipsy-inner { border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+
+/* Uncomment for shadow */
+/*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/
+
+.tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
+
+/* Rules to colour arrows */
+.tipsy-arrow-n { border-bottom-color: #000; }
+.tipsy-arrow-s { border-top-color: #000; }
+.tipsy-arrow-e { border-left-color: #000; }
+.tipsy-arrow-w { border-right-color: #000; }
+
+.tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; }
+.tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
+.tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none;  border-left-color: transparent; border-right-color: transparent;}
+.tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
+.tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
+.tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
+.tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; }
+.tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; }
+
+/* uni-form-generic
+-------------------------------------------------------------- */
+
+/* Uni-Form by Dragan Babic [Superawesome Industries]  - http: //sprawsm.com/uni-form/ */ 
+/* Some rights reserved - http: //creativecommons.org/licenses/by-sa/2.5/ */
+/* Do not edit this file directly, make your changes to uni-form.css in the same folder */
+
+/* ------------------------------------------------------------------------------ */
+
+.uniForm{ margin: 0; padding: 0; position: relative; z-index: 1; } /* reset stuff */
+
+/* Some generals and more resets */
+.uniForm fieldset{ border: none; margin: 0; padding: 0; }
+.uniForm fieldset legend{ margin: 0; padding: 0; }
+
+/* This is the main unit that contains our form elements */
+.uniForm .ctrlHolder,
+.uniForm .buttonHolder{ margin: 0; padding: 0; clear: both; }
+
+/* Clear all floats */ 
+.uniForm:after,
+.uniForm .buttonHolder:after, 
+.uniForm .ctrlHolder:after, 
+.uniForm .ctrlHolder .multiField:after,
+.uniForm .inlineLabel:after{ content: "."; display: block; height: 0; line-height: 0; font-size: 0; clear: both; min-height: 0; visibility: hidden; }
+
+/* A class to be used on a label that contains a checkbox or a radio button */
+.uniForm .inlineLabel,
+.uniForm .inlineLabels .inlineLabel,
+.uniForm .blockLabels .inlineLabel{ width: auto; float: none; margin: 0; display: block; }
+/* IE shows borders & padding on checkboxes and radio buttons if they are declared on an input element, remove them */
+/* Legacy/Inheritance fix */
+.uniForm .inlineLabel input,
+.uniForm .inlineLabels .inlineLabel input,
+.uniForm .blockLabels .inlineLabel input{ border: none; padding: 0; margin: 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Styles for form controls where labels are above the input elements */
+/* Set the class of the parent (preferably to a fieldset) to .blockLabels */
+
+.uniForm label,
+.uniForm .label,
+.uniForm .blockLabels label,
+.uniForm .blockLabels .label{ display: block; float: none; padding: 0; line-height: 100%; width: auto; }
+
+/* Float the input elements */
+.uniForm .textInput,
+.uniForm .blockLabels .textInput,
+.uniForm .blockLabels .fileUpload,
+.uniForm .selectInput,
+.uniForm .blockLabels .selectInput,
+.uniForm .blockLabels select,
+.uniForm textarea,
+.uniForm .blockLabels textarea{ float: left; }
+
+/* Postition the hints */
+.uniForm .formHint,
+.uniForm .blockLabels .formHint{ float: right; margin: 0; clear: none; }
+
+/* Position the elements inside combo boxes (multiple selects/checkboxes/radio buttons per unit) */
+.uniForm .multiField,
+.uniForm .blockLabels .multiField{ width: auto; float: left; }
+.uniForm .multiField .inlineLabel,
+.uniForm .blockLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .multiField .blockLabel,
+.uniForm .blockLabels .multiField .blockLabel{ float: left; width: auto; margin: 0; }
+.uniForm .multiField .blockLabel .textInput,
+.uniForm .multiField .blockLabel .selectInput,
+.uniForm .multiField .blockLabel select,
+.uniForm .blockLabels .multiField .blockLabel .textInput,
+.uniForm .blockLabels .multiField .blockLabel .selectInput,
+.uniForm .blockLabels .multiField .blockLabel select{ width: 100%; margin: 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Styles for form controls where labels are in line with the input elements */
+/* Set the class of the parent (preferably to a fieldset) to .inlineLabels */
+.uniForm .inlineLabels label,
+.uniForm .inlineLabels .label{ float: left; margin: 0; padding: 0; line-height: 100%; position: relative; }
+
+/* Float the input elements */
+.uniForm .inlineLabels .textInput,
+.uniForm .inlineLabels .fileUpload,        
+.uniForm .inlineLabels .selectInput,
+.uniForm .inlineLabels select,
+.uniForm .inlineLabels textarea{ float: left; }
+
+/* Postition the hints */
+.uniForm .inlineLabels .formHint{ clear: both; float: none; }
+.uniForm .inlineLabels .multiField{ float: left; }
+.uniForm .inlineLabels .multiField .inlineLabel{}
+.uniForm .inlineLabels .multiField .blockLabel{}
+.uniForm .inlineLabels .multiField .blockLabel .textInput,
+.uniForm .inlineLabels .multiField .blockLabel .selectInput,
+.uniForm .inlineLabels .multiField .blockLabel select{ display: block; width: 100%; float: none; }
+.uniForm .inlineLabels .multiField select{ float: left; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Required fields asterisk styling for .blockLabels */
+.uniForm label em,
+.uniForm .label em,
+.uniForm .blockLabels label em,
+.uniForm .blockLabels .label em{ position: absolute; left: -7px; }
+
+/* Required fields asterisk styling for .inlineLabels */
+.uniForm .inlineLabels label em,
+.uniForm .inlineLabels .label em{ display: block; position: absolute; left: auto; right: 0; font-style: normal; font-weight: bold; }
+.uniForm .inlineLabel em{ position: absolute; left: 7px; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Messages */
+.uniForm #errorMsg,
+.uniForm .error{
+}
+.uniForm #errorMsg dt,
+.uniForm #errorMsg h3{
+}
+.uniForm #errorMsg dd{
+}
+.uniForm #errorMsg ol{
+}
+.uniForm #errorMsg ol li{
+}
+.uniForm .errorField{
+}
+
+.uniForm #OKMsg{
+}
+
+/* ------------------------------------------------------------------------------ */
+
+/* Columns */
+
+.uniForm .col{ float: left; }
+.uniForm .col.first{}
+.uniForm .col.last{}
+
+/* uni-form
+-------------------------------------------------------------- */
+
+/* Keep in mind that wherever you see 'Required property' it means that the property must exist */
+
+/* ------------------------------------------------------------------------------ */
+
+/* Generals */
+.uniForm fieldset{}
+.uniForm fieldset legend{ color: #333; font-weight: bold; font-size: 100%; margin: 0; padding: 1.5em 1.5em 1.5em 0; }
+
+/* This is the main unit that contains our form elements */
+.uniForm .ctrlHolder{ padding: 3px; border-bottom: 1px dotted #dfdfdf; }
+
+.uniForm .buttonHolder{ 
+    text-align: left; 
+    background: #CEDEEF url("../images/buttonHolder_bg.gif") no-repeat right;
+    margin: 3em 0 1em;
+    padding: 8px;
+}
+.uniForm .resetButton{ float: left; }
+.uniForm .primaryAction{ font-weight: bold; }
+
+/* This class gets added to div.ctrlHolder to highlight the row */
+.uniForm .focused{ background: #fffcdf; }
+
+/* .inlineLabel is used for inputs within labels - checkboxes and radio buttons */
+.uniForm .inlineLabel input,
+.uniForm .inlineLabels .inlineLabel input,
+.uniForm .blockLabels .inlineLabel input{ float: left; margin: 0 .4em 0 0; }
+.uniForm .inlineLabel span{ float: left; width: 90%; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* .blockLabels (default style, will be applied even if you don't class the parent element) */
+.uniForm .blockLabels .ctrlHolder{}
+
+.uniForm label,
+.uniForm .blockLabels label,
+.uniForm .blockLabels .label{ margin: 0 0 .5em 0; }
+
+.uniForm .textInput,
+.uniForm .blockLabels .textInput,
+.uniForm .blockLabels .fileUpload{ width: 43%; /* <- Required property */ }
+
+.uniForm .selectInput,
+.uniForm select,
+.uniForm .blockLabels .selectInput,
+.uniForm .blockLabels select{ width: 43.5%; /* <- Required property */ }
+.uniForm textarea,
+.uniForm .blockLabels textarea{ width: 43%; /* <- Required property */ height: 12em; }
+
+.uniForm .formHint,
+.uniForm .blockLabels .formHint{ width: 55%; /* <- Required property */ font-size: .9em; color: #777; position: relative; top: -.5em; }
+
+.uniForm .multiField,
+.uniForm .blockLabels .multiField{ width: 43%; }
+.uniForm .multiField .inlineLabel,
+.uniForm .blockLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .multiField .blockLabel,
+.uniForm .blockLabels .multiField .blockLabel{ width: 30%; margin: 0 10px 0 0; }
+.uniForm .multiField .blockLabel .textInput,
+.uniForm .multiField .blockLabel .selectInput,
+.uniForm .multiField .blockLabel select,
+.uniForm .blockLabels .multiField .blockLabel .textInput,
+.uniForm .blockLabels .multiField .blockLabel .selectInput,
+.uniForm .blockLabels .multiField .blockLabel select{ width: 100%; margin: .3em 0 0 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* .inlineLabels */
+.uniForm .inlineLabels .ctrlHolder{}
+
+.uniForm .inlineLabels label,
+.uniForm .inlineLabels .label{ width: 20%; /* <- Required property */ margin: .3em 2% 0 0; /* <- Required property */ }
+
+.uniForm .inlineLabels .textInput,
+.uniForm .inlineLabels .fileUpload{ width: 35%; /* <- Required property */ }
+
+.uniForm .inlineLabels .selectInput,
+.uniForm .inlineLabels select{ width: 35%; /* <- Required property */ }
+
+.uniForm .inlineLabels textarea{  width: 35%; /* <- Required property */ height: 12em; }
+
+.uniForm .inlineLabels .formHint{ margin-top: 0; margin-left: 22%; font-size: .9em; color: #777; position: static; }
+
+.uniForm .inlineLabels .multiField{ width: 60%; /* <- Required property */ margin: 0 0 .3em 0; }
+.uniForm .inlineLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .inlineLabels .multiField .blockLabel{ float: left; width: 26%; margin: 0 3% 0 0; }
+.uniForm .inlineLabels .multiField .blockLabel .textInput,
+.uniForm .inlineLabels .multiField .blockLabel .selectInput,
+.uniForm .inlineLabels .multiField .blockLabel select{ width: 100%; margin: .3em 0 0 0; }
+
+/* Focus pseudoclasses */
+.uniForm .ctrlHolder .textInput:focus{ outline: none; /* Get rid of the 'glow' effect in WebKit, optional */ }
+.uniForm .ctrlHolder textarea:focus{ outline: none; /* Get rid of the 'glow' effect in WebKit, optional */ }
+.uniForm div.focused .formHint{ color: #333; }
+
+/* Columns (they are floated left by default) */
+.uniForm .col{ width: 37.9%; /* <- Required property */ margin: 0 2% 20px 0; }
+/* Use .first and .last classes to control the layout/spacing of your columns */
+.uniForm .col.first{ width: 39%; /* <- Required property */ float: left; clear: none; }
+.uniForm .col.last{ width: 39%; /* <- Required property */ float: right; clear: none; margin-right: 0; }
+
+/* Messages */
+.uniForm #errorMsg, .confirmpassworderror{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }
+.uniForm .error{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; }
+
+.uniForm #errorMsg dt, .uniForm #errorMsg h3{ margin: 0 0 .5em 0; font-size: 100%; line-height: 100%; font-weight: bold; }
+.uniForm #errorMsg dd{ margin: 0; padding: 0; }
+.uniForm #errorMsg ol{ margin: 0; padding: 0; list-style:none;}
+.uniForm #errorMsg ol li{ margin: 0; padding: 2px; list-style-position: inside; border-bottom: 1px dotted #df7d7d; position: relative; }
+.uniForm .errorField{ color: #af4c4c; margin: 0 0 6px 0; padding: 4px; background: #ffbfbf; }
+
+.uniForm #OKMsg, .confirmpasswordok{ background: #C8FFBF; border: 1px solid #A2EF95; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }
+.uniForm #OKMsg p{ margin: 0; }
+
+/*
+IT IS STRONGLY ADVISED TO MAKE YOUR CHANGES AFTER THIS COMMENT BY REPEATING (COPYING) THE SELECTOR FROM ABOVE, 
+AND MODIFYING IT WITH YOUR OWN PROPERTIES/VALUES. THIS IS RECOMMENDED BECAUSE IF YOU HAPPEN TO RUN INTO TROUBLE, 
+YOU CAN VERY EASILY REVERT TO A GENERIC STYLE OF UNI-FORM. BEST OF LUCK... 
+*/
+
+/* ------------------------------------------------------------------------------ */
+
+/* This is the main unit that contains our form elements */
+
+.uniForm .textInput, .uniForm .selectInput, .uniForm textarea {
+    background:#FFFFFF none repeat scroll 0 0;
+    color: #000000;
+    border: 1px solid #DFDFDF;
+    padding: 1px;
+}
+
+/* jquery-ui-custom
+-------------------------------------------------------------- */
+.ui-datepicker-calendar thead tr th {
+    background-image:none;
+    background-color:#FFFFFF;
+    color:#000000;
+}
+.ui-widget { font-family: 'Trebuchet MS', Arial, sans-serif; font-size: 100%; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: 'Trebuchet MS', Arial, sans-serif; font-size: 100%; }
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/icons/flags_sprite.png b/interface/web/themes/default-v2/icons/flags_sprite.png
new file mode 100644
index 0000000..036a8aa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/flags_sprite.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept.png b/interface/web/themes/default-v2/icons/x12/accept.png
new file mode 100644
index 0000000..6a9f2e2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/accept.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept_blue.png b/interface/web/themes/default-v2/icons/x12/accept_blue.png
new file mode 100644
index 0000000..47ab08a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/accept_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept_green.png b/interface/web/themes/default-v2/icons/x12/accept_green.png
new file mode 100644
index 0000000..d5d5709
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/accept_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png b/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png
new file mode 100644
index 0000000..f52da18
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png b/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png
new file mode 100644
index 0000000..35fecf5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png b/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png
new file mode 100644
index 0000000..aac963c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png b/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png
new file mode 100644
index 0000000..71f5dd9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/article.png b/interface/web/themes/default-v2/icons/x12/article.png
new file mode 100644
index 0000000..276094e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/article.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/article_text.png b/interface/web/themes/default-v2/icons/x12/article_text.png
new file mode 100644
index 0000000..dbc47e5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/article_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/bar_graph.png b/interface/web/themes/default-v2/icons/x12/bar_graph.png
new file mode 100644
index 0000000..7df4a34
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/bar_graph.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/burst.png b/interface/web/themes/default-v2/icons/x12/burst.png
new file mode 100644
index 0000000..2dfc873
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/burst.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/calendar.png b/interface/web/themes/default-v2/icons/x12/calendar.png
new file mode 100644
index 0000000..56ea24c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/calendar.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/calendar2.png b/interface/web/themes/default-v2/icons/x12/calendar2.png
new file mode 100644
index 0000000..e82b316
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/calendar2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/cancel.png b/interface/web/themes/default-v2/icons/x12/cancel.png
new file mode 100644
index 0000000..bff763a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/cancel.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/cancel_round.png b/interface/web/themes/default-v2/icons/x12/cancel_round.png
new file mode 100644
index 0000000..803532c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/cancel_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/clock.png b/interface/web/themes/default-v2/icons/x12/clock.png
new file mode 100644
index 0000000..589bd94
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/clock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/code.png b/interface/web/themes/default-v2/icons/x12/code.png
new file mode 100644
index 0000000..fc2b05f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/code.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/comment_blue.png b/interface/web/themes/default-v2/icons/x12/comment_blue.png
new file mode 100644
index 0000000..248ddb6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/comment_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/dollar.png b/interface/web/themes/default-v2/icons/x12/dollar.png
new file mode 100644
index 0000000..223f3bd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/dollar.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/double_comment.png b/interface/web/themes/default-v2/icons/x12/double_comment.png
new file mode 100644
index 0000000..21262ec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/double_comment.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/download.png b/interface/web/themes/default-v2/icons/x12/download.png
new file mode 100644
index 0000000..3866bb2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/download.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/envelope.png b/interface/web/themes/default-v2/icons/x12/envelope.png
new file mode 100644
index 0000000..5b48a00
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/envelope.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_black.png b/interface/web/themes/default-v2/icons/x12/flag_black.png
new file mode 100644
index 0000000..66464de
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_blue.png b/interface/web/themes/default-v2/icons/x12/flag_blue.png
new file mode 100644
index 0000000..4ced1c2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_green.png b/interface/web/themes/default-v2/icons/x12/flag_green.png
new file mode 100644
index 0000000..d9fe8e4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_orange.png b/interface/web/themes/default-v2/icons/x12/flag_orange.png
new file mode 100644
index 0000000..a2b1090
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_orange.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_red.png b/interface/web/themes/default-v2/icons/x12/flag_red.png
new file mode 100644
index 0000000..a6b6839
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_yellow.png b/interface/web/themes/default-v2/icons/x12/flag_yellow.png
new file mode 100644
index 0000000..e197045
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/flag_yellow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/folder.png b/interface/web/themes/default-v2/icons/x12/folder.png
new file mode 100644
index 0000000..92c08ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/folder.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/info.png b/interface/web/themes/default-v2/icons/x12/info.png
new file mode 100644
index 0000000..150c5cb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/info.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/link.png b/interface/web/themes/default-v2/icons/x12/link.png
new file mode 100644
index 0000000..1e7eb87
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/link.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/lock.png b/interface/web/themes/default-v2/icons/x12/lock.png
new file mode 100644
index 0000000..33a24b6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/lock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/magnify.png b/interface/web/themes/default-v2/icons/x12/magnify.png
new file mode 100644
index 0000000..730675e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/magnify.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/minus.png b/interface/web/themes/default-v2/icons/x12/minus.png
new file mode 100644
index 0000000..a76b0e2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/minus_round.png b/interface/web/themes/default-v2/icons/x12/minus_round.png
new file mode 100644
index 0000000..3d84805
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/minus_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/money.png b/interface/web/themes/default-v2/icons/x12/money.png
new file mode 100644
index 0000000..6deb575
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/money.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/new.png b/interface/web/themes/default-v2/icons/x12/new.png
new file mode 100644
index 0000000..49bf82c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/new.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/pencil.png b/interface/web/themes/default-v2/icons/x12/pencil.png
new file mode 100644
index 0000000..6bfdad4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/pictures.png b/interface/web/themes/default-v2/icons/x12/pictures.png
new file mode 100644
index 0000000..0478e95
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/pictures.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/plus.png b/interface/web/themes/default-v2/icons/x12/plus.png
new file mode 100644
index 0000000..e3afb66
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/printer.png b/interface/web/themes/default-v2/icons/x12/printer.png
new file mode 100644
index 0000000..b3fc25f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/printer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/question_blue.png b/interface/web/themes/default-v2/icons/x12/question_blue.png
new file mode 100644
index 0000000..97c006b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/question_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/refresh.png b/interface/web/themes/default-v2/icons/x12/refresh.png
new file mode 100644
index 0000000..5c76d9b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/refresh.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/rss.png b/interface/web/themes/default-v2/icons/x12/rss.png
new file mode 100644
index 0000000..e918050
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/rss.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/rss_round.png b/interface/web/themes/default-v2/icons/x12/rss_round.png
new file mode 100644
index 0000000..c436887
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/rss_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_green.png b/interface/web/themes/default-v2/icons/x12/security_green.png
new file mode 100644
index 0000000..f681815
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/security_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_orange.png b/interface/web/themes/default-v2/icons/x12/security_orange.png
new file mode 100644
index 0000000..d1ba672
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/security_orange.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_red.png b/interface/web/themes/default-v2/icons/x12/security_red.png
new file mode 100644
index 0000000..d2f1bae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/security_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/star.png b/interface/web/themes/default-v2/icons/x12/star.png
new file mode 100644
index 0000000..77cbacd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/star.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/star_blue.png b/interface/web/themes/default-v2/icons/x12/star_blue.png
new file mode 100644
index 0000000..5bb59df
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/star_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/stop.png b/interface/web/themes/default-v2/icons/x12/stop.png
new file mode 100644
index 0000000..86a01e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/stop.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/stop_round.png b/interface/web/themes/default-v2/icons/x12/stop_round.png
new file mode 100644
index 0000000..5c9963e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/stop_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/upload.png b/interface/web/themes/default-v2/icons/x12/upload.png
new file mode 100644
index 0000000..b1810b3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/upload.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/world.png b/interface/web/themes/default-v2/icons/x12/world.png
new file mode 100644
index 0000000..b7f9a8e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/world.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x12/world2.png b/interface/web/themes/default-v2/icons/x12/world2.png
new file mode 100644
index 0000000..2855f3b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x12/world2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept.png b/interface/web/themes/default-v2/icons/x16-list/accept.png
new file mode 100644
index 0000000..b0f5604
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/accept.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept_blue.png b/interface/web/themes/default-v2/icons/x16-list/accept_blue.png
new file mode 100644
index 0000000..1286148
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/accept_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept_green.png b/interface/web/themes/default-v2/icons/x16-list/accept_green.png
new file mode 100644
index 0000000..043e5c6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/accept_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png
new file mode 100644
index 0000000..517ee8e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png
new file mode 100644
index 0000000..14de6fe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png
new file mode 100644
index 0000000..44f7ea8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png
new file mode 100644
index 0000000..e321918
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/article.png b/interface/web/themes/default-v2/icons/x16-list/article.png
new file mode 100644
index 0000000..6beaafc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/article.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/article_text.png b/interface/web/themes/default-v2/icons/x16-list/article_text.png
new file mode 100644
index 0000000..6e0b9de
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/article_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/bar_graph.png b/interface/web/themes/default-v2/icons/x16-list/bar_graph.png
new file mode 100644
index 0000000..31920e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/bar_graph.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/burst.png b/interface/web/themes/default-v2/icons/x16-list/burst.png
new file mode 100644
index 0000000..dd9ddd6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/burst.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/calendar.png b/interface/web/themes/default-v2/icons/x16-list/calendar.png
new file mode 100644
index 0000000..f278eb3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/calendar.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/calendar2.png b/interface/web/themes/default-v2/icons/x16-list/calendar2.png
new file mode 100644
index 0000000..b121c78
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/calendar2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/cancel.png b/interface/web/themes/default-v2/icons/x16-list/cancel.png
new file mode 100644
index 0000000..0d40cc6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/cancel.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/cancel_round.png b/interface/web/themes/default-v2/icons/x16-list/cancel_round.png
new file mode 100644
index 0000000..a987e30
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/cancel_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/clock.png b/interface/web/themes/default-v2/icons/x16-list/clock.png
new file mode 100644
index 0000000..f770a9c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/clock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/code.png b/interface/web/themes/default-v2/icons/x16-list/code.png
new file mode 100644
index 0000000..3791cb5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/code.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/comment_blue.png b/interface/web/themes/default-v2/icons/x16-list/comment_blue.png
new file mode 100644
index 0000000..8bc780f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/comment_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/dollar.png b/interface/web/themes/default-v2/icons/x16-list/dollar.png
new file mode 100644
index 0000000..a8a2b53
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/dollar.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/double_comment.png b/interface/web/themes/default-v2/icons/x16-list/double_comment.png
new file mode 100644
index 0000000..574729c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/double_comment.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/download.png b/interface/web/themes/default-v2/icons/x16-list/download.png
new file mode 100644
index 0000000..2a4ec44
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/download.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/envelope.png b/interface/web/themes/default-v2/icons/x16-list/envelope.png
new file mode 100644
index 0000000..a98b125
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/envelope.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_black.png b/interface/web/themes/default-v2/icons/x16-list/flag_black.png
new file mode 100644
index 0000000..0b453a5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_blue.png b/interface/web/themes/default-v2/icons/x16-list/flag_blue.png
new file mode 100644
index 0000000..3e36092
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_green.png b/interface/web/themes/default-v2/icons/x16-list/flag_green.png
new file mode 100644
index 0000000..ac6bfb8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_orange.png b/interface/web/themes/default-v2/icons/x16-list/flag_orange.png
new file mode 100644
index 0000000..639cdfc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_orange.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_red.png b/interface/web/themes/default-v2/icons/x16-list/flag_red.png
new file mode 100644
index 0000000..08a5ea5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png b/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png
new file mode 100644
index 0000000..bf13782
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/folder.png b/interface/web/themes/default-v2/icons/x16-list/folder.png
new file mode 100644
index 0000000..1327b54
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/folder.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/info.png b/interface/web/themes/default-v2/icons/x16-list/info.png
new file mode 100644
index 0000000..da02eae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/info.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/link.png b/interface/web/themes/default-v2/icons/x16-list/link.png
new file mode 100644
index 0000000..10df4ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/link.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/lock.png b/interface/web/themes/default-v2/icons/x16-list/lock.png
new file mode 100644
index 0000000..5c53ec5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/lock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/magnify.png b/interface/web/themes/default-v2/icons/x16-list/magnify.png
new file mode 100644
index 0000000..4c47b23
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/magnify.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/minus.png b/interface/web/themes/default-v2/icons/x16-list/minus.png
new file mode 100644
index 0000000..be99e5b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/minus_round.png b/interface/web/themes/default-v2/icons/x16-list/minus_round.png
new file mode 100644
index 0000000..e246f11
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/minus_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/money.png b/interface/web/themes/default-v2/icons/x16-list/money.png
new file mode 100644
index 0000000..915c983
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/money.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/new.png b/interface/web/themes/default-v2/icons/x16-list/new.png
new file mode 100644
index 0000000..89d4487
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/new.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/pencil.png b/interface/web/themes/default-v2/icons/x16-list/pencil.png
new file mode 100644
index 0000000..f134056
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/pictures.png b/interface/web/themes/default-v2/icons/x16-list/pictures.png
new file mode 100644
index 0000000..948ad9e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/pictures.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/plus.png b/interface/web/themes/default-v2/icons/x16-list/plus.png
new file mode 100644
index 0000000..0c34353
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/printer.png b/interface/web/themes/default-v2/icons/x16-list/printer.png
new file mode 100644
index 0000000..fe36260
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/printer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/question_blue.png b/interface/web/themes/default-v2/icons/x16-list/question_blue.png
new file mode 100644
index 0000000..1f5b360
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/question_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/refresh.png b/interface/web/themes/default-v2/icons/x16-list/refresh.png
new file mode 100644
index 0000000..a63077d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/refresh.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/rss.png b/interface/web/themes/default-v2/icons/x16-list/rss.png
new file mode 100644
index 0000000..b35840d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/rss.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/rss_round.png b/interface/web/themes/default-v2/icons/x16-list/rss_round.png
new file mode 100644
index 0000000..27ce67d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/rss_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_green.png b/interface/web/themes/default-v2/icons/x16-list/security_green.png
new file mode 100644
index 0000000..38afbbb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/security_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_orange.png b/interface/web/themes/default-v2/icons/x16-list/security_orange.png
new file mode 100644
index 0000000..4c5bad7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/security_orange.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_red.png b/interface/web/themes/default-v2/icons/x16-list/security_red.png
new file mode 100644
index 0000000..c469be0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/security_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/star.png b/interface/web/themes/default-v2/icons/x16-list/star.png
new file mode 100644
index 0000000..70a227c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/star.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/star_blue.png b/interface/web/themes/default-v2/icons/x16-list/star_blue.png
new file mode 100644
index 0000000..c49e74b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/star_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/stop.png b/interface/web/themes/default-v2/icons/x16-list/stop.png
new file mode 100644
index 0000000..65fa261
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/stop.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/stop_round.png b/interface/web/themes/default-v2/icons/x16-list/stop_round.png
new file mode 100644
index 0000000..4cc2852
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/stop_round.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/upload.png b/interface/web/themes/default-v2/icons/x16-list/upload.png
new file mode 100644
index 0000000..e45598e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/upload.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/world.png b/interface/web/themes/default-v2/icons/x16-list/world.png
new file mode 100644
index 0000000..a94d9a6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/world.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/world2.png b/interface/web/themes/default-v2/icons/x16-list/world2.png
new file mode 100644
index 0000000..58e7e6e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16-list/world2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book.png b/interface/web/themes/default-v2/icons/x16/address_book.png
new file mode 100644
index 0000000..923e0bc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__arrow.png b/interface/web/themes/default-v2/icons/x16/address_book__arrow.png
new file mode 100644
index 0000000..0af9c50
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png b/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png
new file mode 100644
index 0000000..abd5fa9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__minus.png b/interface/web/themes/default-v2/icons/x16/address_book__minus.png
new file mode 100644
index 0000000..1fb9982
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__pencil.png b/interface/web/themes/default-v2/icons/x16/address_book__pencil.png
new file mode 100644
index 0000000..d56768d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__plus.png b/interface/web/themes/default-v2/icons/x16/address_book__plus.png
new file mode 100644
index 0000000..af396b4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book_blue.png b/interface/web/themes/default-v2/icons/x16/address_book_blue.png
new file mode 100644
index 0000000..6f855e7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/address_book_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow.png b/interface/web/themes/default-v2/icons/x16/arrow.png
new file mode 100644
index 0000000..82cfae3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_000_small.png b/interface/web/themes/default-v2/icons/x16/arrow_000_small.png
new file mode 100644
index 0000000..02867c8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_000_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_045.png b/interface/web/themes/default-v2/icons/x16/arrow_045.png
new file mode 100644
index 0000000..6dbd516
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_045.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_045_small.png b/interface/web/themes/default-v2/icons/x16/arrow_045_small.png
new file mode 100644
index 0000000..2d85069
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_045_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_090.png b/interface/web/themes/default-v2/icons/x16/arrow_090.png
new file mode 100644
index 0000000..7e670dd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_090.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_090_small.png b/interface/web/themes/default-v2/icons/x16/arrow_090_small.png
new file mode 100644
index 0000000..cd82139
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_090_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_135.png b/interface/web/themes/default-v2/icons/x16/arrow_135.png
new file mode 100644
index 0000000..a0882c2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_135.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_135_small.png b/interface/web/themes/default-v2/icons/x16/arrow_135_small.png
new file mode 100644
index 0000000..b51c5c6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_135_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_180.png b/interface/web/themes/default-v2/icons/x16/arrow_180.png
new file mode 100644
index 0000000..a1e5e6b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_180.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_180_small.png b/interface/web/themes/default-v2/icons/x16/arrow_180_small.png
new file mode 100644
index 0000000..431b838
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_180_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_225.png b/interface/web/themes/default-v2/icons/x16/arrow_225.png
new file mode 100644
index 0000000..1d5c216
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_225.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_225_small.png b/interface/web/themes/default-v2/icons/x16/arrow_225_small.png
new file mode 100644
index 0000000..f082991
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_225_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_270.png b/interface/web/themes/default-v2/icons/x16/arrow_270.png
new file mode 100644
index 0000000..bc00395
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_270.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_270_small.png b/interface/web/themes/default-v2/icons/x16/arrow_270_small.png
new file mode 100644
index 0000000..4971995
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_270_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_315.png b/interface/web/themes/default-v2/icons/x16/arrow_315.png
new file mode 100644
index 0000000..fab81cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_315.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_315_small.png b/interface/web/themes/default-v2/icons/x16/arrow_315_small.png
new file mode 100644
index 0000000..868724a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_315_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle.png b/interface/web/themes/default-v2/icons/x16/arrow_circle.png
new file mode 100644
index 0000000..8087eea
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png
new file mode 100644
index 0000000..5ddb81b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png
new file mode 100644
index 0000000..3bec0d1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png
new file mode 100644
index 0000000..7a4f23e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png
new file mode 100644
index 0000000..47eafce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png
new file mode 100644
index 0000000..289419c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip.png b/interface/web/themes/default-v2/icons/x16/arrow_skip.png
new file mode 100644
index 0000000..860332d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_skip.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png
new file mode 100644
index 0000000..2138dfd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png
new file mode 100644
index 0000000..1d06129
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png
new file mode 100644
index 0000000..3c37e6e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop.png b/interface/web/themes/default-v2/icons/x16/arrow_stop.png
new file mode 100644
index 0000000..702b9b7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_stop.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png
new file mode 100644
index 0000000..3f65f5c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png
new file mode 100644
index 0000000..573ff48
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png
new file mode 100644
index 0000000..ebb649f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer.png b/interface/web/themes/default-v2/icons/x16/auction_hammer.png
new file mode 100644
index 0000000..be94131
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png
new file mode 100644
index 0000000..199bc64
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png
new file mode 100644
index 0000000..0f44985
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png
new file mode 100644
index 0000000..70ddbec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png
new file mode 100644
index 0000000..ac7a9c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png
new file mode 100644
index 0000000..587f556
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png b/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png
new file mode 100644
index 0000000..ee46a7e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon.png b/interface/web/themes/default-v2/icons/x16/balloon.png
new file mode 100644
index 0000000..c3f88a0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__arrow.png b/interface/web/themes/default-v2/icons/x16/balloon__arrow.png
new file mode 100644
index 0000000..a3e2a7f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png b/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png
new file mode 100644
index 0000000..102e2cc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__minus.png b/interface/web/themes/default-v2/icons/x16/balloon__minus.png
new file mode 100644
index 0000000..2aa4cd9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__pencil.png b/interface/web/themes/default-v2/icons/x16/balloon__pencil.png
new file mode 100644
index 0000000..d835dc0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__plus.png b/interface/web/themes/default-v2/icons/x16/balloon__plus.png
new file mode 100644
index 0000000..d171b9b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_left.png b/interface/web/themes/default-v2/icons/x16/balloon_left.png
new file mode 100644
index 0000000..da8c32b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon_left.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_small.png b/interface/web/themes/default-v2/icons/x16/balloon_small.png
new file mode 100644
index 0000000..f92545e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_small_left.png b/interface/web/themes/default-v2/icons/x16/balloon_small_left.png
new file mode 100644
index 0000000..34a1c02
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloon_small_left.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons.png b/interface/web/themes/default-v2/icons/x16/balloons.png
new file mode 100644
index 0000000..4508686
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_arrow.png b/interface/web/themes/default-v2/icons/x16/balloons_arrow.png
new file mode 100644
index 0000000..15a3210
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png b/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png
new file mode 100644
index 0000000..3dbec2e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_minus.png b/interface/web/themes/default-v2/icons/x16/balloons_minus.png
new file mode 100644
index 0000000..2af8dd3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_pencil.png b/interface/web/themes/default-v2/icons/x16/balloons_pencil.png
new file mode 100644
index 0000000..8f6db51
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_plus.png b/interface/web/themes/default-v2/icons/x16/balloons_plus.png
new file mode 100644
index 0000000..e14e8c2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/balloons_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid.png b/interface/web/themes/default-v2/icons/x16/bandaid.png
new file mode 100644
index 0000000..05e02f6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png b/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png
new file mode 100644
index 0000000..1fab589
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png b/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png
new file mode 100644
index 0000000..5fc2d8b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_minus.png b/interface/web/themes/default-v2/icons/x16/bandaid_minus.png
new file mode 100644
index 0000000..1a78423
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png b/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png
new file mode 100644
index 0000000..9d7f08c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_plus.png b/interface/web/themes/default-v2/icons/x16/bandaid_plus.png
new file mode 100644
index 0000000..3da2d46
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_small.png b/interface/web/themes/default-v2/icons/x16/bandaid_small.png
new file mode 100644
index 0000000..30ad6ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bandaid_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank.png b/interface/web/themes/default-v2/icons/x16/bank.png
new file mode 100644
index 0000000..7f7d646
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_arrow.png b/interface/web/themes/default-v2/icons/x16/bank_arrow.png
new file mode 100644
index 0000000..ad30c35
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_exclamation.png b/interface/web/themes/default-v2/icons/x16/bank_exclamation.png
new file mode 100644
index 0000000..10bf86c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_minus.png b/interface/web/themes/default-v2/icons/x16/bank_minus.png
new file mode 100644
index 0000000..0edcebc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_pencil.png b/interface/web/themes/default-v2/icons/x16/bank_pencil.png
new file mode 100644
index 0000000..1e98dfc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_plus.png b/interface/web/themes/default-v2/icons/x16/bank_plus.png
new file mode 100644
index 0000000..17a55d1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bank_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell.png b/interface/web/themes/default-v2/icons/x16/bell.png
new file mode 100644
index 0000000..3be57e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__arrow.png b/interface/web/themes/default-v2/icons/x16/bell__arrow.png
new file mode 100644
index 0000000..82ff8a9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__exclamation.png b/interface/web/themes/default-v2/icons/x16/bell__exclamation.png
new file mode 100644
index 0000000..2eddd3d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__minus.png b/interface/web/themes/default-v2/icons/x16/bell__minus.png
new file mode 100644
index 0000000..7b50d72
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__pencil.png b/interface/web/themes/default-v2/icons/x16/bell__pencil.png
new file mode 100644
index 0000000..71e06cf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__plus.png b/interface/web/themes/default-v2/icons/x16/bell__plus.png
new file mode 100644
index 0000000..655a29e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell_disable.png b/interface/web/themes/default-v2/icons/x16/bell_disable.png
new file mode 100644
index 0000000..acff16b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bell_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin.png b/interface/web/themes/default-v2/icons/x16/bin.png
new file mode 100644
index 0000000..7fe9880
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__arrow.png b/interface/web/themes/default-v2/icons/x16/bin__arrow.png
new file mode 100644
index 0000000..1191c51
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__exclamation.png b/interface/web/themes/default-v2/icons/x16/bin__exclamation.png
new file mode 100644
index 0000000..d87347e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__minus.png b/interface/web/themes/default-v2/icons/x16/bin__minus.png
new file mode 100644
index 0000000..8c70f25
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__pencil.png b/interface/web/themes/default-v2/icons/x16/bin__pencil.png
new file mode 100644
index 0000000..0f7a531
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__plus.png b/interface/web/themes/default-v2/icons/x16/bin__plus.png
new file mode 100644
index 0000000..1b1a05c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin_full.png b/interface/web/themes/default-v2/icons/x16/bin_full.png
new file mode 100644
index 0000000..463c7d6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bin_full.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular.png b/interface/web/themes/default-v2/icons/x16/binocular.png
new file mode 100644
index 0000000..8279f45
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_arrow.png b/interface/web/themes/default-v2/icons/x16/binocular_arrow.png
new file mode 100644
index 0000000..dead761
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png b/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png
new file mode 100644
index 0000000..1c7550c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_minus.png b/interface/web/themes/default-v2/icons/x16/binocular_minus.png
new file mode 100644
index 0000000..63cd024
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_pencil.png b/interface/web/themes/default-v2/icons/x16/binocular_pencil.png
new file mode 100644
index 0000000..a9c8ac1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_plus.png b/interface/web/themes/default-v2/icons/x16/binocular_plus.png
new file mode 100644
index 0000000..ac0184d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/binocular_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog.png b/interface/web/themes/default-v2/icons/x16/blog.png
new file mode 100644
index 0000000..09267a2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__arrow.png b/interface/web/themes/default-v2/icons/x16/blog__arrow.png
new file mode 100644
index 0000000..500ec14
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__exclamation.png b/interface/web/themes/default-v2/icons/x16/blog__exclamation.png
new file mode 100644
index 0000000..b7a4007
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__minus.png b/interface/web/themes/default-v2/icons/x16/blog__minus.png
new file mode 100644
index 0000000..e02d945
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__pencil.png b/interface/web/themes/default-v2/icons/x16/blog__pencil.png
new file mode 100644
index 0000000..ec5a3b2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__plus.png b/interface/web/themes/default-v2/icons/x16/blog__plus.png
new file mode 100644
index 0000000..4efa66d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog_blue.png b/interface/web/themes/default-v2/icons/x16/blog_blue.png
new file mode 100644
index 0000000..3a7b216
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blog_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs.png b/interface/web/themes/default-v2/icons/x16/blogs.png
new file mode 100644
index 0000000..6539158
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_arrow.png b/interface/web/themes/default-v2/icons/x16/blogs_arrow.png
new file mode 100644
index 0000000..6d7b0ff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png b/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png
new file mode 100644
index 0000000..7983deb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_minus.png b/interface/web/themes/default-v2/icons/x16/blogs_minus.png
new file mode 100644
index 0000000..3493ff6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_pencil.png b/interface/web/themes/default-v2/icons/x16/blogs_pencil.png
new file mode 100644
index 0000000..d06dd1c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_plus.png b/interface/web/themes/default-v2/icons/x16/blogs_plus.png
new file mode 100644
index 0000000..c482665
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_stack.png b/interface/web/themes/default-v2/icons/x16/blogs_stack.png
new file mode 100644
index 0000000..e568c07
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/blogs_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book.png b/interface/web/themes/default-v2/icons/x16/book.png
new file mode 100644
index 0000000..6d4bf18
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__arrow.png b/interface/web/themes/default-v2/icons/x16/book__arrow.png
new file mode 100644
index 0000000..6a66b4e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__exclamation.png b/interface/web/themes/default-v2/icons/x16/book__exclamation.png
new file mode 100644
index 0000000..3bd34df
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__minus.png b/interface/web/themes/default-v2/icons/x16/book__minus.png
new file mode 100644
index 0000000..305ca0c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__pencil.png b/interface/web/themes/default-v2/icons/x16/book__pencil.png
new file mode 100644
index 0000000..c045fc8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__plus.png b/interface/web/themes/default-v2/icons/x16/book__plus.png
new file mode 100644
index 0000000..23260e5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_brown.png b/interface/web/themes/default-v2/icons/x16/book_brown.png
new file mode 100644
index 0000000..b7ba58f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book_brown.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_small.png b/interface/web/themes/default-v2/icons/x16/book_small.png
new file mode 100644
index 0000000..298d6b3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_small_brown.png b/interface/web/themes/default-v2/icons/x16/book_small_brown.png
new file mode 100644
index 0000000..9d5acf2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/book_small_brown.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark.png b/interface/web/themes/default-v2/icons/x16/bookmark.png
new file mode 100644
index 0000000..6bb98fd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png
new file mode 100644
index 0000000..5cc6e5b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png
new file mode 100644
index 0000000..288af86
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__minus.png b/interface/web/themes/default-v2/icons/x16/bookmark__minus.png
new file mode 100644
index 0000000..e368703
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png
new file mode 100644
index 0000000..55b4281
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__plus.png b/interface/web/themes/default-v2/icons/x16/bookmark__plus.png
new file mode 100644
index 0000000..51978f1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__small.png b/interface/web/themes/default-v2/icons/x16/bookmark__small.png
new file mode 100644
index 0000000..f3a92cb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark__small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book.png b/interface/web/themes/default-v2/icons/x16/bookmark_book.png
new file mode 100644
index 0000000..cf55d20
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png
new file mode 100644
index 0000000..7d0f980
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png
new file mode 100644
index 0000000..656a504
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png
new file mode 100644
index 0000000..2f73608
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png
new file mode 100644
index 0000000..2049797
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png
new file mode 100644
index 0000000..d1eae35
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document.png b/interface/web/themes/default-v2/icons/x16/bookmark_document.png
new file mode 100644
index 0000000..fa8cc9b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png
new file mode 100644
index 0000000..0822258
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png
new file mode 100644
index 0000000..9d34e49
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png
new file mode 100644
index 0000000..548690a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png
new file mode 100644
index 0000000..63c0709
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png
new file mode 100644
index 0000000..479c744
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder.png
new file mode 100644
index 0000000..bd24879
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png
new file mode 100644
index 0000000..ca8fcc7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png
new file mode 100644
index 0000000..4c87cd3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png
new file mode 100644
index 0000000..2ec8edb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png
new file mode 100644
index 0000000..d45d29c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png
new file mode 100644
index 0000000..45dc2e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books.png b/interface/web/themes/default-v2/icons/x16/books.png
new file mode 100644
index 0000000..d7d6eac
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__arrow.png b/interface/web/themes/default-v2/icons/x16/books__arrow.png
new file mode 100644
index 0000000..219ae0b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__exclamation.png b/interface/web/themes/default-v2/icons/x16/books__exclamation.png
new file mode 100644
index 0000000..f78c16e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__minus.png b/interface/web/themes/default-v2/icons/x16/books__minus.png
new file mode 100644
index 0000000..6da011f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__pencil.png b/interface/web/themes/default-v2/icons/x16/books__pencil.png
new file mode 100644
index 0000000..f1a57ed
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__plus.png b/interface/web/themes/default-v2/icons/x16/books__plus.png
new file mode 100644
index 0000000..82e1063
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books_brown.png b/interface/web/themes/default-v2/icons/x16/books_brown.png
new file mode 100644
index 0000000..4fb21ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books_brown.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/books_stack.png b/interface/web/themes/default-v2/icons/x16/books_stack.png
new file mode 100644
index 0000000..fb525bd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/books_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box.png b/interface/web/themes/default-v2/icons/x16/box.png
new file mode 100644
index 0000000..b1adc11
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__arrow.png b/interface/web/themes/default-v2/icons/x16/box__arrow.png
new file mode 100644
index 0000000..fda5bd7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__exclamation.png b/interface/web/themes/default-v2/icons/x16/box__exclamation.png
new file mode 100644
index 0000000..80aea43
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__minus.png b/interface/web/themes/default-v2/icons/x16/box__minus.png
new file mode 100644
index 0000000..a8fae85
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__pencil.png b/interface/web/themes/default-v2/icons/x16/box__pencil.png
new file mode 100644
index 0000000..9652a2c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__plus.png b/interface/web/themes/default-v2/icons/x16/box__plus.png
new file mode 100644
index 0000000..f8c4f9a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/box_label.png b/interface/web/themes/default-v2/icons/x16/box_label.png
new file mode 100644
index 0000000..c6da8f8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/box_label.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase.png b/interface/web/themes/default-v2/icons/x16/briefcase.png
new file mode 100644
index 0000000..7d3ffca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png b/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png
new file mode 100644
index 0000000..0b4927f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png b/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png
new file mode 100644
index 0000000..19e31d7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_minus.png b/interface/web/themes/default-v2/icons/x16/briefcase_minus.png
new file mode 100644
index 0000000..f84335b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png b/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png
new file mode 100644
index 0000000..67e66ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_plus.png b/interface/web/themes/default-v2/icons/x16/briefcase_plus.png
new file mode 100644
index 0000000..24e67f9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/briefcase_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom.png b/interface/web/themes/default-v2/icons/x16/broom.png
new file mode 100644
index 0000000..97daf85
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_arrow.png b/interface/web/themes/default-v2/icons/x16/broom_arrow.png
new file mode 100644
index 0000000..574f7b1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_exclamation.png b/interface/web/themes/default-v2/icons/x16/broom_exclamation.png
new file mode 100644
index 0000000..0c355f8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_minus.png b/interface/web/themes/default-v2/icons/x16/broom_minus.png
new file mode 100644
index 0000000..430cf64
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_pencil.png b/interface/web/themes/default-v2/icons/x16/broom_pencil.png
new file mode 100644
index 0000000..97c90cf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_plus.png b/interface/web/themes/default-v2/icons/x16/broom_plus.png
new file mode 100644
index 0000000..402e0e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/broom_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator.png b/interface/web/themes/default-v2/icons/x16/calculator.png
new file mode 100644
index 0000000..d1782c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_arrow.png b/interface/web/themes/default-v2/icons/x16/calculator_arrow.png
new file mode 100644
index 0000000..184f016
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png b/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png
new file mode 100644
index 0000000..2468be5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_minus.png b/interface/web/themes/default-v2/icons/x16/calculator_minus.png
new file mode 100644
index 0000000..e3c8b40
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_pencil.png b/interface/web/themes/default-v2/icons/x16/calculator_pencil.png
new file mode 100644
index 0000000..b3665e9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_plus.png b/interface/web/themes/default-v2/icons/x16/calculator_plus.png
new file mode 100644
index 0000000..c833693
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calculator_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar.png b/interface/web/themes/default-v2/icons/x16/calendar.png
new file mode 100644
index 0000000..7f38cfe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__arrow.png b/interface/web/themes/default-v2/icons/x16/calendar__arrow.png
new file mode 100644
index 0000000..f98abd5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png b/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png
new file mode 100644
index 0000000..103e9cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__minus.png b/interface/web/themes/default-v2/icons/x16/calendar__minus.png
new file mode 100644
index 0000000..c9a9885
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__pencil.png b/interface/web/themes/default-v2/icons/x16/calendar__pencil.png
new file mode 100644
index 0000000..946554d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__plus.png b/interface/web/themes/default-v2/icons/x16/calendar__plus.png
new file mode 100644
index 0000000..84dddb8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar_day.png b/interface/web/themes/default-v2/icons/x16/calendar_day.png
new file mode 100644
index 0000000..ea7f247
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar_day.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar_month.png b/interface/web/themes/default-v2/icons/x16/calendar_month.png
new file mode 100644
index 0000000..1f3d944
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/calendar_month.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera.png b/interface/web/themes/default-v2/icons/x16/camera.png
new file mode 100644
index 0000000..a828599
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__arrow.png b/interface/web/themes/default-v2/icons/x16/camera__arrow.png
new file mode 100644
index 0000000..61c488d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__exclamation.png b/interface/web/themes/default-v2/icons/x16/camera__exclamation.png
new file mode 100644
index 0000000..1ba77c5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__minus.png b/interface/web/themes/default-v2/icons/x16/camera__minus.png
new file mode 100644
index 0000000..ed506c6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__pencil.png b/interface/web/themes/default-v2/icons/x16/camera__pencil.png
new file mode 100644
index 0000000..0611e47
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__plus.png b/interface/web/themes/default-v2/icons/x16/camera__plus.png
new file mode 100644
index 0000000..f3ba46a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_black.png b/interface/web/themes/default-v2/icons/x16/camera_black.png
new file mode 100644
index 0000000..4d7c826
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_small.png b/interface/web/themes/default-v2/icons/x16/camera_small.png
new file mode 100644
index 0000000..af9fb75
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_small_black.png b/interface/web/themes/default-v2/icons/x16/camera_small_black.png
new file mode 100644
index 0000000..a8ba67e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/camera_small_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card.png b/interface/web/themes/default-v2/icons/x16/card.png
new file mode 100644
index 0000000..243caab
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__arrow.png b/interface/web/themes/default-v2/icons/x16/card__arrow.png
new file mode 100644
index 0000000..f97d856
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__exclamation.png b/interface/web/themes/default-v2/icons/x16/card__exclamation.png
new file mode 100644
index 0000000..7d51346
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__minus.png b/interface/web/themes/default-v2/icons/x16/card__minus.png
new file mode 100644
index 0000000..6711e6f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__pencil.png b/interface/web/themes/default-v2/icons/x16/card__pencil.png
new file mode 100644
index 0000000..8a2ab20
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__plus.png b/interface/web/themes/default-v2/icons/x16/card__plus.png
new file mode 100644
index 0000000..817995b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card_address.png b/interface/web/themes/default-v2/icons/x16/card_address.png
new file mode 100644
index 0000000..0ab99a1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card_address.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/card_small.png b/interface/web/themes/default-v2/icons/x16/card_small.png
new file mode 100644
index 0000000..a122163
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/card_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards.png b/interface/web/themes/default-v2/icons/x16/cards.png
new file mode 100644
index 0000000..eb20f4a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__arrow.png b/interface/web/themes/default-v2/icons/x16/cards__arrow.png
new file mode 100644
index 0000000..10015f2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__exclamation.png b/interface/web/themes/default-v2/icons/x16/cards__exclamation.png
new file mode 100644
index 0000000..add6f0d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__minus.png b/interface/web/themes/default-v2/icons/x16/cards__minus.png
new file mode 100644
index 0000000..f9188b2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__pencil.png b/interface/web/themes/default-v2/icons/x16/cards__pencil.png
new file mode 100644
index 0000000..b160038
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__plus.png b/interface/web/themes/default-v2/icons/x16/cards__plus.png
new file mode 100644
index 0000000..d078c6b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards_address.png b/interface/web/themes/default-v2/icons/x16/cards_address.png
new file mode 100644
index 0000000..f76d171
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards_address.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards_stack.png b/interface/web/themes/default-v2/icons/x16/cards_stack.png
new file mode 100644
index 0000000..51972d8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cards_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette.png b/interface/web/themes/default-v2/icons/x16/cassette.png
new file mode 100644
index 0000000..54cdfe3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_arrow.png b/interface/web/themes/default-v2/icons/x16/cassette_arrow.png
new file mode 100644
index 0000000..48c7cda
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png b/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png
new file mode 100644
index 0000000..f2befbf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_minus.png b/interface/web/themes/default-v2/icons/x16/cassette_minus.png
new file mode 100644
index 0000000..60ab78a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_pencil.png b/interface/web/themes/default-v2/icons/x16/cassette_pencil.png
new file mode 100644
index 0000000..b226e3c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_plus.png b/interface/web/themes/default-v2/icons/x16/cassette_plus.png
new file mode 100644
index 0000000..9669097
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_small.png b/interface/web/themes/default-v2/icons/x16/cassette_small.png
new file mode 100644
index 0000000..8ac8072
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cassette_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain.png b/interface/web/themes/default-v2/icons/x16/chain.png
new file mode 100644
index 0000000..4c93b29
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_arrow.png b/interface/web/themes/default-v2/icons/x16/chain_arrow.png
new file mode 100644
index 0000000..c0d7642
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_exclamation.png b/interface/web/themes/default-v2/icons/x16/chain_exclamation.png
new file mode 100644
index 0000000..74f3277
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_minus.png b/interface/web/themes/default-v2/icons/x16/chain_minus.png
new file mode 100644
index 0000000..67483b8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_pencil.png b/interface/web/themes/default-v2/icons/x16/chain_pencil.png
new file mode 100644
index 0000000..e68278d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_plus.png b/interface/web/themes/default-v2/icons/x16/chain_plus.png
new file mode 100644
index 0000000..99a48ac
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_small.png b/interface/web/themes/default-v2/icons/x16/chain_small.png
new file mode 100644
index 0000000..b4f1b11
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_unchain.png b/interface/web/themes/default-v2/icons/x16/chain_unchain.png
new file mode 100644
index 0000000..8decfb0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/chain_unchain.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard.png b/interface/web/themes/default-v2/icons/x16/clipboard.png
new file mode 100644
index 0000000..24c1528
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png b/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png
new file mode 100644
index 0000000..2380ab6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png b/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png
new file mode 100644
index 0000000..cd8b682
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__minus.png b/interface/web/themes/default-v2/icons/x16/clipboard__minus.png
new file mode 100644
index 0000000..d1536eb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png b/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png
new file mode 100644
index 0000000..efce1c4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__plus.png b/interface/web/themes/default-v2/icons/x16/clipboard__plus.png
new file mode 100644
index 0000000..05fc5ea
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard_empty.png b/interface/web/themes/default-v2/icons/x16/clipboard_empty.png
new file mode 100644
index 0000000..c1d8414
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard_text.png b/interface/web/themes/default-v2/icons/x16/clipboard_text.png
new file mode 100644
index 0000000..31bece5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clipboard_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock.png b/interface/web/themes/default-v2/icons/x16/clock.png
new file mode 100644
index 0000000..8b6c96e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__arrow.png b/interface/web/themes/default-v2/icons/x16/clock__arrow.png
new file mode 100644
index 0000000..d6b7e07
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__exclamation.png b/interface/web/themes/default-v2/icons/x16/clock__exclamation.png
new file mode 100644
index 0000000..4ab75f4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__minus.png b/interface/web/themes/default-v2/icons/x16/clock__minus.png
new file mode 100644
index 0000000..28af166
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__pencil.png b/interface/web/themes/default-v2/icons/x16/clock__pencil.png
new file mode 100644
index 0000000..4d04f2e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__plus.png b/interface/web/themes/default-v2/icons/x16/clock__plus.png
new file mode 100644
index 0000000..1a6934e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_fill.png b/interface/web/themes/default-v2/icons/x16/clock_fill.png
new file mode 100644
index 0000000..e8bbfc2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock_fill.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_frame.png b/interface/web/themes/default-v2/icons/x16/clock_frame.png
new file mode 100644
index 0000000..f7c00ea
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_small.png b/interface/web/themes/default-v2/icons/x16/clock_small.png
new file mode 100644
index 0000000..b17fe52
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/clock_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color.png b/interface/web/themes/default-v2/icons/x16/color.png
new file mode 100644
index 0000000..49b31c2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_arrow.png b/interface/web/themes/default-v2/icons/x16/color_arrow.png
new file mode 100644
index 0000000..bec3b4b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_exclamation.png b/interface/web/themes/default-v2/icons/x16/color_exclamation.png
new file mode 100644
index 0000000..56f2715
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_minus.png b/interface/web/themes/default-v2/icons/x16/color_minus.png
new file mode 100644
index 0000000..b0299cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_pencil.png b/interface/web/themes/default-v2/icons/x16/color_pencil.png
new file mode 100644
index 0000000..56f00c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_plus.png b/interface/web/themes/default-v2/icons/x16/color_plus.png
new file mode 100644
index 0000000..23b3e9c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_small.png b/interface/web/themes/default-v2/icons/x16/color_small.png
new file mode 100644
index 0000000..085a9d9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/color_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast.png b/interface/web/themes/default-v2/icons/x16/contrast.png
new file mode 100644
index 0000000..4367274
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__arrow.png b/interface/web/themes/default-v2/icons/x16/contrast__arrow.png
new file mode 100644
index 0000000..ad1107b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png b/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png
new file mode 100644
index 0000000..2efc34c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__minus.png b/interface/web/themes/default-v2/icons/x16/contrast__minus.png
new file mode 100644
index 0000000..5c5a17e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__pencil.png b/interface/web/themes/default-v2/icons/x16/contrast__pencil.png
new file mode 100644
index 0000000..69e09f7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__plus.png b/interface/web/themes/default-v2/icons/x16/contrast__plus.png
new file mode 100644
index 0000000..5ce1789
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_low.png b/interface/web/themes/default-v2/icons/x16/contrast_low.png
new file mode 100644
index 0000000..5b4c2d7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast_low.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_small.png b/interface/web/themes/default-v2/icons/x16/contrast_small.png
new file mode 100644
index 0000000..606c490
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_small_low.png b/interface/web/themes/default-v2/icons/x16/contrast_small_low.png
new file mode 100644
index 0000000..fd31a18
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/contrast_small_low.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross.png b/interface/web/themes/default-v2/icons/x16/cross.png
new file mode 100644
index 0000000..45d6e0d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_circle.png b/interface/web/themes/default-v2/icons/x16/cross_circle.png
new file mode 100644
index 0000000..e0886b8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png b/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png
new file mode 100644
index 0000000..b67b8c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_shield.png b/interface/web/themes/default-v2/icons/x16/cross_shield.png
new file mode 100644
index 0000000..ea75a6f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_small.png b/interface/web/themes/default-v2/icons/x16/cross_small.png
new file mode 100644
index 0000000..f55e3cf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_small_circle.png b/interface/web/themes/default-v2/icons/x16/cross_small_circle.png
new file mode 100644
index 0000000..948ccc3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/cross_small_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown.png b/interface/web/themes/default-v2/icons/x16/crown.png
new file mode 100644
index 0000000..d48dd5d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__arrow.png b/interface/web/themes/default-v2/icons/x16/crown__arrow.png
new file mode 100644
index 0000000..4185b7c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__exclamation.png b/interface/web/themes/default-v2/icons/x16/crown__exclamation.png
new file mode 100644
index 0000000..845be0f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__minus.png b/interface/web/themes/default-v2/icons/x16/crown__minus.png
new file mode 100644
index 0000000..ddeadb3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__pencil.png b/interface/web/themes/default-v2/icons/x16/crown__pencil.png
new file mode 100644
index 0000000..4ae445f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__plus.png b/interface/web/themes/default-v2/icons/x16/crown__plus.png
new file mode 100644
index 0000000..66a13f8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown_bronze.png b/interface/web/themes/default-v2/icons/x16/crown_bronze.png
new file mode 100644
index 0000000..9d0e752
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown_bronze.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown_silver.png b/interface/web/themes/default-v2/icons/x16/crown_silver.png
new file mode 100644
index 0000000..917987f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/crown_silver.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database.png b/interface/web/themes/default-v2/icons/x16/database.png
new file mode 100644
index 0000000..a81cfec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_arrow.png b/interface/web/themes/default-v2/icons/x16/database_arrow.png
new file mode 100644
index 0000000..ab07ed0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_exclamation.png b/interface/web/themes/default-v2/icons/x16/database_exclamation.png
new file mode 100644
index 0000000..a10c084
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_minus.png b/interface/web/themes/default-v2/icons/x16/database_minus.png
new file mode 100644
index 0000000..662af8f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_pencil.png b/interface/web/themes/default-v2/icons/x16/database_pencil.png
new file mode 100644
index 0000000..21eba86
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_plus.png b/interface/web/themes/default-v2/icons/x16/database_plus.png
new file mode 100644
index 0000000..cc67cc4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_small.png b/interface/web/themes/default-v2/icons/x16/database_small.png
new file mode 100644
index 0000000..1919c74
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/database_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases.png b/interface/web/themes/default-v2/icons/x16/databases.png
new file mode 100644
index 0000000..5cb5e5f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_arrow.png b/interface/web/themes/default-v2/icons/x16/databases_arrow.png
new file mode 100644
index 0000000..2375638
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_exclamation.png b/interface/web/themes/default-v2/icons/x16/databases_exclamation.png
new file mode 100644
index 0000000..4f4ddf2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_minus.png b/interface/web/themes/default-v2/icons/x16/databases_minus.png
new file mode 100644
index 0000000..dfea00a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_pencil.png b/interface/web/themes/default-v2/icons/x16/databases_pencil.png
new file mode 100644
index 0000000..2820b8b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_plus.png b/interface/web/themes/default-v2/icons/x16/databases_plus.png
new file mode 100644
index 0000000..203dd44
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/databases_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc.png b/interface/web/themes/default-v2/icons/x16/disc.png
new file mode 100644
index 0000000..46397ad
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_arrow.png b/interface/web/themes/default-v2/icons/x16/disc_arrow.png
new file mode 100644
index 0000000..806d24f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_exclamation.png b/interface/web/themes/default-v2/icons/x16/disc_exclamation.png
new file mode 100644
index 0000000..bd45b6d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_minus.png b/interface/web/themes/default-v2/icons/x16/disc_minus.png
new file mode 100644
index 0000000..ee62517
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_pencil.png b/interface/web/themes/default-v2/icons/x16/disc_pencil.png
new file mode 100644
index 0000000..181ac9f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_plus.png b/interface/web/themes/default-v2/icons/x16/disc_plus.png
new file mode 100644
index 0000000..7c3a1e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_small.png b/interface/web/themes/default-v2/icons/x16/disc_small.png
new file mode 100644
index 0000000..315d294
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disc_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs.png b/interface/web/themes/default-v2/icons/x16/discs.png
new file mode 100644
index 0000000..4998c22
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_arrow.png b/interface/web/themes/default-v2/icons/x16/discs_arrow.png
new file mode 100644
index 0000000..d354855
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_exclamation.png b/interface/web/themes/default-v2/icons/x16/discs_exclamation.png
new file mode 100644
index 0000000..4f63b48
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_minus.png b/interface/web/themes/default-v2/icons/x16/discs_minus.png
new file mode 100644
index 0000000..196b18c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_pencil.png b/interface/web/themes/default-v2/icons/x16/discs_pencil.png
new file mode 100644
index 0000000..9c965e4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_plus.png b/interface/web/themes/default-v2/icons/x16/discs_plus.png
new file mode 100644
index 0000000..281acb0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/discs_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk.png b/interface/web/themes/default-v2/icons/x16/disk.png
new file mode 100644
index 0000000..e382776
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__arrow.png b/interface/web/themes/default-v2/icons/x16/disk__arrow.png
new file mode 100644
index 0000000..c364501
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__exclamation.png b/interface/web/themes/default-v2/icons/x16/disk__exclamation.png
new file mode 100644
index 0000000..3c6d4c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__minus.png b/interface/web/themes/default-v2/icons/x16/disk__minus.png
new file mode 100644
index 0000000..41993a4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__pencil.png b/interface/web/themes/default-v2/icons/x16/disk__pencil.png
new file mode 100644
index 0000000..39b929b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__plus.png b/interface/web/themes/default-v2/icons/x16/disk__plus.png
new file mode 100644
index 0000000..de62ee1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_black.png b/interface/web/themes/default-v2/icons/x16/disk_black.png
new file mode 100644
index 0000000..a08f6f1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_small.png b/interface/web/themes/default-v2/icons/x16/disk_small.png
new file mode 100644
index 0000000..3444cbf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_small_black.png b/interface/web/themes/default-v2/icons/x16/disk_small_black.png
new file mode 100644
index 0000000..3d992ad
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disk_small_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks.png b/interface/web/themes/default-v2/icons/x16/disks.png
new file mode 100644
index 0000000..6f2a980
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__arrow.png b/interface/web/themes/default-v2/icons/x16/disks__arrow.png
new file mode 100644
index 0000000..9bd0a71
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__exclamation.png b/interface/web/themes/default-v2/icons/x16/disks__exclamation.png
new file mode 100644
index 0000000..4606873
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__minus.png b/interface/web/themes/default-v2/icons/x16/disks__minus.png
new file mode 100644
index 0000000..764000c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__pencil.png b/interface/web/themes/default-v2/icons/x16/disks__pencil.png
new file mode 100644
index 0000000..a627c31
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__plus.png b/interface/web/themes/default-v2/icons/x16/disks__plus.png
new file mode 100644
index 0000000..80ec32d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks_black.png b/interface/web/themes/default-v2/icons/x16/disks_black.png
new file mode 100644
index 0000000..646bb4e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/disks_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document.png b/interface/web/themes/default-v2/icons/x16/document.png
new file mode 100644
index 0000000..b84a5cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__arrow.png b/interface/web/themes/default-v2/icons/x16/document__arrow.png
new file mode 100644
index 0000000..501197f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__exclamation.png b/interface/web/themes/default-v2/icons/x16/document__exclamation.png
new file mode 100644
index 0000000..bc9187a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__minus.png b/interface/web/themes/default-v2/icons/x16/document__minus.png
new file mode 100644
index 0000000..6f900ea
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__pencil.png b/interface/web/themes/default-v2/icons/x16/document__pencil.png
new file mode 100644
index 0000000..eddc6ce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__plus.png b/interface/web/themes/default-v2/icons/x16/document__plus.png
new file mode 100644
index 0000000..b61978a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_horizontal.png b/interface/web/themes/default-v2/icons/x16/document_horizontal.png
new file mode 100644
index 0000000..7c133e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_horizontal.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png b/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png
new file mode 100644
index 0000000..6ee38d8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_music.png b/interface/web/themes/default-v2/icons/x16/document_music.png
new file mode 100644
index 0000000..2b76eef
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_music.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_music_playlist.png b/interface/web/themes/default-v2/icons/x16/document_music_playlist.png
new file mode 100644
index 0000000..2708c7f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_music_playlist.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_shred.png b/interface/web/themes/default-v2/icons/x16/document_shred.png
new file mode 100644
index 0000000..2c0d00c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_shred.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_small.png b/interface/web/themes/default-v2/icons/x16/document_small.png
new file mode 100644
index 0000000..4e7ce8c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_text.png b/interface/web/themes/default-v2/icons/x16/document_text.png
new file mode 100644
index 0000000..48cdf75
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_text_image.png b/interface/web/themes/default-v2/icons/x16/document_text_image.png
new file mode 100644
index 0000000..0c697bb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_text_image.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_zipper.png b/interface/web/themes/default-v2/icons/x16/document_zipper.png
new file mode 100644
index 0000000..add627c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/document_zipper.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents.png b/interface/web/themes/default-v2/icons/x16/documents.png
new file mode 100644
index 0000000..0aa7484
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_arrow.png b/interface/web/themes/default-v2/icons/x16/documents_arrow.png
new file mode 100644
index 0000000..3e7a46a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_exclamation.png b/interface/web/themes/default-v2/icons/x16/documents_exclamation.png
new file mode 100644
index 0000000..20b9169
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_minus.png b/interface/web/themes/default-v2/icons/x16/documents_minus.png
new file mode 100644
index 0000000..5c8042d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_pencil.png b/interface/web/themes/default-v2/icons/x16/documents_pencil.png
new file mode 100644
index 0000000..ddc0b7d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_plus.png b/interface/web/themes/default-v2/icons/x16/documents_plus.png
new file mode 100644
index 0000000..d095453
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_stack.png b/interface/web/themes/default-v2/icons/x16/documents_stack.png
new file mode 100644
index 0000000..21e3f4d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_text.png b/interface/web/themes/default-v2/icons/x16/documents_text.png
new file mode 100644
index 0000000..f6f5833
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/documents_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door.png b/interface/web/themes/default-v2/icons/x16/door.png
new file mode 100644
index 0000000..0b7c1bc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_arrow.png b/interface/web/themes/default-v2/icons/x16/door_arrow.png
new file mode 100644
index 0000000..efabfc9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_exclamation.png b/interface/web/themes/default-v2/icons/x16/door_exclamation.png
new file mode 100644
index 0000000..3fb609c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_minus.png b/interface/web/themes/default-v2/icons/x16/door_minus.png
new file mode 100644
index 0000000..7356d39
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_pencil.png b/interface/web/themes/default-v2/icons/x16/door_pencil.png
new file mode 100644
index 0000000..2e245e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_plus.png b/interface/web/themes/default-v2/icons/x16/door_plus.png
new file mode 100644
index 0000000..302a1f9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/door_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer.png b/interface/web/themes/default-v2/icons/x16/drawer.png
new file mode 100644
index 0000000..50c5737
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_arrow.png b/interface/web/themes/default-v2/icons/x16/drawer_arrow.png
new file mode 100644
index 0000000..f4a7075
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png b/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png
new file mode 100644
index 0000000..03f0c1e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_minus.png b/interface/web/themes/default-v2/icons/x16/drawer_minus.png
new file mode 100644
index 0000000..4e2ff66
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_pencil.png b/interface/web/themes/default-v2/icons/x16/drawer_pencil.png
new file mode 100644
index 0000000..ef7ed0e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_plus.png b/interface/web/themes/default-v2/icons/x16/drawer_plus.png
new file mode 100644
index 0000000..a63fb3b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drawer_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill.png b/interface/web/themes/default-v2/icons/x16/drill.png
new file mode 100644
index 0000000..c05a305
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_arrow.png b/interface/web/themes/default-v2/icons/x16/drill_arrow.png
new file mode 100644
index 0000000..fdb0737
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_exclamation.png b/interface/web/themes/default-v2/icons/x16/drill_exclamation.png
new file mode 100644
index 0000000..c9b4a4a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_minus.png b/interface/web/themes/default-v2/icons/x16/drill_minus.png
new file mode 100644
index 0000000..dd63de2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_pencil.png b/interface/web/themes/default-v2/icons/x16/drill_pencil.png
new file mode 100644
index 0000000..cc0448b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_plus.png b/interface/web/themes/default-v2/icons/x16/drill_plus.png
new file mode 100644
index 0000000..c9e751c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/drill_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope.png b/interface/web/themes/default-v2/icons/x16/envelope.png
new file mode 100644
index 0000000..b13127e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_arrow.png b/interface/web/themes/default-v2/icons/x16/envelope_arrow.png
new file mode 100644
index 0000000..8024339
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png b/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png
new file mode 100644
index 0000000..36a43a4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_minus.png b/interface/web/themes/default-v2/icons/x16/envelope_minus.png
new file mode 100644
index 0000000..34003fb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_pencil.png b/interface/web/themes/default-v2/icons/x16/envelope_pencil.png
new file mode 100644
index 0000000..8057d8d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_plus.png b/interface/web/themes/default-v2/icons/x16/envelope_plus.png
new file mode 100644
index 0000000..1062723
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/envelope_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer.png b/interface/web/themes/default-v2/icons/x16/equalizer.png
new file mode 100644
index 0000000..bc17e83
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png b/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png
new file mode 100644
index 0000000..2919dfd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png b/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png
new file mode 100644
index 0000000..46b11ab
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_minus.png b/interface/web/themes/default-v2/icons/x16/equalizer_minus.png
new file mode 100644
index 0000000..9e862af
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png b/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png
new file mode 100644
index 0000000..88d6a99
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_plus.png b/interface/web/themes/default-v2/icons/x16/equalizer_plus.png
new file mode 100644
index 0000000..5138e71
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/equalizer_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser.png b/interface/web/themes/default-v2/icons/x16/eraser.png
new file mode 100644
index 0000000..9ffba3d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_arrow.png b/interface/web/themes/default-v2/icons/x16/eraser_arrow.png
new file mode 100644
index 0000000..7479dc3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png b/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png
new file mode 100644
index 0000000..51bafd9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_minus.png b/interface/web/themes/default-v2/icons/x16/eraser_minus.png
new file mode 100644
index 0000000..b4fbf24
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_pencil.png b/interface/web/themes/default-v2/icons/x16/eraser_pencil.png
new file mode 100644
index 0000000..0c18f9d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_plus.png b/interface/web/themes/default-v2/icons/x16/eraser_plus.png
new file mode 100644
index 0000000..e7b3f1c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/eraser_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation.png b/interface/web/themes/default-v2/icons/x16/exclamation.png
new file mode 100644
index 0000000..f37eb95
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_frame.png b/interface/web/themes/default-v2/icons/x16/exclamation_frame.png
new file mode 100644
index 0000000..db1b763
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/exclamation_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_shield.png b/interface/web/themes/default-v2/icons/x16/exclamation_shield.png
new file mode 100644
index 0000000..f5fb107
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/exclamation_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_small.png b/interface/web/themes/default-v2/icons/x16/exclamation_small.png
new file mode 100644
index 0000000..c8a0568
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/exclamation_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed.png b/interface/web/themes/default-v2/icons/x16/feed.png
new file mode 100644
index 0000000..9e5327b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__arrow.png b/interface/web/themes/default-v2/icons/x16/feed__arrow.png
new file mode 100644
index 0000000..24fdb91
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__exclamation.png b/interface/web/themes/default-v2/icons/x16/feed__exclamation.png
new file mode 100644
index 0000000..5a5a1a4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__minus.png b/interface/web/themes/default-v2/icons/x16/feed__minus.png
new file mode 100644
index 0000000..dfa82aa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__pencil.png b/interface/web/themes/default-v2/icons/x16/feed__pencil.png
new file mode 100644
index 0000000..48587c8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__plus.png b/interface/web/themes/default-v2/icons/x16/feed__plus.png
new file mode 100644
index 0000000..bb6db9b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed_balloon.png b/interface/web/themes/default-v2/icons/x16/feed_balloon.png
new file mode 100644
index 0000000..b9c9475
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed_balloon.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed_small.png b/interface/web/themes/default-v2/icons/x16/feed_small.png
new file mode 100644
index 0000000..184a29e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/feed_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film.png b/interface/web/themes/default-v2/icons/x16/film.png
new file mode 100644
index 0000000..b8b4b5c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_arrow.png b/interface/web/themes/default-v2/icons/x16/film_arrow.png
new file mode 100644
index 0000000..1b256a8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_exclamation.png b/interface/web/themes/default-v2/icons/x16/film_exclamation.png
new file mode 100644
index 0000000..371e74b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_minus.png b/interface/web/themes/default-v2/icons/x16/film_minus.png
new file mode 100644
index 0000000..f0c58e1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_pencil.png b/interface/web/themes/default-v2/icons/x16/film_pencil.png
new file mode 100644
index 0000000..a45ab17
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_plus.png b/interface/web/themes/default-v2/icons/x16/film_plus.png
new file mode 100644
index 0000000..2e41b83
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_small.png b/interface/web/themes/default-v2/icons/x16/film_small.png
new file mode 100644
index 0000000..311335d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/film_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films.png b/interface/web/themes/default-v2/icons/x16/films.png
new file mode 100644
index 0000000..3ca3268
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_arrow.png b/interface/web/themes/default-v2/icons/x16/films_arrow.png
new file mode 100644
index 0000000..bd136bb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_exclamation.png b/interface/web/themes/default-v2/icons/x16/films_exclamation.png
new file mode 100644
index 0000000..6aef39e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_minus.png b/interface/web/themes/default-v2/icons/x16/films_minus.png
new file mode 100644
index 0000000..b570dce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_pencil.png b/interface/web/themes/default-v2/icons/x16/films_pencil.png
new file mode 100644
index 0000000..03ab1bd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_plus.png b/interface/web/themes/default-v2/icons/x16/films_plus.png
new file mode 100644
index 0000000..2bf3757
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/films_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag.png b/interface/web/themes/default-v2/icons/x16/flag.png
new file mode 100644
index 0000000..7d0a6ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_arrow.png b/interface/web/themes/default-v2/icons/x16/flag_arrow.png
new file mode 100644
index 0000000..06e94a8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_exclamation.png b/interface/web/themes/default-v2/icons/x16/flag_exclamation.png
new file mode 100644
index 0000000..18a242f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_minus.png b/interface/web/themes/default-v2/icons/x16/flag_minus.png
new file mode 100644
index 0000000..e00958a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_pencil.png b/interface/web/themes/default-v2/icons/x16/flag_pencil.png
new file mode 100644
index 0000000..2d2c67a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_plus.png b/interface/web/themes/default-v2/icons/x16/flag_plus.png
new file mode 100644
index 0000000..560a995
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/flag_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder.png b/interface/web/themes/default-v2/icons/x16/folder.png
new file mode 100644
index 0000000..08dbc87
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__arrow.png b/interface/web/themes/default-v2/icons/x16/folder__arrow.png
new file mode 100644
index 0000000..ada7b23
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__exclamation.png b/interface/web/themes/default-v2/icons/x16/folder__exclamation.png
new file mode 100644
index 0000000..ce288bc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__minus.png b/interface/web/themes/default-v2/icons/x16/folder__minus.png
new file mode 100644
index 0000000..0f7b0fd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__pencil.png b/interface/web/themes/default-v2/icons/x16/folder__pencil.png
new file mode 100644
index 0000000..6f974e1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__plus.png b/interface/web/themes/default-v2/icons/x16/folder__plus.png
new file mode 100644
index 0000000..152eecb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open.png b/interface/web/themes/default-v2/icons/x16/folder_open.png
new file mode 100644
index 0000000..06452a8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document.png b/interface/web/themes/default-v2/icons/x16/folder_open_document.png
new file mode 100644
index 0000000..f3224d3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_document.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png
new file mode 100644
index 0000000..855299c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png
new file mode 100644
index 0000000..e2f17c3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png
new file mode 100644
index 0000000..5599a35
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_film.png b/interface/web/themes/default-v2/icons/x16/folder_open_film.png
new file mode 100644
index 0000000..d5b9900
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_film.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_image.png b/interface/web/themes/default-v2/icons/x16/folder_open_image.png
new file mode 100644
index 0000000..4eb3967
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_open_image.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_shred.png b/interface/web/themes/default-v2/icons/x16/folder_shred.png
new file mode 100644
index 0000000..2208550
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_shred.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_small.png b/interface/web/themes/default-v2/icons/x16/folder_small.png
new file mode 100644
index 0000000..0f47987
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_zipper.png b/interface/web/themes/default-v2/icons/x16/folder_zipper.png
new file mode 100644
index 0000000..874d076
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folder_zipper.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders.png b/interface/web/themes/default-v2/icons/x16/folders.png
new file mode 100644
index 0000000..f236e50
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_arrow.png b/interface/web/themes/default-v2/icons/x16/folders_arrow.png
new file mode 100644
index 0000000..720b84d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_exclamation.png b/interface/web/themes/default-v2/icons/x16/folders_exclamation.png
new file mode 100644
index 0000000..c41051f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_minus.png b/interface/web/themes/default-v2/icons/x16/folders_minus.png
new file mode 100644
index 0000000..435b57b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_pencil.png b/interface/web/themes/default-v2/icons/x16/folders_pencil.png
new file mode 100644
index 0000000..34007f8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_plus.png b/interface/web/themes/default-v2/icons/x16/folders_plus.png
new file mode 100644
index 0000000..df1ff71
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_stack.png b/interface/web/themes/default-v2/icons/x16/folders_stack.png
new file mode 100644
index 0000000..146a8fb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/folders_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel.png b/interface/web/themes/default-v2/icons/x16/funnel.png
new file mode 100644
index 0000000..ebd8b55
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_arrow.png b/interface/web/themes/default-v2/icons/x16/funnel_arrow.png
new file mode 100644
index 0000000..4858978
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png b/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png
new file mode 100644
index 0000000..0549c60
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_minus.png b/interface/web/themes/default-v2/icons/x16/funnel_minus.png
new file mode 100644
index 0000000..2f446d7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_pencil.png b/interface/web/themes/default-v2/icons/x16/funnel_pencil.png
new file mode 100644
index 0000000..7c2d9b5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_plus.png b/interface/web/themes/default-v2/icons/x16/funnel_plus.png
new file mode 100644
index 0000000..c2b7722
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_small.png b/interface/web/themes/default-v2/icons/x16/funnel_small.png
new file mode 100644
index 0000000..f914af5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/funnel_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear.png b/interface/web/themes/default-v2/icons/x16/gear.png
new file mode 100644
index 0000000..2ae36d0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__arrow.png b/interface/web/themes/default-v2/icons/x16/gear__arrow.png
new file mode 100644
index 0000000..97bcdde
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__exclamation.png b/interface/web/themes/default-v2/icons/x16/gear__exclamation.png
new file mode 100644
index 0000000..0fc7db0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__minus.png b/interface/web/themes/default-v2/icons/x16/gear__minus.png
new file mode 100644
index 0000000..0f5d271
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__pencil.png b/interface/web/themes/default-v2/icons/x16/gear__pencil.png
new file mode 100644
index 0000000..a2906ec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__plus.png b/interface/web/themes/default-v2/icons/x16/gear__plus.png
new file mode 100644
index 0000000..a94a618
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear_disable.png b/interface/web/themes/default-v2/icons/x16/gear_disable.png
new file mode 100644
index 0000000..877a66d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear_small.png b/interface/web/themes/default-v2/icons/x16/gear_small.png
new file mode 100644
index 0000000..b0e9690
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/gear_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer.png b/interface/web/themes/default-v2/icons/x16/hammer.png
new file mode 100644
index 0000000..59558fd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__arrow.png b/interface/web/themes/default-v2/icons/x16/hammer__arrow.png
new file mode 100644
index 0000000..23ee5cf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png b/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png
new file mode 100644
index 0000000..7ad1cf5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__minus.png b/interface/web/themes/default-v2/icons/x16/hammer__minus.png
new file mode 100644
index 0000000..549d90c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__pencil.png b/interface/web/themes/default-v2/icons/x16/hammer__pencil.png
new file mode 100644
index 0000000..3e7821f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__plus.png b/interface/web/themes/default-v2/icons/x16/hammer__plus.png
new file mode 100644
index 0000000..331a83b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer_left.png b/interface/web/themes/default-v2/icons/x16/hammer_left.png
new file mode 100644
index 0000000..f448615
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer_left.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png b/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png
new file mode 100644
index 0000000..27877af
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart.png b/interface/web/themes/default-v2/icons/x16/heart.png
new file mode 100644
index 0000000..7e0f0f7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__arrow.png b/interface/web/themes/default-v2/icons/x16/heart__arrow.png
new file mode 100644
index 0000000..014c378
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__exclamation.png b/interface/web/themes/default-v2/icons/x16/heart__exclamation.png
new file mode 100644
index 0000000..46ad89f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__minus.png b/interface/web/themes/default-v2/icons/x16/heart__minus.png
new file mode 100644
index 0000000..0c305c3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__pencil.png b/interface/web/themes/default-v2/icons/x16/heart__pencil.png
new file mode 100644
index 0000000..2d37cee
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__plus.png b/interface/web/themes/default-v2/icons/x16/heart__plus.png
new file mode 100644
index 0000000..4ecc1a3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_break.png b/interface/web/themes/default-v2/icons/x16/heart_break.png
new file mode 100644
index 0000000..a19bd59
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_break.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_empty.png b/interface/web/themes/default-v2/icons/x16/heart_empty.png
new file mode 100644
index 0000000..fb513dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_half.png b/interface/web/themes/default-v2/icons/x16/heart_half.png
new file mode 100644
index 0000000..1a996b4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_half.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small.png b/interface/web/themes/default-v2/icons/x16/heart_small.png
new file mode 100644
index 0000000..f2ae66f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small_empty.png b/interface/web/themes/default-v2/icons/x16/heart_small_empty.png
new file mode 100644
index 0000000..6e0c58b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_small_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small_half.png b/interface/web/themes/default-v2/icons/x16/heart_small_half.png
new file mode 100644
index 0000000..234580f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/heart_small_half.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home.png b/interface/web/themes/default-v2/icons/x16/home.png
new file mode 100644
index 0000000..242e250
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_arrow.png b/interface/web/themes/default-v2/icons/x16/home_arrow.png
new file mode 100644
index 0000000..5ea4ae6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_exclamation.png b/interface/web/themes/default-v2/icons/x16/home_exclamation.png
new file mode 100644
index 0000000..a40d4dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_minus.png b/interface/web/themes/default-v2/icons/x16/home_minus.png
new file mode 100644
index 0000000..138c898
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_pencil.png b/interface/web/themes/default-v2/icons/x16/home_pencil.png
new file mode 100644
index 0000000..f5602a4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_plus.png b/interface/web/themes/default-v2/icons/x16/home_plus.png
new file mode 100644
index 0000000..e9341e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_small.png b/interface/web/themes/default-v2/icons/x16/home_small.png
new file mode 100644
index 0000000..07b9993
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/home_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image.png b/interface/web/themes/default-v2/icons/x16/image.png
new file mode 100644
index 0000000..8de2231
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_arrow.png b/interface/web/themes/default-v2/icons/x16/image_arrow.png
new file mode 100644
index 0000000..2d4d3c8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_exclamation.png b/interface/web/themes/default-v2/icons/x16/image_exclamation.png
new file mode 100644
index 0000000..5ca7614
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_minus.png b/interface/web/themes/default-v2/icons/x16/image_minus.png
new file mode 100644
index 0000000..b5e76b4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_pencil.png b/interface/web/themes/default-v2/icons/x16/image_pencil.png
new file mode 100644
index 0000000..2f276d7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_plus.png b/interface/web/themes/default-v2/icons/x16/image_plus.png
new file mode 100644
index 0000000..522539d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_resize.png b/interface/web/themes/default-v2/icons/x16/image_resize.png
new file mode 100644
index 0000000..ed9d5ee
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_resize.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_resize_actual.png b/interface/web/themes/default-v2/icons/x16/image_resize_actual.png
new file mode 100644
index 0000000..3c57831
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_resize_actual.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_small.png b/interface/web/themes/default-v2/icons/x16/image_small.png
new file mode 100644
index 0000000..a3c531a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_small_sunset.png b/interface/web/themes/default-v2/icons/x16/image_small_sunset.png
new file mode 100644
index 0000000..3c09828
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_small_sunset.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_sunset.png b/interface/web/themes/default-v2/icons/x16/image_sunset.png
new file mode 100644
index 0000000..3d54135
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/image_sunset.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images.png b/interface/web/themes/default-v2/icons/x16/images.png
new file mode 100644
index 0000000..a36d528
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_arrow.png b/interface/web/themes/default-v2/icons/x16/images_arrow.png
new file mode 100644
index 0000000..1b8a940
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_exclamation.png b/interface/web/themes/default-v2/icons/x16/images_exclamation.png
new file mode 100644
index 0000000..4e6f454
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_minus.png b/interface/web/themes/default-v2/icons/x16/images_minus.png
new file mode 100644
index 0000000..21da574
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_pencil.png b/interface/web/themes/default-v2/icons/x16/images_pencil.png
new file mode 100644
index 0000000..3250b89
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_plus.png b/interface/web/themes/default-v2/icons/x16/images_plus.png
new file mode 100644
index 0000000..2fe20dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_stack.png b/interface/web/themes/default-v2/icons/x16/images_stack.png
new file mode 100644
index 0000000..fe33dcc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/images_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox.png b/interface/web/themes/default-v2/icons/x16/inbox.png
new file mode 100644
index 0000000..e93b4ba
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_arrow.png b/interface/web/themes/default-v2/icons/x16/inbox_arrow.png
new file mode 100644
index 0000000..9cf3d51
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png b/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png
new file mode 100644
index 0000000..b0e69ff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_minus.png b/interface/web/themes/default-v2/icons/x16/inbox_minus.png
new file mode 100644
index 0000000..1c5e023
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_pencil.png b/interface/web/themes/default-v2/icons/x16/inbox_pencil.png
new file mode 100644
index 0000000..eb6f919
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_plus.png b/interface/web/themes/default-v2/icons/x16/inbox_plus.png
new file mode 100644
index 0000000..5ac3745
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/inbox_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/information.png b/interface/web/themes/default-v2/icons/x16/information.png
new file mode 100644
index 0000000..17ed83f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/information.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_frame.png b/interface/web/themes/default-v2/icons/x16/information_frame.png
new file mode 100644
index 0000000..33da5b5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/information_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_shield.png b/interface/web/themes/default-v2/icons/x16/information_shield.png
new file mode 100644
index 0000000..ad5f109
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/information_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_small.png b/interface/web/themes/default-v2/icons/x16/information_small.png
new file mode 100644
index 0000000..c5b7e49
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/information_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key.png b/interface/web/themes/default-v2/icons/x16/key.png
new file mode 100644
index 0000000..dd3ed88
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__arrow.png b/interface/web/themes/default-v2/icons/x16/key__arrow.png
new file mode 100644
index 0000000..e9712f1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__exclamation.png b/interface/web/themes/default-v2/icons/x16/key__exclamation.png
new file mode 100644
index 0000000..6c9a674
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__minus.png b/interface/web/themes/default-v2/icons/x16/key__minus.png
new file mode 100644
index 0000000..f381899
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__pencil.png b/interface/web/themes/default-v2/icons/x16/key__pencil.png
new file mode 100644
index 0000000..13774d4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__plus.png b/interface/web/themes/default-v2/icons/x16/key__plus.png
new file mode 100644
index 0000000..9e3fe41
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/key_disable.png b/interface/web/themes/default-v2/icons/x16/key_disable.png
new file mode 100644
index 0000000..72bc9f4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/key_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout.png b/interface/web/themes/default-v2/icons/x16/layout.png
new file mode 100644
index 0000000..001a60a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_2.png b/interface/web/themes/default-v2/icons/x16/layout_2.png
new file mode 100644
index 0000000..41266b2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_2_equal.png
new file mode 100644
index 0000000..695916f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_2_equal.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_3.png b/interface/web/themes/default-v2/icons/x16/layout_3.png
new file mode 100644
index 0000000..5e8ab93
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_3.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_3_mix.png
new file mode 100644
index 0000000..89fb017
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_3_mix.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header.png b/interface/web/themes/default-v2/icons/x16/layout_header.png
new file mode 100644
index 0000000..efb95a3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_2.png b/interface/web/themes/default-v2/icons/x16/layout_header_2.png
new file mode 100644
index 0000000..09f6832
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png
new file mode 100644
index 0000000..a0dfd6c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_3.png b/interface/web/themes/default-v2/icons/x16/layout_header_3.png
new file mode 100644
index 0000000..64a48ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_3.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png
new file mode 100644
index 0000000..22e67bd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer.png
new file mode 100644
index 0000000..4a739f8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_footer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png
new file mode 100644
index 0000000..22b7d59
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png
new file mode 100644
index 0000000..9a6ab31
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png
new file mode 100644
index 0000000..d97d175
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png
new file mode 100644
index 0000000..4aefc40
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_join.png b/interface/web/themes/default-v2/icons/x16/layout_join.png
new file mode 100644
index 0000000..be491fc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_join.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_split.png b/interface/web/themes/default-v2/icons/x16/layout_split.png
new file mode 100644
index 0000000..986005e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/layout_split.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy.png b/interface/web/themes/default-v2/icons/x16/lifebuoy.png
new file mode 100644
index 0000000..2bcb23d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png
new file mode 100644
index 0000000..ab33a2d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png
new file mode 100644
index 0000000..020a1ee
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png
new file mode 100644
index 0000000..7af0807
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png
new file mode 100644
index 0000000..bf22786
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png
new file mode 100644
index 0000000..d41f5b4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb.png b/interface/web/themes/default-v2/icons/x16/light_bulb.png
new file mode 100644
index 0000000..ff6feaf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png b/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png
new file mode 100644
index 0000000..563310a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png b/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png
new file mode 100644
index 0000000..c82a99c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png b/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png
new file mode 100644
index 0000000..4cae1dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png b/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png
new file mode 100644
index 0000000..5864514
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png b/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png
new file mode 100644
index 0000000..7496b6d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_off.png b/interface/web/themes/default-v2/icons/x16/light_bulb_off.png
new file mode 100644
index 0000000..496925d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb_off.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_small.png b/interface/web/themes/default-v2/icons/x16/light_bulb_small.png
new file mode 100644
index 0000000..df440bc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png b/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png
new file mode 100644
index 0000000..d28c98e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning.png b/interface/web/themes/default-v2/icons/x16/lightning.png
new file mode 100644
index 0000000..be7e052
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__arrow.png b/interface/web/themes/default-v2/icons/x16/lightning__arrow.png
new file mode 100644
index 0000000..58d7464
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png b/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png
new file mode 100644
index 0000000..52b49c7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__minus.png b/interface/web/themes/default-v2/icons/x16/lightning__minus.png
new file mode 100644
index 0000000..f5d04ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__pencil.png b/interface/web/themes/default-v2/icons/x16/lightning__pencil.png
new file mode 100644
index 0000000..e9eb9c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__plus.png b/interface/web/themes/default-v2/icons/x16/lightning__plus.png
new file mode 100644
index 0000000..00980e1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning_disable.png b/interface/web/themes/default-v2/icons/x16/lightning_disable.png
new file mode 100644
index 0000000..94e24a0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning_small.png b/interface/web/themes/default-v2/icons/x16/lightning_small.png
new file mode 100644
index 0000000..df0a425
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lightning_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/loading.gif b/interface/web/themes/default-v2/icons/x16/loading.gif
new file mode 100644
index 0000000..19afda1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/loading.gif
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock.png b/interface/web/themes/default-v2/icons/x16/lock.png
new file mode 100644
index 0000000..755dd0b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__arrow.png b/interface/web/themes/default-v2/icons/x16/lock__arrow.png
new file mode 100644
index 0000000..51b923d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__exclamation.png b/interface/web/themes/default-v2/icons/x16/lock__exclamation.png
new file mode 100644
index 0000000..6574515
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__minus.png b/interface/web/themes/default-v2/icons/x16/lock__minus.png
new file mode 100644
index 0000000..1326f4c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__pencil.png b/interface/web/themes/default-v2/icons/x16/lock__pencil.png
new file mode 100644
index 0000000..1e6581d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__plus.png b/interface/web/themes/default-v2/icons/x16/lock__plus.png
new file mode 100644
index 0000000..351141a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_disable.png b/interface/web/themes/default-v2/icons/x16/lock_disable.png
new file mode 100644
index 0000000..7d78815
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_small.png b/interface/web/themes/default-v2/icons/x16/lock_small.png
new file mode 100644
index 0000000..c2378e9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_unlock.png b/interface/web/themes/default-v2/icons/x16/lock_unlock.png
new file mode 100644
index 0000000..3cd7b7b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/lock_unlock.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/logout.png b/interface/web/themes/default-v2/icons/x16/logout.png
new file mode 100644
index 0000000..3fa077e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/logout.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet.png b/interface/web/themes/default-v2/icons/x16/magnet.png
new file mode 100644
index 0000000..f83b48c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__arrow.png b/interface/web/themes/default-v2/icons/x16/magnet__arrow.png
new file mode 100644
index 0000000..f366db3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png b/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png
new file mode 100644
index 0000000..723c3b8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__minus.png b/interface/web/themes/default-v2/icons/x16/magnet__minus.png
new file mode 100644
index 0000000..066f256
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__pencil.png b/interface/web/themes/default-v2/icons/x16/magnet__pencil.png
new file mode 100644
index 0000000..83894af
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__plus.png b/interface/web/themes/default-v2/icons/x16/magnet__plus.png
new file mode 100644
index 0000000..f0d7ee5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet_disable.png b/interface/web/themes/default-v2/icons/x16/magnet_disable.png
new file mode 100644
index 0000000..8ab9c3d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet_small.png b/interface/web/themes/default-v2/icons/x16/magnet_small.png
new file mode 100644
index 0000000..061e36a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnet_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier.png b/interface/web/themes/default-v2/icons/x16/magnifier.png
new file mode 100644
index 0000000..02e7e67
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png b/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png
new file mode 100644
index 0000000..65cd5c5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png b/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png
new file mode 100644
index 0000000..037be02
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__minus.png b/interface/web/themes/default-v2/icons/x16/magnifier__minus.png
new file mode 100644
index 0000000..a6bccdd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png b/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png
new file mode 100644
index 0000000..10a668d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__plus.png b/interface/web/themes/default-v2/icons/x16/magnifier__plus.png
new file mode 100644
index 0000000..7516398
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_left.png b/interface/web/themes/default-v2/icons/x16/magnifier_left.png
new file mode 100644
index 0000000..7a8557f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_left.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_medium.png b/interface/web/themes/default-v2/icons/x16/magnifier_medium.png
new file mode 100644
index 0000000..7dae0e1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_medium.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png b/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png
new file mode 100644
index 0000000..81c4089
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_small.png b/interface/web/themes/default-v2/icons/x16/magnifier_small.png
new file mode 100644
index 0000000..08fdd8c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png
new file mode 100644
index 0000000..d901303
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png
new file mode 100644
index 0000000..b01ae0b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png
new file mode 100644
index 0000000..278c77d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png
new file mode 100644
index 0000000..8cd8354
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail.png b/interface/web/themes/default-v2/icons/x16/mail.png
new file mode 100644
index 0000000..7f7a6ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__arrow.png b/interface/web/themes/default-v2/icons/x16/mail__arrow.png
new file mode 100644
index 0000000..4345174
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__exclamation.png b/interface/web/themes/default-v2/icons/x16/mail__exclamation.png
new file mode 100644
index 0000000..bf0344e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__minus.png b/interface/web/themes/default-v2/icons/x16/mail__minus.png
new file mode 100644
index 0000000..2747136
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__pencil.png b/interface/web/themes/default-v2/icons/x16/mail__pencil.png
new file mode 100644
index 0000000..47e552d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__plus.png b/interface/web/themes/default-v2/icons/x16/mail__plus.png
new file mode 100644
index 0000000..9e7e259
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open.png b/interface/web/themes/default-v2/icons/x16/mail_open.png
new file mode 100644
index 0000000..634b83f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail_open.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_document.png b/interface/web/themes/default-v2/icons/x16/mail_open_document.png
new file mode 100644
index 0000000..c9277d4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail_open_document.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_film.png b/interface/web/themes/default-v2/icons/x16/mail_open_film.png
new file mode 100644
index 0000000..3174aab
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail_open_film.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_image.png b/interface/web/themes/default-v2/icons/x16/mail_open_image.png
new file mode 100644
index 0000000..2ac1a42
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail_open_image.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_small.png b/interface/web/themes/default-v2/icons/x16/mail_small.png
new file mode 100644
index 0000000..318490b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mail_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails.png b/interface/web/themes/default-v2/icons/x16/mails.png
new file mode 100644
index 0000000..5e7b08d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_arrow.png b/interface/web/themes/default-v2/icons/x16/mails_arrow.png
new file mode 100644
index 0000000..49988fa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_exclamation.png b/interface/web/themes/default-v2/icons/x16/mails_exclamation.png
new file mode 100644
index 0000000..5528829
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_minus.png b/interface/web/themes/default-v2/icons/x16/mails_minus.png
new file mode 100644
index 0000000..cb3ec83
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_pencil.png b/interface/web/themes/default-v2/icons/x16/mails_pencil.png
new file mode 100644
index 0000000..63a8507
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_plus.png b/interface/web/themes/default-v2/icons/x16/mails_plus.png
new file mode 100644
index 0000000..a3f2802
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_stack.png b/interface/web/themes/default-v2/icons/x16/mails_stack.png
new file mode 100644
index 0000000..d81d95d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/mails_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player.png b/interface/web/themes/default-v2/icons/x16/media_player.png
new file mode 100644
index 0000000..b35317b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__arrow.png b/interface/web/themes/default-v2/icons/x16/media_player__arrow.png
new file mode 100644
index 0000000..cf012c8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png b/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png
new file mode 100644
index 0000000..08e2647
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__minus.png b/interface/web/themes/default-v2/icons/x16/media_player__minus.png
new file mode 100644
index 0000000..8fc1828
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__pencil.png b/interface/web/themes/default-v2/icons/x16/media_player__pencil.png
new file mode 100644
index 0000000..73441b4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__plus.png b/interface/web/themes/default-v2/icons/x16/media_player__plus.png
new file mode 100644
index 0000000..ba11ab7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_black.png b/interface/web/themes/default-v2/icons/x16/media_player_black.png
new file mode 100644
index 0000000..4e7d718
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium.png b/interface/web/themes/default-v2/icons/x16/media_player_medium.png
new file mode 100644
index 0000000..ddabbf5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png
new file mode 100644
index 0000000..7fbe8d6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png
new file mode 100644
index 0000000..1edce97
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png
new file mode 100644
index 0000000..38d6be4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png
new file mode 100644
index 0000000..ceee74a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png
new file mode 100644
index 0000000..ebc1483
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small.png b/interface/web/themes/default-v2/icons/x16/media_player_small.png
new file mode 100644
index 0000000..f976ff5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png b/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png
new file mode 100644
index 0000000..fe169fb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_green.png b/interface/web/themes/default-v2/icons/x16/media_player_small_green.png
new file mode 100644
index 0000000..496cf0c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_small_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png b/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png
new file mode 100644
index 0000000..cd2ceb6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_red.png b/interface/web/themes/default-v2/icons/x16/media_player_small_red.png
new file mode 100644
index 0000000..9b31593
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_player_small_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players.png b/interface/web/themes/default-v2/icons/x16/media_players.png
new file mode 100644
index 0000000..b7d7f6c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_arrow.png b/interface/web/themes/default-v2/icons/x16/media_players_arrow.png
new file mode 100644
index 0000000..33b6854
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png b/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png
new file mode 100644
index 0000000..7ae760b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_minus.png b/interface/web/themes/default-v2/icons/x16/media_players_minus.png
new file mode 100644
index 0000000..1b266f2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_pencil.png b/interface/web/themes/default-v2/icons/x16/media_players_pencil.png
new file mode 100644
index 0000000..bad68cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_plus.png b/interface/web/themes/default-v2/icons/x16/media_players_plus.png
new file mode 100644
index 0000000..e29e49d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/media_players_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone.png b/interface/web/themes/default-v2/icons/x16/microphone.png
new file mode 100644
index 0000000..5817a1c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_arrow.png b/interface/web/themes/default-v2/icons/x16/microphone_arrow.png
new file mode 100644
index 0000000..3a7c897
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png b/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png
new file mode 100644
index 0000000..3e41bd4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_minus.png b/interface/web/themes/default-v2/icons/x16/microphone_minus.png
new file mode 100644
index 0000000..17f3639
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_pencil.png b/interface/web/themes/default-v2/icons/x16/microphone_pencil.png
new file mode 100644
index 0000000..aa41af6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_plus.png b/interface/web/themes/default-v2/icons/x16/microphone_plus.png
new file mode 100644
index 0000000..b5776f4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/microphone_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus.png b/interface/web/themes/default-v2/icons/x16/minus.png
new file mode 100644
index 0000000..d59994c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_circle.png b/interface/web/themes/default-v2/icons/x16/minus_circle.png
new file mode 100644
index 0000000..e0d3938
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png b/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png
new file mode 100644
index 0000000..8b1654a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_shield.png b/interface/web/themes/default-v2/icons/x16/minus_shield.png
new file mode 100644
index 0000000..f5da92a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_small.png b/interface/web/themes/default-v2/icons/x16/minus_small.png
new file mode 100644
index 0000000..6ec9487
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_small_circle.png b/interface/web/themes/default-v2/icons/x16/minus_small_circle.png
new file mode 100644
index 0000000..30b6e27
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/minus_small_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music.png b/interface/web/themes/default-v2/icons/x16/music.png
new file mode 100644
index 0000000..a78df8c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_arrow.png b/interface/web/themes/default-v2/icons/x16/music_arrow.png
new file mode 100644
index 0000000..1215fd2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_exclamation.png b/interface/web/themes/default-v2/icons/x16/music_exclamation.png
new file mode 100644
index 0000000..6804884
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_minus.png b/interface/web/themes/default-v2/icons/x16/music_minus.png
new file mode 100644
index 0000000..284b165
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_pencil.png b/interface/web/themes/default-v2/icons/x16/music_pencil.png
new file mode 100644
index 0000000..a6b6030
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_plus.png b/interface/web/themes/default-v2/icons/x16/music_plus.png
new file mode 100644
index 0000000..69ca7cb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_small.png b/interface/web/themes/default-v2/icons/x16/music_small.png
new file mode 100644
index 0000000..54c1417
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/music_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper.png b/interface/web/themes/default-v2/icons/x16/newspaper.png
new file mode 100644
index 0000000..a6e3bf8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png b/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png
new file mode 100644
index 0000000..eac7fce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png b/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png
new file mode 100644
index 0000000..04a39d4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_minus.png b/interface/web/themes/default-v2/icons/x16/newspaper_minus.png
new file mode 100644
index 0000000..6606c01
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png b/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png
new file mode 100644
index 0000000..3d1813a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_plus.png b/interface/web/themes/default-v2/icons/x16/newspaper_plus.png
new file mode 100644
index 0000000..5a53ada
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspaper_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers.png b/interface/web/themes/default-v2/icons/x16/newspapers.png
new file mode 100644
index 0000000..ffa56e5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png b/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png
new file mode 100644
index 0000000..132635e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png b/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png
new file mode 100644
index 0000000..9a09215
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_minus.png b/interface/web/themes/default-v2/icons/x16/newspapers_minus.png
new file mode 100644
index 0000000..983a415
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png b/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png
new file mode 100644
index 0000000..c950ade
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_plus.png b/interface/web/themes/default-v2/icons/x16/newspapers_plus.png
new file mode 100644
index 0000000..5f5747b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/newspapers_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook.png b/interface/web/themes/default-v2/icons/x16/notebook.png
new file mode 100644
index 0000000..1d5e4e1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_arrow.png b/interface/web/themes/default-v2/icons/x16/notebook_arrow.png
new file mode 100644
index 0000000..45174b9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png b/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png
new file mode 100644
index 0000000..4ddb745
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_minus.png b/interface/web/themes/default-v2/icons/x16/notebook_minus.png
new file mode 100644
index 0000000..208b707
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_pencil.png b/interface/web/themes/default-v2/icons/x16/notebook_pencil.png
new file mode 100644
index 0000000..207c1f0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_plus.png b/interface/web/themes/default-v2/icons/x16/notebook_plus.png
new file mode 100644
index 0000000..1fed83b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebook_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks.png b/interface/web/themes/default-v2/icons/x16/notebooks.png
new file mode 100644
index 0000000..0d37967
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png b/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png
new file mode 100644
index 0000000..92f9804
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png b/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png
new file mode 100644
index 0000000..3cafa5e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_minus.png b/interface/web/themes/default-v2/icons/x16/notebooks_minus.png
new file mode 100644
index 0000000..ec879ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png b/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png
new file mode 100644
index 0000000..69cedaf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_plus.png b/interface/web/themes/default-v2/icons/x16/notebooks_plus.png
new file mode 100644
index 0000000..70cb2f4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/notebooks_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can.png b/interface/web/themes/default-v2/icons/x16/paint_can.png
new file mode 100644
index 0000000..ac2c4a3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png b/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png
new file mode 100644
index 0000000..e2dc31c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png b/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png
new file mode 100644
index 0000000..51516bf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_minus.png b/interface/web/themes/default-v2/icons/x16/paint_can_minus.png
new file mode 100644
index 0000000..90edf3f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png b/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png
new file mode 100644
index 0000000..536f926
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_plus.png b/interface/web/themes/default-v2/icons/x16/paint_can_plus.png
new file mode 100644
index 0000000..e526648
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paint_can_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette.png b/interface/web/themes/default-v2/icons/x16/palette.png
new file mode 100644
index 0000000..c9d7964
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_arrow.png b/interface/web/themes/default-v2/icons/x16/palette_arrow.png
new file mode 100644
index 0000000..4a96f6c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_exclamation.png b/interface/web/themes/default-v2/icons/x16/palette_exclamation.png
new file mode 100644
index 0000000..8cc0d6a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_minus.png b/interface/web/themes/default-v2/icons/x16/palette_minus.png
new file mode 100644
index 0000000..2d6efca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_pencil.png b/interface/web/themes/default-v2/icons/x16/palette_pencil.png
new file mode 100644
index 0000000..ee11bf4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_plus.png b/interface/web/themes/default-v2/icons/x16/palette_plus.png
new file mode 100644
index 0000000..d0032fc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/palette_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag.png b/interface/web/themes/default-v2/icons/x16/paper_bag.png
new file mode 100644
index 0000000..2d6de20
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png b/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png
new file mode 100644
index 0000000..5f51358
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png b/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png
new file mode 100644
index 0000000..fc1836d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png b/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png
new file mode 100644
index 0000000..fa334ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png b/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png
new file mode 100644
index 0000000..9a9648b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png b/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png
new file mode 100644
index 0000000..176033e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil.png b/interface/web/themes/default-v2/icons/x16/pencil.png
new file mode 100644
index 0000000..6981027
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_arrow.png b/interface/web/themes/default-v2/icons/x16/pencil_arrow.png
new file mode 100644
index 0000000..91efbde
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png b/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png
new file mode 100644
index 0000000..64c53af
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_minus.png b/interface/web/themes/default-v2/icons/x16/pencil_minus.png
new file mode 100644
index 0000000..0a827a2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_plus.png b/interface/web/themes/default-v2/icons/x16/pencil_plus.png
new file mode 100644
index 0000000..9cc6e2d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_small.png b/interface/web/themes/default-v2/icons/x16/pencil_small.png
new file mode 100644
index 0000000..921f23b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pencil_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album.png b/interface/web/themes/default-v2/icons/x16/photo_album.png
new file mode 100644
index 0000000..27747ad
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png b/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png
new file mode 100644
index 0000000..a2572e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png b/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png
new file mode 100644
index 0000000..b5e6356
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__minus.png b/interface/web/themes/default-v2/icons/x16/photo_album__minus.png
new file mode 100644
index 0000000..f2af67d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png b/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png
new file mode 100644
index 0000000..6be3f7b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__plus.png b/interface/web/themes/default-v2/icons/x16/photo_album__plus.png
new file mode 100644
index 0000000..09d29a3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album_blue.png b/interface/web/themes/default-v2/icons/x16/photo_album_blue.png
new file mode 100644
index 0000000..5684ecb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/photo_album_blue.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano.png b/interface/web/themes/default-v2/icons/x16/piano.png
new file mode 100644
index 0000000..0615786
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_arrow.png b/interface/web/themes/default-v2/icons/x16/piano_arrow.png
new file mode 100644
index 0000000..337f72b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_exclamation.png b/interface/web/themes/default-v2/icons/x16/piano_exclamation.png
new file mode 100644
index 0000000..108cef2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_minus.png b/interface/web/themes/default-v2/icons/x16/piano_minus.png
new file mode 100644
index 0000000..091520c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_pencil.png b/interface/web/themes/default-v2/icons/x16/piano_pencil.png
new file mode 100644
index 0000000..0f1de2b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_plus.png b/interface/web/themes/default-v2/icons/x16/piano_plus.png
new file mode 100644
index 0000000..26a5144
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/piano_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture.png b/interface/web/themes/default-v2/icons/x16/picture.png
new file mode 100644
index 0000000..d1ddcc6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_arrow.png b/interface/web/themes/default-v2/icons/x16/picture_arrow.png
new file mode 100644
index 0000000..d50d357
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_exclamation.png b/interface/web/themes/default-v2/icons/x16/picture_exclamation.png
new file mode 100644
index 0000000..e4e5ff1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_minus.png b/interface/web/themes/default-v2/icons/x16/picture_minus.png
new file mode 100644
index 0000000..b937caf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_pencil.png b/interface/web/themes/default-v2/icons/x16/picture_pencil.png
new file mode 100644
index 0000000..25fb9f7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_plus.png b/interface/web/themes/default-v2/icons/x16/picture_plus.png
new file mode 100644
index 0000000..1b10f92
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_small.png b/interface/web/themes/default-v2/icons/x16/picture_small.png
new file mode 100644
index 0000000..c25fa6f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png b/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png
new file mode 100644
index 0000000..5a35685
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_sunset.png b/interface/web/themes/default-v2/icons/x16/picture_sunset.png
new file mode 100644
index 0000000..0d59a8d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/picture_sunset.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures.png b/interface/web/themes/default-v2/icons/x16/pictures.png
new file mode 100644
index 0000000..d2401b5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_arrow.png b/interface/web/themes/default-v2/icons/x16/pictures_arrow.png
new file mode 100644
index 0000000..eb64124
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png b/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png
new file mode 100644
index 0000000..1a06f01
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_minus.png b/interface/web/themes/default-v2/icons/x16/pictures_minus.png
new file mode 100644
index 0000000..6f1e1ce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_pencil.png b/interface/web/themes/default-v2/icons/x16/pictures_pencil.png
new file mode 100644
index 0000000..86ef9e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_plus.png b/interface/web/themes/default-v2/icons/x16/pictures_plus.png
new file mode 100644
index 0000000..636f3e5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pictures_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill.png b/interface/web/themes/default-v2/icons/x16/pill.png
new file mode 100644
index 0000000..442e4ed
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_arrow.png b/interface/web/themes/default-v2/icons/x16/pill_arrow.png
new file mode 100644
index 0000000..a5990fa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_exclamation.png b/interface/web/themes/default-v2/icons/x16/pill_exclamation.png
new file mode 100644
index 0000000..07a2af5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_minus.png b/interface/web/themes/default-v2/icons/x16/pill_minus.png
new file mode 100644
index 0000000..8d31ac2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_pencil.png b/interface/web/themes/default-v2/icons/x16/pill_pencil.png
new file mode 100644
index 0000000..90d40a8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_plus.png b/interface/web/themes/default-v2/icons/x16/pill_plus.png
new file mode 100644
index 0000000..b206fb5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_small.png b/interface/web/themes/default-v2/icons/x16/pill_small.png
new file mode 100644
index 0000000..0b355ce
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pill_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin.png b/interface/web/themes/default-v2/icons/x16/pin.png
new file mode 100644
index 0000000..d8762f4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_arrow.png b/interface/web/themes/default-v2/icons/x16/pin_arrow.png
new file mode 100644
index 0000000..02034d6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_exclamation.png b/interface/web/themes/default-v2/icons/x16/pin_exclamation.png
new file mode 100644
index 0000000..e342d01
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_minus.png b/interface/web/themes/default-v2/icons/x16/pin_minus.png
new file mode 100644
index 0000000..19a7dc0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_pencil.png b/interface/web/themes/default-v2/icons/x16/pin_pencil.png
new file mode 100644
index 0000000..d546420
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_plus.png b/interface/web/themes/default-v2/icons/x16/pin_plus.png
new file mode 100644
index 0000000..db50e1c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pin_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette.png b/interface/web/themes/default-v2/icons/x16/pipette.png
new file mode 100644
index 0000000..4e52abe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_arrow.png b/interface/web/themes/default-v2/icons/x16/pipette_arrow.png
new file mode 100644
index 0000000..615188b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png b/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png
new file mode 100644
index 0000000..63443d3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_minus.png b/interface/web/themes/default-v2/icons/x16/pipette_minus.png
new file mode 100644
index 0000000..4e239e4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_pencil.png b/interface/web/themes/default-v2/icons/x16/pipette_pencil.png
new file mode 100644
index 0000000..066d012
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_plus.png b/interface/web/themes/default-v2/icons/x16/pipette_plus.png
new file mode 100644
index 0000000..058e6d9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/pipette_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card.png b/interface/web/themes/default-v2/icons/x16/playing_card.png
new file mode 100644
index 0000000..15094fa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png b/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png
new file mode 100644
index 0000000..95884de
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png b/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png
new file mode 100644
index 0000000..a5c648f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_minus.png b/interface/web/themes/default-v2/icons/x16/playing_card_minus.png
new file mode 100644
index 0000000..5c1e50e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png b/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png
new file mode 100644
index 0000000..6c0364d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_plus.png b/interface/web/themes/default-v2/icons/x16/playing_card_plus.png
new file mode 100644
index 0000000..800aa72
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/playing_card_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug.png b/interface/web/themes/default-v2/icons/x16/plug.png
new file mode 100644
index 0000000..cbc85ac
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_arrow.png b/interface/web/themes/default-v2/icons/x16/plug_arrow.png
new file mode 100644
index 0000000..347bfc6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_exclamation.png b/interface/web/themes/default-v2/icons/x16/plug_exclamation.png
new file mode 100644
index 0000000..ee67f1d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_minus.png b/interface/web/themes/default-v2/icons/x16/plug_minus.png
new file mode 100644
index 0000000..b386945
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_pencil.png b/interface/web/themes/default-v2/icons/x16/plug_pencil.png
new file mode 100644
index 0000000..378e201
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_plus.png b/interface/web/themes/default-v2/icons/x16/plug_plus.png
new file mode 100644
index 0000000..d541cb6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plug_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus.png b/interface/web/themes/default-v2/icons/x16/plus.png
new file mode 100644
index 0000000..2fe36a1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_circle.png b/interface/web/themes/default-v2/icons/x16/plus_circle.png
new file mode 100644
index 0000000..21d5f83
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png b/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png
new file mode 100644
index 0000000..288625a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_shield.png b/interface/web/themes/default-v2/icons/x16/plus_shield.png
new file mode 100644
index 0000000..f703e92
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_small.png b/interface/web/themes/default-v2/icons/x16/plus_small.png
new file mode 100644
index 0000000..da116dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_small_circle.png b/interface/web/themes/default-v2/icons/x16/plus_small_circle.png
new file mode 100644
index 0000000..bcf7272
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/plus_small_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer.png b/interface/web/themes/default-v2/icons/x16/printer.png
new file mode 100644
index 0000000..da4d0ec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__arrow.png b/interface/web/themes/default-v2/icons/x16/printer__arrow.png
new file mode 100644
index 0000000..7c9e8ea
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__exclamation.png b/interface/web/themes/default-v2/icons/x16/printer__exclamation.png
new file mode 100644
index 0000000..8b5cc29
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__minus.png b/interface/web/themes/default-v2/icons/x16/printer__minus.png
new file mode 100644
index 0000000..af5d449
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__pencil.png b/interface/web/themes/default-v2/icons/x16/printer__pencil.png
new file mode 100644
index 0000000..b1a382a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__plus.png b/interface/web/themes/default-v2/icons/x16/printer__plus.png
new file mode 100644
index 0000000..4608a84
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer_empty.png b/interface/web/themes/default-v2/icons/x16/printer_empty.png
new file mode 100644
index 0000000..f1a0095
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer_small.png b/interface/web/themes/default-v2/icons/x16/printer_small.png
new file mode 100644
index 0000000..3f0a1a2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/printer_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle.png b/interface/web/themes/default-v2/icons/x16/puzzle.png
new file mode 100644
index 0000000..8c23fe1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png b/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png
new file mode 100644
index 0000000..2e6fe76
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png b/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png
new file mode 100644
index 0000000..f6de645
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__minus.png b/interface/web/themes/default-v2/icons/x16/puzzle__minus.png
new file mode 100644
index 0000000..07d7752
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png b/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png
new file mode 100644
index 0000000..19aa952
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__plus.png b/interface/web/themes/default-v2/icons/x16/puzzle__plus.png
new file mode 100644
index 0000000..8bf14ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle_disable.png b/interface/web/themes/default-v2/icons/x16/puzzle_disable.png
new file mode 100644
index 0000000..d39db2e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/puzzle_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/question.png b/interface/web/themes/default-v2/icons/x16/question.png
new file mode 100644
index 0000000..2a55b01
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/question.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_frame.png b/interface/web/themes/default-v2/icons/x16/question_frame.png
new file mode 100644
index 0000000..d15b7ec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/question_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_shield.png b/interface/web/themes/default-v2/icons/x16/question_shield.png
new file mode 100644
index 0000000..71f274c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/question_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_small.png b/interface/web/themes/default-v2/icons/x16/question_small.png
new file mode 100644
index 0000000..dbb8aa5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/question_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt.png b/interface/web/themes/default-v2/icons/x16/receipt.png
new file mode 100644
index 0000000..5c628d7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_arrow.png b/interface/web/themes/default-v2/icons/x16/receipt_arrow.png
new file mode 100644
index 0000000..d165747
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png b/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png
new file mode 100644
index 0000000..c96861c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_minus.png b/interface/web/themes/default-v2/icons/x16/receipt_minus.png
new file mode 100644
index 0000000..7d8f20f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_pencil.png b/interface/web/themes/default-v2/icons/x16/receipt_pencil.png
new file mode 100644
index 0000000..af6dde0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_plus.png b/interface/web/themes/default-v2/icons/x16/receipt_plus.png
new file mode 100644
index 0000000..a3a0912
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_shred.png b/interface/web/themes/default-v2/icons/x16/receipt_shred.png
new file mode 100644
index 0000000..2e3c8f1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_shred.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_text.png b/interface/web/themes/default-v2/icons/x16/receipt_text.png
new file mode 100644
index 0000000..0d33918
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipt_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts.png b/interface/web/themes/default-v2/icons/x16/receipts.png
new file mode 100644
index 0000000..5c72af5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_arrow.png b/interface/web/themes/default-v2/icons/x16/receipts_arrow.png
new file mode 100644
index 0000000..f253443
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png b/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png
new file mode 100644
index 0000000..10da4a9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_minus.png b/interface/web/themes/default-v2/icons/x16/receipts_minus.png
new file mode 100644
index 0000000..d343b4a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_pencil.png b/interface/web/themes/default-v2/icons/x16/receipts_pencil.png
new file mode 100644
index 0000000..c4bb367
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_plus.png b/interface/web/themes/default-v2/icons/x16/receipts_plus.png
new file mode 100644
index 0000000..662ae04
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_text.png b/interface/web/themes/default-v2/icons/x16/receipts_text.png
new file mode 100644
index 0000000..6e395e3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/receipts_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report.png b/interface/web/themes/default-v2/icons/x16/report.png
new file mode 100644
index 0000000..d618d9f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_arrow.png b/interface/web/themes/default-v2/icons/x16/report_arrow.png
new file mode 100644
index 0000000..340dbb4
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_exclamation.png b/interface/web/themes/default-v2/icons/x16/report_exclamation.png
new file mode 100644
index 0000000..9835938
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_minus.png b/interface/web/themes/default-v2/icons/x16/report_minus.png
new file mode 100644
index 0000000..3e168b3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_pencil.png b/interface/web/themes/default-v2/icons/x16/report_pencil.png
new file mode 100644
index 0000000..8473dbe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_plus.png b/interface/web/themes/default-v2/icons/x16/report_plus.png
new file mode 100644
index 0000000..49b9995
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/report_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler.png b/interface/web/themes/default-v2/icons/x16/ruler.png
new file mode 100644
index 0000000..806c3d0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__arrow.png b/interface/web/themes/default-v2/icons/x16/ruler__arrow.png
new file mode 100644
index 0000000..4460461
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png b/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png
new file mode 100644
index 0000000..df09b53
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__minus.png b/interface/web/themes/default-v2/icons/x16/ruler__minus.png
new file mode 100644
index 0000000..f9d6ce8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__pencil.png b/interface/web/themes/default-v2/icons/x16/ruler__pencil.png
new file mode 100644
index 0000000..0cec26b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__plus.png b/interface/web/themes/default-v2/icons/x16/ruler__plus.png
new file mode 100644
index 0000000..0dabd9c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler_crop.png b/interface/web/themes/default-v2/icons/x16/ruler_crop.png
new file mode 100644
index 0000000..931fec6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ruler_crop.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe.png b/interface/web/themes/default-v2/icons/x16/safe.png
new file mode 100644
index 0000000..fa15852
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_arrow.png b/interface/web/themes/default-v2/icons/x16/safe_arrow.png
new file mode 100644
index 0000000..b9dd1b5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_exclamation.png b/interface/web/themes/default-v2/icons/x16/safe_exclamation.png
new file mode 100644
index 0000000..dda4b8a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_minus.png b/interface/web/themes/default-v2/icons/x16/safe_minus.png
new file mode 100644
index 0000000..5d3f4b7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_pencil.png b/interface/web/themes/default-v2/icons/x16/safe_pencil.png
new file mode 100644
index 0000000..45eeb42
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_plus.png b/interface/web/themes/default-v2/icons/x16/safe_plus.png
new file mode 100644
index 0000000..6721431
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/safe_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver.png b/interface/web/themes/default-v2/icons/x16/screwdriver.png
new file mode 100644
index 0000000..ad69f58
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png b/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png
new file mode 100644
index 0000000..6c53748
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png b/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png
new file mode 100644
index 0000000..d35224a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png b/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png
new file mode 100644
index 0000000..e9b780d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png b/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png
new file mode 100644
index 0000000..c745d7c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png b/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png
new file mode 100644
index 0000000..d8fbbae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script.png b/interface/web/themes/default-v2/icons/x16/script.png
new file mode 100644
index 0000000..672c3c9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__arrow.png b/interface/web/themes/default-v2/icons/x16/script__arrow.png
new file mode 100644
index 0000000..462eeec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__exclamation.png b/interface/web/themes/default-v2/icons/x16/script__exclamation.png
new file mode 100644
index 0000000..5296a60
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__minus.png b/interface/web/themes/default-v2/icons/x16/script__minus.png
new file mode 100644
index 0000000..126ecff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__pencil.png b/interface/web/themes/default-v2/icons/x16/script__pencil.png
new file mode 100644
index 0000000..dfc36a7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__plus.png b/interface/web/themes/default-v2/icons/x16/script__plus.png
new file mode 100644
index 0000000..e6a4934
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/script_code.png b/interface/web/themes/default-v2/icons/x16/script_code.png
new file mode 100644
index 0000000..04cb701
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/script_code.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts.png b/interface/web/themes/default-v2/icons/x16/scripts.png
new file mode 100644
index 0000000..c36414f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__arrow.png b/interface/web/themes/default-v2/icons/x16/scripts__arrow.png
new file mode 100644
index 0000000..9adba7a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png b/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png
new file mode 100644
index 0000000..dec43e2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__minus.png b/interface/web/themes/default-v2/icons/x16/scripts__minus.png
new file mode 100644
index 0000000..7cc3666
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__pencil.png b/interface/web/themes/default-v2/icons/x16/scripts__pencil.png
new file mode 100644
index 0000000..616d555
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__plus.png b/interface/web/themes/default-v2/icons/x16/scripts__plus.png
new file mode 100644
index 0000000..00bde07
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts_code.png b/interface/web/themes/default-v2/icons/x16/scripts_code.png
new file mode 100644
index 0000000..15123f5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/scripts_code.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield.png b/interface/web/themes/default-v2/icons/x16/shield.png
new file mode 100644
index 0000000..085880b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__arrow.png b/interface/web/themes/default-v2/icons/x16/shield__arrow.png
new file mode 100644
index 0000000..9b6457e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__exclamation.png b/interface/web/themes/default-v2/icons/x16/shield__exclamation.png
new file mode 100644
index 0000000..704f4ae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__minus.png b/interface/web/themes/default-v2/icons/x16/shield__minus.png
new file mode 100644
index 0000000..3c0d04a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__pencil.png b/interface/web/themes/default-v2/icons/x16/shield__pencil.png
new file mode 100644
index 0000000..c717e4d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__plus.png b/interface/web/themes/default-v2/icons/x16/shield__plus.png
new file mode 100644
index 0000000..5ea1cb9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield_disable.png b/interface/web/themes/default-v2/icons/x16/shield_disable.png
new file mode 100644
index 0000000..d2dc3c5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/shield_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/slash.png b/interface/web/themes/default-v2/icons/x16/slash.png
new file mode 100644
index 0000000..f941cff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/slash.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/slash_small.png b/interface/web/themes/default-v2/icons/x16/slash_small.png
new file mode 100644
index 0000000..c1259eb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/slash_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket.png b/interface/web/themes/default-v2/icons/x16/socket.png
new file mode 100644
index 0000000..640f225
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_arrow.png b/interface/web/themes/default-v2/icons/x16/socket_arrow.png
new file mode 100644
index 0000000..671342c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_exclamation.png b/interface/web/themes/default-v2/icons/x16/socket_exclamation.png
new file mode 100644
index 0000000..8f01300
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_minus.png b/interface/web/themes/default-v2/icons/x16/socket_minus.png
new file mode 100644
index 0000000..4dfeaaf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_pencil.png b/interface/web/themes/default-v2/icons/x16/socket_pencil.png
new file mode 100644
index 0000000..e38a0d1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_plus.png b/interface/web/themes/default-v2/icons/x16/socket_plus.png
new file mode 100644
index 0000000..9854d70
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/socket_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort.png b/interface/web/themes/default-v2/icons/x16/sort.png
new file mode 100644
index 0000000..a3d410e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__arrow.png b/interface/web/themes/default-v2/icons/x16/sort__arrow.png
new file mode 100644
index 0000000..9aa43cb
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__exclamation.png b/interface/web/themes/default-v2/icons/x16/sort__exclamation.png
new file mode 100644
index 0000000..9f7aa31
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__minus.png b/interface/web/themes/default-v2/icons/x16/sort__minus.png
new file mode 100644
index 0000000..5cec832
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__pencil.png b/interface/web/themes/default-v2/icons/x16/sort__pencil.png
new file mode 100644
index 0000000..1bc1fae
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__plus.png b/interface/web/themes/default-v2/icons/x16/sort__plus.png
new file mode 100644
index 0000000..d4e7fca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_alphabet.png b/interface/web/themes/default-v2/icons/x16/sort_alphabet.png
new file mode 100644
index 0000000..92c4a9c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_alphabet.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png b/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png
new file mode 100644
index 0000000..8dca34c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_date.png b/interface/web/themes/default-v2/icons/x16/sort_date.png
new file mode 100644
index 0000000..21e367c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_date.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_date_descending.png b/interface/web/themes/default-v2/icons/x16/sort_date_descending.png
new file mode 100644
index 0000000..69217fa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_date_descending.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_number.png b/interface/web/themes/default-v2/icons/x16/sort_number.png
new file mode 100644
index 0000000..dce9aad
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_number.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_number_descending.png b/interface/web/themes/default-v2/icons/x16/sort_number_descending.png
new file mode 100644
index 0000000..eadec7c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_number_descending.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_quantity.png b/interface/web/themes/default-v2/icons/x16/sort_quantity.png
new file mode 100644
index 0000000..fb2c1e3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_quantity.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png b/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png
new file mode 100644
index 0000000..abacec9
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_small.png b/interface/web/themes/default-v2/icons/x16/sort_small.png
new file mode 100644
index 0000000..a5cf900
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sort_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp.png b/interface/web/themes/default-v2/icons/x16/stamp.png
new file mode 100644
index 0000000..ca9475d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_arrow.png b/interface/web/themes/default-v2/icons/x16/stamp_arrow.png
new file mode 100644
index 0000000..28e4940
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png b/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png
new file mode 100644
index 0000000..6e6cf30
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_minus.png b/interface/web/themes/default-v2/icons/x16/stamp_minus.png
new file mode 100644
index 0000000..55582ff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_pencil.png b/interface/web/themes/default-v2/icons/x16/stamp_pencil.png
new file mode 100644
index 0000000..2cd7319
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_plus.png b/interface/web/themes/default-v2/icons/x16/stamp_plus.png
new file mode 100644
index 0000000..c3de459
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/stamp_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star.png b/interface/web/themes/default-v2/icons/x16/star.png
new file mode 100644
index 0000000..a23dbdf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__arrow.png b/interface/web/themes/default-v2/icons/x16/star__arrow.png
new file mode 100644
index 0000000..b011f0e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__exclamation.png b/interface/web/themes/default-v2/icons/x16/star__exclamation.png
new file mode 100644
index 0000000..46a204d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__minus.png b/interface/web/themes/default-v2/icons/x16/star__minus.png
new file mode 100644
index 0000000..d150e00
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__pencil.png b/interface/web/themes/default-v2/icons/x16/star__pencil.png
new file mode 100644
index 0000000..cf0d77b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__plus.png b/interface/web/themes/default-v2/icons/x16/star__plus.png
new file mode 100644
index 0000000..9f32f79
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_empty.png b/interface/web/themes/default-v2/icons/x16/star_empty.png
new file mode 100644
index 0000000..019e358
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_half.png b/interface/web/themes/default-v2/icons/x16/star_half.png
new file mode 100644
index 0000000..7fdbd37
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star_half.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small.png b/interface/web/themes/default-v2/icons/x16/star_small.png
new file mode 100644
index 0000000..c1378cf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small_empty.png b/interface/web/themes/default-v2/icons/x16/star_small_empty.png
new file mode 100644
index 0000000..bcadeaa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star_small_empty.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small_half.png b/interface/web/themes/default-v2/icons/x16/star_small_half.png
new file mode 100644
index 0000000..6b1cb6d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/star_small_half.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note.png b/interface/web/themes/default-v2/icons/x16/sticky_note.png
new file mode 100644
index 0000000..ff9d467
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png b/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png
new file mode 100644
index 0000000..2488b94
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png b/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png
new file mode 100644
index 0000000..e201d16
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png b/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png
new file mode 100644
index 0000000..56833a1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png b/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png
new file mode 100644
index 0000000..83cebec
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png b/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png
new file mode 100644
index 0000000..6dcb51a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png
new file mode 100644
index 0000000..6e64b83
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png b/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png
new file mode 100644
index 0000000..934c3d8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_small.png b/interface/web/themes/default-v2/icons/x16/sticky_note_small.png
new file mode 100644
index 0000000..8ce8178
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png
new file mode 100644
index 0000000..67357e8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_text.png b/interface/web/themes/default-v2/icons/x16/sticky_note_text.png
new file mode 100644
index 0000000..94d2e94
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_note_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes.png b/interface/web/themes/default-v2/icons/x16/sticky_notes.png
new file mode 100644
index 0000000..9940a55
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png
new file mode 100644
index 0000000..6451cfe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png
new file mode 100644
index 0000000..72aa718
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png
new file mode 100644
index 0000000..0197d57
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png
new file mode 100644
index 0000000..afecdee
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png
new file mode 100644
index 0000000..6152db1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png
new file mode 100644
index 0000000..abe78e2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png
new file mode 100644
index 0000000..ce4ae9b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png
new file mode 100644
index 0000000..2274943
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch.png b/interface/web/themes/default-v2/icons/x16/switch.png
new file mode 100644
index 0000000..d91ec21
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_arrow.png b/interface/web/themes/default-v2/icons/x16/switch_arrow.png
new file mode 100644
index 0000000..4c83fff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_exclamation.png b/interface/web/themes/default-v2/icons/x16/switch_exclamation.png
new file mode 100644
index 0000000..b2e8e36
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_minus.png b/interface/web/themes/default-v2/icons/x16/switch_minus.png
new file mode 100644
index 0000000..8d2e7d3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_pencil.png b/interface/web/themes/default-v2/icons/x16/switch_pencil.png
new file mode 100644
index 0000000..1fd85c5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_plus.png b/interface/web/themes/default-v2/icons/x16/switch_plus.png
new file mode 100644
index 0000000..a81d6c3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/switch_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table.png b/interface/web/themes/default-v2/icons/x16/table.png
new file mode 100644
index 0000000..9deb778
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__arrow.png b/interface/web/themes/default-v2/icons/x16/table__arrow.png
new file mode 100644
index 0000000..3112251
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__exclamation.png b/interface/web/themes/default-v2/icons/x16/table__exclamation.png
new file mode 100644
index 0000000..7a5d0c8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__minus.png b/interface/web/themes/default-v2/icons/x16/table__minus.png
new file mode 100644
index 0000000..ff29544
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__pencil.png b/interface/web/themes/default-v2/icons/x16/table__pencil.png
new file mode 100644
index 0000000..e17739c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__plus.png b/interface/web/themes/default-v2/icons/x16/table__plus.png
new file mode 100644
index 0000000..c1a918d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_delete.png b/interface/web/themes/default-v2/icons/x16/table_delete.png
new file mode 100644
index 0000000..f67ac0d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table_delete.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_delete_column.png b/interface/web/themes/default-v2/icons/x16/table_delete_column.png
new file mode 100644
index 0000000..a8721c3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table_delete_column.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_insert.png b/interface/web/themes/default-v2/icons/x16/table_insert.png
new file mode 100644
index 0000000..5be705b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table_insert.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_insert_column.png b/interface/web/themes/default-v2/icons/x16/table_insert_column.png
new file mode 100644
index 0000000..4348fb6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/table_insert_column.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables.png b/interface/web/themes/default-v2/icons/x16/tables.png
new file mode 100644
index 0000000..f0eb51f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_arrow.png b/interface/web/themes/default-v2/icons/x16/tables_arrow.png
new file mode 100644
index 0000000..c364e69
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_exclamation.png b/interface/web/themes/default-v2/icons/x16/tables_exclamation.png
new file mode 100644
index 0000000..faad227
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_minus.png b/interface/web/themes/default-v2/icons/x16/tables_minus.png
new file mode 100644
index 0000000..d166635
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_pencil.png b/interface/web/themes/default-v2/icons/x16/tables_pencil.png
new file mode 100644
index 0000000..f2c107c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_plus.png b/interface/web/themes/default-v2/icons/x16/tables_plus.png
new file mode 100644
index 0000000..56d6bd5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_stacks.png b/interface/web/themes/default-v2/icons/x16/tables_stacks.png
new file mode 100644
index 0000000..a7e9e87
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tables_stacks.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag.png b/interface/web/themes/default-v2/icons/x16/tag.png
new file mode 100644
index 0000000..dcc2945
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__arrow.png b/interface/web/themes/default-v2/icons/x16/tag__arrow.png
new file mode 100644
index 0000000..9d88dda
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__exclamation.png b/interface/web/themes/default-v2/icons/x16/tag__exclamation.png
new file mode 100644
index 0000000..4b0b38a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__minus.png b/interface/web/themes/default-v2/icons/x16/tag__minus.png
new file mode 100644
index 0000000..5df09a8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__pencil.png b/interface/web/themes/default-v2/icons/x16/tag__pencil.png
new file mode 100644
index 0000000..94921f6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__plus.png b/interface/web/themes/default-v2/icons/x16/tag__plus.png
new file mode 100644
index 0000000..8014448
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag_label.png b/interface/web/themes/default-v2/icons/x16/tag_label.png
new file mode 100644
index 0000000..c2dc2e0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag_label.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag_small.png b/interface/web/themes/default-v2/icons/x16/tag_small.png
new file mode 100644
index 0000000..69e0116
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tag_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags.png b/interface/web/themes/default-v2/icons/x16/tags.png
new file mode 100644
index 0000000..d06ba8b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__arrow.png b/interface/web/themes/default-v2/icons/x16/tags__arrow.png
new file mode 100644
index 0000000..8647dbf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__exclamation.png b/interface/web/themes/default-v2/icons/x16/tags__exclamation.png
new file mode 100644
index 0000000..3d0e27f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__minus.png b/interface/web/themes/default-v2/icons/x16/tags__minus.png
new file mode 100644
index 0000000..c969262
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__pencil.png b/interface/web/themes/default-v2/icons/x16/tags__pencil.png
new file mode 100644
index 0000000..20c2bc5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__plus.png b/interface/web/themes/default-v2/icons/x16/tags__plus.png
new file mode 100644
index 0000000..fa7b685
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags_label.png b/interface/web/themes/default-v2/icons/x16/tags_label.png
new file mode 100644
index 0000000..f9a0244
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tags_label.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick.png b/interface/web/themes/default-v2/icons/x16/tick.png
new file mode 100644
index 0000000..3d89b35
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_circle.png b/interface/web/themes/default-v2/icons/x16/tick_circle.png
new file mode 100644
index 0000000..26b2d5a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png b/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png
new file mode 100644
index 0000000..92282dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_shield.png b/interface/web/themes/default-v2/icons/x16/tick_shield.png
new file mode 100644
index 0000000..bfdaf4e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick_shield.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_small.png b/interface/web/themes/default-v2/icons/x16/tick_small.png
new file mode 100644
index 0000000..cc72367
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_small_circle.png b/interface/web/themes/default-v2/icons/x16/tick_small_circle.png
new file mode 100644
index 0000000..37ef5cd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tick_small_circle.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket.png b/interface/web/themes/default-v2/icons/x16/ticket.png
new file mode 100644
index 0000000..543ee24
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_arrow.png b/interface/web/themes/default-v2/icons/x16/ticket_arrow.png
new file mode 100644
index 0000000..fe6e698
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png b/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png
new file mode 100644
index 0000000..b9b2d1c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_minus.png b/interface/web/themes/default-v2/icons/x16/ticket_minus.png
new file mode 100644
index 0000000..f82a363
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_pencil.png b/interface/web/themes/default-v2/icons/x16/ticket_pencil.png
new file mode 100644
index 0000000..b795e5f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_plus.png b/interface/web/themes/default-v2/icons/x16/ticket_plus.png
new file mode 100644
index 0000000..6343930
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_small.png b/interface/web/themes/default-v2/icons/x16/ticket_small.png
new file mode 100644
index 0000000..01dd7bf
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/ticket_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy.png b/interface/web/themes/default-v2/icons/x16/trophy.png
new file mode 100644
index 0000000..747b6b1
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_arrow.png b/interface/web/themes/default-v2/icons/x16/trophy_arrow.png
new file mode 100644
index 0000000..61777f7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png b/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png
new file mode 100644
index 0000000..4b12dbe
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_minus.png b/interface/web/themes/default-v2/icons/x16/trophy_minus.png
new file mode 100644
index 0000000..2914743
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_pencil.png b/interface/web/themes/default-v2/icons/x16/trophy_pencil.png
new file mode 100644
index 0000000..3990eee
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_plus.png b/interface/web/themes/default-v2/icons/x16/trophy_plus.png
new file mode 100644
index 0000000..7b35130
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/trophy_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/tux.png b/interface/web/themes/default-v2/icons/x16/tux.png
new file mode 100644
index 0000000..2e6d9d8
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/tux.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user.png b/interface/web/themes/default-v2/icons/x16/user.png
new file mode 100644
index 0000000..6e051f3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_add.png b/interface/web/themes/default-v2/icons/x16/user_add.png
new file mode 100644
index 0000000..6d84550
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_add.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_comment.png b/interface/web/themes/default-v2/icons/x16/user_comment.png
new file mode 100644
index 0000000..3440569
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_comment.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_delete.png b/interface/web/themes/default-v2/icons/x16/user_delete.png
new file mode 100644
index 0000000..95792e2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_delete.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_edit.png b/interface/web/themes/default-v2/icons/x16/user_edit.png
new file mode 100644
index 0000000..b26a1ca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_edit.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_female.png b/interface/web/themes/default-v2/icons/x16/user_female.png
new file mode 100644
index 0000000..0c7293e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_female.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_go.png b/interface/web/themes/default-v2/icons/x16/user_go.png
new file mode 100644
index 0000000..868ed28
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_go.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_gray.png b/interface/web/themes/default-v2/icons/x16/user_gray.png
new file mode 100644
index 0000000..7b4a507
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_gray.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_green.png b/interface/web/themes/default-v2/icons/x16/user_green.png
new file mode 100644
index 0000000..264381e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_green.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_orange.png b/interface/web/themes/default-v2/icons/x16/user_orange.png
new file mode 100644
index 0000000..d4fee60
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_orange.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_red.png b/interface/web/themes/default-v2/icons/x16/user_red.png
new file mode 100644
index 0000000..165bc9c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_red.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_suit.png b/interface/web/themes/default-v2/icons/x16/user_suit.png
new file mode 100644
index 0000000..44d0db7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/user_suit.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard.png b/interface/web/themes/default-v2/icons/x16/vcard.png
new file mode 100644
index 0000000..767f498
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/vcard.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_add.png b/interface/web/themes/default-v2/icons/x16/vcard_add.png
new file mode 100644
index 0000000..dd9d414
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/vcard_add.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_delete.png b/interface/web/themes/default-v2/icons/x16/vcard_delete.png
new file mode 100644
index 0000000..2c944dd
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/vcard_delete.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_edit.png b/interface/web/themes/default-v2/icons/x16/vcard_edit.png
new file mode 100644
index 0000000..d7026e7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/vcard_edit.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall.png b/interface/web/themes/default-v2/icons/x16/wall.png
new file mode 100644
index 0000000..8a1ea16
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__arrow.png b/interface/web/themes/default-v2/icons/x16/wall__arrow.png
new file mode 100644
index 0000000..b0ebdff
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall__arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__exclamation.png b/interface/web/themes/default-v2/icons/x16/wall__exclamation.png
new file mode 100644
index 0000000..96e59b3
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall__exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__minus.png b/interface/web/themes/default-v2/icons/x16/wall__minus.png
new file mode 100644
index 0000000..4f4dd35
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall__minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__pencil.png b/interface/web/themes/default-v2/icons/x16/wall__pencil.png
new file mode 100644
index 0000000..4ba4414
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall__pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__plus.png b/interface/web/themes/default-v2/icons/x16/wall__plus.png
new file mode 100644
index 0000000..4cc0ace
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall__plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_brick.png b/interface/web/themes/default-v2/icons/x16/wall_brick.png
new file mode 100644
index 0000000..4b7d70a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall_brick.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_disable.png b/interface/web/themes/default-v2/icons/x16/wall_disable.png
new file mode 100644
index 0000000..12b9dca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall_disable.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_small.png b/interface/web/themes/default-v2/icons/x16/wall_small.png
new file mode 100644
index 0000000..9d41e1e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall_small.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_small_brick.png b/interface/web/themes/default-v2/icons/x16/wall_small_brick.png
new file mode 100644
index 0000000..7293179
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wall_small_brick.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet.png b/interface/web/themes/default-v2/icons/x16/wallet.png
new file mode 100644
index 0000000..2632217
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_arrow.png b/interface/web/themes/default-v2/icons/x16/wallet_arrow.png
new file mode 100644
index 0000000..e0ebf3b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png b/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png
new file mode 100644
index 0000000..c6e0ff7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_minus.png b/interface/web/themes/default-v2/icons/x16/wallet_minus.png
new file mode 100644
index 0000000..4945538
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_pencil.png b/interface/web/themes/default-v2/icons/x16/wallet_pencil.png
new file mode 100644
index 0000000..0094fe5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_plus.png b/interface/web/themes/default-v2/icons/x16/wallet_plus.png
new file mode 100644
index 0000000..ee68702
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wallet_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand.png b/interface/web/themes/default-v2/icons/x16/wand.png
new file mode 100644
index 0000000..c07acca
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_arrow.png b/interface/web/themes/default-v2/icons/x16/wand_arrow.png
new file mode 100644
index 0000000..5a9c841
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_exclamation.png b/interface/web/themes/default-v2/icons/x16/wand_exclamation.png
new file mode 100644
index 0000000..ea33f5e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_minus.png b/interface/web/themes/default-v2/icons/x16/wand_minus.png
new file mode 100644
index 0000000..1217278
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_pencil.png b/interface/web/themes/default-v2/icons/x16/wand_pencil.png
new file mode 100644
index 0000000..1dfa945
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_plus.png b/interface/web/themes/default-v2/icons/x16/wand_plus.png
new file mode 100644
index 0000000..e9ac4f0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wand_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench.png b/interface/web/themes/default-v2/icons/x16/wrench.png
new file mode 100644
index 0000000..8c01122
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_arrow.png b/interface/web/themes/default-v2/icons/x16/wrench_arrow.png
new file mode 100644
index 0000000..77f2f3e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_arrow.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png b/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png
new file mode 100644
index 0000000..597b522
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_minus.png b/interface/web/themes/default-v2/icons/x16/wrench_minus.png
new file mode 100644
index 0000000..e0ac40e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_minus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_pencil.png b/interface/web/themes/default-v2/icons/x16/wrench_pencil.png
new file mode 100644
index 0000000..937788a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_pencil.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_plus.png b/interface/web/themes/default-v2/icons/x16/wrench_plus.png
new file mode 100644
index 0000000..c187f25
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_plus.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png b/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png
new file mode 100644
index 0000000..123eec5
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/calculator.png b/interface/web/themes/default-v2/icons/x32/calculator.png
new file mode 100644
index 0000000..703031e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/calculator.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/client.png b/interface/web/themes/default-v2/icons/x32/client.png
new file mode 100644
index 0000000..1c9b5dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/client.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/dashboard.png b/interface/web/themes/default-v2/icons/x32/dashboard.png
new file mode 100644
index 0000000..240d3a2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/dashboard.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/dns.png b/interface/web/themes/default-v2/icons/x32/dns.png
new file mode 100644
index 0000000..03e63b0
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/dns.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/domain.png b/interface/web/themes/default-v2/icons/x32/domain.png
new file mode 100644
index 0000000..f829d2c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/domain.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/drawer.png b/interface/web/themes/default-v2/icons/x32/drawer.png
new file mode 100644
index 0000000..f94f6b6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/drawer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/email.png b/interface/web/themes/default-v2/icons/x32/email.png
new file mode 100644
index 0000000..2770614
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/email.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/help.png b/interface/web/themes/default-v2/icons/x32/help.png
new file mode 100644
index 0000000..b6a7afa
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/help.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/login.png b/interface/web/themes/default-v2/icons/x32/login.png
new file mode 100644
index 0000000..7e81f55
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/login.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/monitor.png b/interface/web/themes/default-v2/icons/x32/monitor.png
new file mode 100644
index 0000000..ee73376
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/monitor.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/network.png b/interface/web/themes/default-v2/icons/x32/network.png
new file mode 100644
index 0000000..cfafc04
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/network.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/server.png b/interface/web/themes/default-v2/icons/x32/server.png
new file mode 100644
index 0000000..3471b9d
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/server.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/sites.png b/interface/web/themes/default-v2/icons/x32/sites.png
new file mode 100644
index 0000000..64ea1b6
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/sites.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_critical.png b/interface/web/themes/default-v2/icons/x32/state_critical.png
new file mode 100644
index 0000000..caeed33
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_critical.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_error.png b/interface/web/themes/default-v2/icons/x32/state_error.png
new file mode 100644
index 0000000..112a264
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_error.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_info.png b/interface/web/themes/default-v2/icons/x32/state_info.png
new file mode 100644
index 0000000..91bd218
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_info.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_ok.png b/interface/web/themes/default-v2/icons/x32/state_ok.png
new file mode 100644
index 0000000..a4a8964
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_ok.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_unknown.png b/interface/web/themes/default-v2/icons/x32/state_unknown.png
new file mode 100644
index 0000000..22c034b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_unknown.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_warning.png b/interface/web/themes/default-v2/icons/x32/state_warning.png
new file mode 100644
index 0000000..e3e7c1f
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/state_warning.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/system.png b/interface/web/themes/default-v2/icons/x32/system.png
new file mode 100644
index 0000000..136083c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/system.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x32/tools.png b/interface/web/themes/default-v2/icons/x32/tools.png
new file mode 100644
index 0000000..fe1e27c
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x32/tools.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/client.png b/interface/web/themes/default-v2/icons/x64/client.png
new file mode 100644
index 0000000..96e74e7
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/client.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/dashboard.png b/interface/web/themes/default-v2/icons/x64/dashboard.png
new file mode 100644
index 0000000..dfad21a
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/dashboard.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/dns.png b/interface/web/themes/default-v2/icons/x64/dns.png
new file mode 100644
index 0000000..b40b537
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/dns.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/domain.png b/interface/web/themes/default-v2/icons/x64/domain.png
new file mode 100644
index 0000000..6e2884e
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/domain.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/drawer.png b/interface/web/themes/default-v2/icons/x64/drawer.png
new file mode 100644
index 0000000..8fe3c1b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/drawer.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/email.png b/interface/web/themes/default-v2/icons/x64/email.png
new file mode 100644
index 0000000..c6c1c51
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/email.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/help.png b/interface/web/themes/default-v2/icons/x64/help.png
new file mode 100644
index 0000000..4909e62
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/help.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/login.png b/interface/web/themes/default-v2/icons/x64/login.png
new file mode 100644
index 0000000..27adf0b
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/login.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/monitor.png b/interface/web/themes/default-v2/icons/x64/monitor.png
new file mode 100644
index 0000000..f6fc937
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/monitor.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/network.png b/interface/web/themes/default-v2/icons/x64/network.png
new file mode 100644
index 0000000..e9aa4a2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/network.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/server.png b/interface/web/themes/default-v2/icons/x64/server.png
new file mode 100644
index 0000000..bcde9dc
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/server.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/sites.png b/interface/web/themes/default-v2/icons/x64/sites.png
new file mode 100644
index 0000000..c6e6ca2
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/sites.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/system.png b/interface/web/themes/default-v2/icons/x64/system.png
new file mode 100644
index 0000000..efb2008
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/system.png
Binary files differ
diff --git a/interface/web/themes/default-v2/icons/x64/tools.png b/interface/web/themes/default-v2/icons/x64/tools.png
new file mode 100644
index 0000000..8ce4e23
--- /dev/null
+++ b/interface/web/themes/default-v2/icons/x64/tools.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/ajax-loader.gif b/interface/web/themes/default-v2/images/ajax-loader.gif
new file mode 100644
index 0000000..7c4804e
--- /dev/null
+++ b/interface/web/themes/default-v2/images/ajax-loader.gif
Binary files differ
diff --git a/interface/web/themes/default-v2/images/buttonHolder_bg.gif b/interface/web/themes/default-v2/images/buttonHolder_bg.gif
new file mode 100644
index 0000000..45dc0da
--- /dev/null
+++ b/interface/web/themes/default-v2/images/buttonHolder_bg.gif
Binary files differ
diff --git a/interface/web/themes/default-v2/images/chevron.png b/interface/web/themes/default-v2/images/chevron.png
new file mode 100644
index 0000000..7ca0587
--- /dev/null
+++ b/interface/web/themes/default-v2/images/chevron.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/favicon.ico b/interface/web/themes/default-v2/images/favicon.ico
new file mode 100644
index 0000000..da6257c
--- /dev/null
+++ b/interface/web/themes/default-v2/images/favicon.ico
Binary files differ
diff --git a/interface/web/themes/default-v2/images/header_bg.png b/interface/web/themes/default-v2/images/header_bg.png
new file mode 100644
index 0000000..f53a8b4
--- /dev/null
+++ b/interface/web/themes/default-v2/images/header_bg.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/header_logo.png b/interface/web/themes/default-v2/images/header_logo.png
new file mode 100644
index 0000000..d85333a
--- /dev/null
+++ b/interface/web/themes/default-v2/images/header_logo.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/lists_tfoot_bg.png b/interface/web/themes/default-v2/images/lists_tfoot_bg.png
new file mode 100644
index 0000000..fe3acff
--- /dev/null
+++ b/interface/web/themes/default-v2/images/lists_tfoot_bg.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/lists_thead_bg.png b/interface/web/themes/default-v2/images/lists_thead_bg.png
new file mode 100644
index 0000000..c75d17f
--- /dev/null
+++ b/interface/web/themes/default-v2/images/lists_thead_bg.png
Binary files differ
diff --git a/interface/web/themes/default-v2/images/meter_bg.gif b/interface/web/themes/default-v2/images/meter_bg.gif
new file mode 100644
index 0000000..6b38c6e
--- /dev/null
+++ b/interface/web/themes/default-v2/images/meter_bg.gif
Binary files differ
diff --git a/interface/web/themes/default-v2/images/screen_bg.png b/interface/web/themes/default-v2/images/screen_bg.png
new file mode 100644
index 0000000..5cfb149
--- /dev/null
+++ b/interface/web/themes/default-v2/images/screen_bg.png
Binary files differ
diff --git a/interface/web/themes/default-v2/licences.txt b/interface/web/themes/default-v2/licences.txt
new file mode 100644
index 0000000..edfe146
--- /dev/null
+++ b/interface/web/themes/default-v2/licences.txt
@@ -0,0 +1,11 @@
+Theme created by Martin Henne (red-ray.de)
+
+based on:
+
+Templates: http://www.yaml.de
+Web-Forms: http://www.sprawsm.com/uni-form/
+Icons: http://www.pinvoke.com and http://www.randomjabber.com/static/sizcons
+Know-How: http://particletree.com/features/rediscovering-the-button-element
+
+
+Major restructuring by Christian Foellmann (Foe-Services.de)
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_edit.htm b/interface/web/themes/default-v2/templates/admin/firewall_edit.htm
new file mode 100644
index 0000000..827c1c8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/firewall_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_firewall">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcp_port">{tmpl_var name='tcp_port_txt'}</label>
+                <input name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="udp_port">{tmpl_var name='udp_port_txt'}</label>
+                <input name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_list.htm b/interface/web/themes/default-v2/templates/admin/firewall_list.htm
new file mode 100644
index 0000000..d209a45
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/firewall_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_firewall">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
+                        <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
+                        <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
+                            <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/groups_edit.htm b/interface/web/themes/default-v2/templates/admin/groups_edit.htm
new file mode 100644
index 0000000..b5fe764
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/groups_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_groups">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/groups_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/groups_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/groups_list.htm b/interface/web/themes/default-v2/templates/admin/groups_list.htm
new file mode 100644
index 0000000..3fc1918
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/groups_list.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_groups">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <p><tmpl_var name="warning_txt"></p>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_edit.htm b/interface/web/themes/default-v2/templates/admin/iptables_edit.htm
new file mode 100644
index 0000000..87033ab
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/iptables_edit.htm
@@ -0,0 +1,67 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_iptables">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="table">{tmpl_var name='table_txt'}</label>
+                <select name="table" id="table" class="selectInput formLengthLimit">
+                    {tmpl_var name='table'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
+                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
+                    {tmpl_var name='protocol'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
+                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
+                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
+                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
+                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <select name="target" id="target" class="selectInput formLengthLimit">
+                    {tmpl_var name='target'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div> 
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_list.htm b/interface/web/themes/default-v2/templates/admin/iptables_list.htm
new file mode 100644
index 0000000..37878f9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/iptables_list.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_iptables">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>Tools</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
+                    <span>{tmpl_var name="add_new_rule_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
+                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
+                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
+                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_table"></td>
+                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+                        <td class="tbl_col_singleport"></td>
+                        <td class="tbl_col_multiport"></td>
+                        <td class="tbl_col_state"></td>
+                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
+                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
+                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
+                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
+                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
+                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_add.htm b/interface/web/themes/default-v2/templates/admin/language_add.htm
new file mode 100644
index 0000000..540fc97
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_add.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_add">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Add</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="language" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="lng_new">{tmpl_var name='language_new_txt'}</label>
+                <input name="lng_new" id="lng_new" value="" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+                <p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_add.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_complete.htm b/interface/web/themes/default-v2/templates/admin/language_complete.htm
new file mode 100644
index 0000000..7416a70
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_complete.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_complete">
+
+    <tmpl_if name="msg">
+        <div id="OKMsg"><tmpl_var name="msg"></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><tmpl_var name="error"></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Complete</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="language" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+        </fieldset>
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_complete.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_edit.htm b/interface/web/themes/default-v2/templates/admin/language_edit.htm
new file mode 100644
index 0000000..3767a17
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_edit.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_edit">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_language_edit"><legend>Language File Edit: {tmpl_var name="file_path"}</legend>
+            <span class="wf_oneField">
+                <tmpl_loop name="records">
+                    <span class="wf_oneField">
+                        <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
+                        <input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" size="50" >
+                    </span> 
+                </tmpl_loop>
+            </span>
+        </fieldset>  
+                
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="lang" value="{tmpl_var name='lang'}">
+        <input type="hidden" name="lang_file" value="{tmpl_var name='lang_file'}">
+        <input type="hidden" name="module" value="{tmpl_var name='module'}">
+            
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php?lng_select={tmpl_var name='lang'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>     
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_export.htm b/interface/web/themes/default-v2/templates/admin/language_export.htm
new file mode 100644
index 0000000..4085622
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_export.htm
@@ -0,0 +1,31 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_export">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Export</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="lng_select" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+                
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+            
+    </div>
+  
+</div>
diff --git a/interface/web/themes/default-v2/templates/admin/language_import.htm b/interface/web/themes/default-v2/templates/admin/language_import.htm
new file mode 100644
index 0000000..3028944
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_import.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Import</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_import_txt'}</label>
+                <input name="file" id="file" size="30" type="file" class="fileUpload" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='language_overwrite_txt'}</p>
+                <div class="multiField">
+                    <input id="overwrite" type="checkbox" value="1" name="overwrite"/>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ignore_version_txt'}</p>
+                <div class="multiField">
+                    <input id="ignore_version" type="checkbox" value="1" name="ignore_version"/>
+                </div>
+            </div>
+                
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+            
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_list.htm b/interface/web/themes/default-v2/templates/admin/language_list.htm
new file mode 100644
index 0000000..d268953
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_list.htm
@@ -0,0 +1,47 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_groups">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend>Tools</legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                    <select name="lng_select" id="language" class="selectInput flags" onChange="submitForm('pageForm','admin/language_list.php');">
+                        {tmpl_var name='language_option'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
+                        <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
+                        <th class="tbl_col_limit" scope="col"><tmpl_var name="lang_file_date_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_module"><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="module"}</a></td>
+                            <td class="tbl_col_lang_file"><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file"}</a></td>
+                            <td><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file_date"}</a></td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm b/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm
new file mode 100644
index 0000000..6c903ba
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm
@@ -0,0 +1,33 @@
+<!--
+<h2><tmpl_var name="do_ispcupdate_caption"></h2>
+<p><tmpl_var name="do_ispcupdate_desc"></p>
+-->
+
+<h2><tmpl_var name="ispconfig_update_title"></h2>
+<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
+
+<div class="panel panel_language_add">
+  
+    <div class="pnl_formsarea">
+        <!--
+          <fieldset class="inlineLabels"><legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
+            <div class="ctrlHolder">
+              <label for="server_select">{tmpl_var name='select_server_txt'}</label>
+              <select name="server_select" id="server" class="selectInput" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
+                                              {tmpl_var name='server_option'}
+                                      </select>
+            </div>
+          </fieldset>
+      
+              <tmpl_if name="msg">
+              <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+      
+      
+                <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_ispcupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
+          </div>
+        -->
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm b/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm
new file mode 100644
index 0000000..0349473
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="do_osupdate_caption"></h2>
+<p><tmpl_var name="do_osupdate_desc"></p>
+
+<div class="panel panel_language_add">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='do_osupdate_caption'}</legend>
+            <div class="ctrlHolder">
+                <label for="server_select">{tmpl_var name='select_server_txt'}</label>
+                <select name="server_select" id="server" class="selectInput" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
+                    {tmpl_var name='server_option'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_osupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
new file mode 100644
index 0000000..8bdb61f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
@@ -0,0 +1,47 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="remote_username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="remote_username" id="username" value="{tmpl_var name='remote_username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+                
+            <div class="ctrlHolder">
+                <label for="remote_password">{tmpl_var name='password_txt'}</label>
+                <input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='function_txt'}</p>
+                <div class="multiField">
+                    &nbsp; {tmpl_var name='remote_functions'}
+                </div>
+            </div>
+                
+        </fieldset>
+            
+        <input type="hidden" name="remote_userid" value="{tmpl_var name='id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/remote_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/remote_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_list.htm b/interface/web/themes/default-v2/templates/admin/remote_user_list.htm
new file mode 100644
index 0000000..12937b2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_user_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_list_users">
+    
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+    
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
+                        <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_remote_userid"></td>           
+                        <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
+                            <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm
new file mode 100644
index 0000000..17c811b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="init_script">{tmpl_var name='init_script_txt'}</label>
+                <input name="init_script" id="init_script" value="{tmpl_var name='init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="crontab_dir">{tmpl_var name='crontab_dir_txt'}</label>
+                <input name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="wget">{tmpl_var name='wget_txt'}</label>
+                <input name="wget" id="wget" value="{tmpl_var name='wget'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm
new file mode 100644
index 0000000..c308ec4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="bind_user">{tmpl_var name='bind_user_txt'}</label>
+                <input name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bind_group">{tmpl_var name='bind_group_txt'}</label>
+                <input name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bind_zonefiles_dir">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
+                <input name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="named_conf_path">{tmpl_var name='named_conf_path_txt'}</label>
+                <input name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="named_conf_local_path">{tmpl_var name='named_conf_local_path_txt'}</label>
+                <input name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm
new file mode 100644
index 0000000..ad94440
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="fastcgi_starter_path">{tmpl_var name='fastcgi_starter_path_txt'}</label>
+                <input name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_starter_script">{tmpl_var name='fastcgi_starter_script_txt'}</label>
+                <input name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_alias">{tmpl_var name='fastcgi_alias_txt'}</label>
+                <input name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_phpini_path">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
+                <input name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_children">{tmpl_var name='fastcgi_children_txt'}</label>
+                <input name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_max_requests">{tmpl_var name='fastcgi_max_requests_txt'}</label>
+                <input name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_bin">{tmpl_var name='fastcgi_bin_txt'}</label>
+                <input name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_config_syntax">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
+                <select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="selectInput">
+                    {tmpl_var name='fastcgi_config_syntax'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm
new file mode 100644
index 0000000..21492e4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="getmail_config_dir">{tmpl_var name='getmail_config_dir_txt'}</label>
+                <input name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm
new file mode 100644
index 0000000..19e0416
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_home">{tmpl_var name='jailkit_chroot_home_txt'}</label>
+                <input name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_app_sections">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
+                <input name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_app_programs">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
+                <input name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_cron_programs">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
+                <input name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_list.htm b/interface/web/themes/default-v2/templates/admin/server_config_list.htm
new file mode 100644
index 0000000..1f5356b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_list.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_server_config">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm
new file mode 100644
index 0000000..72292b3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm
@@ -0,0 +1,94 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="module">{tmpl_var name='module_txt'}</label>
+                <select name="module" id="module" class="selectInput formLengthHalf">
+                    {tmpl_var name='module'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="maildir_path">{tmpl_var name='maildir_path_txt'}</label>
+                <input name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="homedir_path">{tmpl_var name='homedir_path_txt'}</label>
+                <input name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
+                <div class="multiField">
+                    <select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">
+                        {tmpl_var name='pop3_imap_daemon'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mail_filter_syntax_txt'}</p>
+                <div class="multiField">
+                    <select name="mail_filter_syntax" id="mail_filter_syntax" class="selectInput">
+                        {tmpl_var name='mail_filter_syntax'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_uid">{tmpl_var name='mailuser_uid_txt'}</label>
+                <input name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_gid">{tmpl_var name='mailuser_gid_txt'}</label>
+                <input name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_name">{tmpl_var name='mailuser_name_txt'}</label>
+                <input name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_group">{tmpl_var name='mailuser_group_txt'}</label>
+                <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
+                <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
+                <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
+                <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
+                <input name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
+                <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailbox_quota_stats_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailbox_quota_stats'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
+                <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm
new file mode 100644
index 0000000..0310344
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Rescue</legend>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='try_rescue_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='try_rescue'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_httpd_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_httpd'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mysql_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_mysql'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mail_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_mail'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <tmpl_var name="rescue_description_txt">
+            
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm
new file mode 100644
index 0000000..3cb6848
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm
@@ -0,0 +1,67 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='auto_network_configuration'} {tmpl_var name='network_config_warning_txt'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="netmask">{tmpl_var name='netmask_txt'}</label>
+                <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="gateway">{tmpl_var name='gateway_txt'}</label>
+                <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
+                <input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="firewall">{tmpl_var name='firewall_txt'}</label>
+                <select name="firewall" id="firewall" class="selectInput">
+                    {tmpl_var name='firewall'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="loglevel">{tmpl_var name='loglevel_txt'}</label>
+                <select name="loglevel" id="loglevel" class="selectInput">
+                    {tmpl_var name='loglevel'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_dir">{tmpl_var name='backup_dir_txt'}</label>
+                <input name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_mode">{tmpl_var name='backup_mode_txt'}</label>
+                <select name="backup_mode" id="backup_mode" class="selectInput">
+                    {tmpl_var name='backup_mode'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm
new file mode 100644
index 0000000..e0a1ded
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>UFW Firewall</legend>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_enable_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_enable'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_manage_builtins_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_manage_builtins'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_ipv6_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_ipv6'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_input_policy">{tmpl_var name='ufw_default_input_policy_txt'}</label>
+                <select name="ufw_default_input_policy" id="ufw_default_input_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_input_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_output_policy">{tmpl_var name='ufw_default_output_policy_txt'}</label>
+                <select name="ufw_default_output_policy" id="ufw_default_output_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_output_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_forward_policy">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
+                <select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_forward_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_application_policy">{tmpl_var name='ufw_default_application_policy_txt'}</label>
+                <select name="ufw_default_application_policy" id="ufw_default_application_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_application_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_log_level">{tmpl_var name='ufw_log_level_txt'}</label>
+                <select name="ufw_log_level" id="ufw_log_level" class="selectInput">
+                    {tmpl_var name='ufw_log_level'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm
new file mode 100644
index 0000000..c960fb1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="config_dir">{tmpl_var name='config_dir_txt'}</label>
+                <input name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
new file mode 100644
index 0000000..fecd3dc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
@@ -0,0 +1,240 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='server_type_txt'}</p>
+                <div class="multiField">
+                    <select name="server_type" id="server_type" class="selectInput">
+                        {tmpl_var name='server_type'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
+                <input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_path">{tmpl_var name='website_path_txt'}</label>
+                <input name="website_path" id="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_symlinks">{tmpl_var name='website_symlinks_txt'}</label>
+                <input name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_symlinks_rel">{tmpl_var name='website_symlinks_rel_txt'}</label>
+                <div class="multiField">
+                    {tmpl_var name='website_symlinks_rel'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
+                <input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
+                <input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
+                <input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
+                <input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='security_level_txt'}</p>
+                <div class="multiField">
+                    <select name="security_level" id="security_level" class="selectInput">
+                        {tmpl_var name='security_level'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='check_apache_config_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='check_apache_config'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="user">{tmpl_var name='web_user_txt'}</label>
+                <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="group">{tmpl_var name='web_group_txt'}</label>
+                <input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
+                <input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
+                <input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
+                <input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
+                <input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='enable_ip_wildcard_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='enable_ip_wildcard'}
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='enable_sni_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='enable_sni'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
+                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
+                    <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='set_folder_permissions_on_update'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_folder_protection_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_folder_protection'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='add_web_users_to_sshusers_group'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='connect_userid_to_webid'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+                    <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder apache">
+                    <label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
+                    <input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder apache">
+                    <label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
+                    <input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
+                    <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_ini_path">{tmpl_var name='php_fpm_ini_path_txt'}</label>
+                    <input name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+                    <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
+                    <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+                    <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
+                    <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_port">{tmpl_var name='apps_vhost_port_txt'}</label>
+                    <input name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_ip">{tmpl_var name='apps_vhost_ip_txt'}</label>
+                    <input name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
+                    <input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
+                    <input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_data_dir">{tmpl_var name='awstats_data_dir_txt'}</label>
+                    <input name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_pl">{tmpl_var name='awstats_pl_txt'}</label>
+                    <input name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_buildstaticpages_pl">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
+                    <input name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    var serverType = jQuery('#server_type').val();
+    jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
+    adjustForm();
+    jQuery('#server_type').change(function(){
+        serverType = $(this).val();
+        adjustForm();
+    });
+    
+    function adjustForm(){
+        if(serverType == "nginx"){
+            jQuery('.nginx').show();
+            jQuery('.apache').hide();
+        } else {
+            jQuery('.nginx').hide();
+            jQuery('.apache').show();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_config.htm b/interface/web/themes/default-v2/templates/admin/server_edit_config.htm
new file mode 100644
index 0000000..e5e2392
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_edit_config.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="config">{tmpl_var name='config_txt'}</label>
+                <textarea name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_services.htm b/interface/web/themes/default-v2/templates/admin/server_edit_services.htm
new file mode 100644
index 0000000..f6e4732
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_edit_services.htm
@@ -0,0 +1,70 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_name">{tmpl_var name='server_name_txt'}</label>
+                <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mail_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mail_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='web_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='web_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='dns_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='dns_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='file_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='file_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='db_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='db_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='vserver_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='vserver_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
+                <select name="mirror_server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='mirror_server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="active">{tmpl_var name='active_txt'}</label>
+                <select name="active" id="active" class="selectInput formLengthBool">
+                    {tmpl_var name='active'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm b/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm
new file mode 100644
index 0000000..35718ce
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_ip">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>IP Address</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_id">{tmpl_var name='client_id_txt'}</label>
+                <select name="client_id" id="client_id" class="selectInput">
+                    {tmpl_var name='client_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_type">{tmpl_var name='ip_type_txt'}</label>
+                <select name="ip_type" id="ip_type" class="selectInput">
+                    {tmpl_var name='ip_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='virtualhost_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='virtualhost'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="virtualhost_port">{tmpl_var name='virtualhost_port_txt'}</label>
+                <input name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" size="15" maxlength="15" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_list.htm b/interface/web/themes/default-v2/templates/admin/server_ip_list.htm
new file mode 100644
index 0000000..4234e00
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_ip_list.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_ip">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
+                        <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
+                        <td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_ip_type"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
+                            <td class="tbl_col_virtualhost_port"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_list.htm b/interface/web/themes/default-v2/templates/admin/server_list.htm
new file mode 100644
index 0000000..078d262
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_server">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
+                        <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
+                        <th class="tbl_col_dns_server" scope="col"><tmpl_var name="dns_server_txt"></th>
+                        <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
+                        <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
+                        <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_mail_server"><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
+                        <td class="tbl_col_web_server"><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
+                        <td class="tbl_col_dns_server"><select name="search_active">{tmpl_var name='search_dns_server'}</select></td>
+                        <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
+                        <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
+                        <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_mail_server">{tmpl_var name="mail_server"}</td>
+                            <td class="tbl_col_web_server">{tmpl_var name="web_server"}</td>
+                            <td class="tbl_col_dns_server">{tmpl_var name="dns_server"}</td>
+                            <td class="tbl_col_file_server">{tmpl_var name="file_server"}</td>
+                            <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
+                            <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm
new file mode 100644
index 0000000..21eba02
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="php_fastcgi_binary">{tmpl_var name='php_fastcgi_binary_txt'}</label>
+                <input name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fastcgi_ini_dir">{tmpl_var name='php_fastcgi_ini_dir_txt'}</label>
+                <input name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm
new file mode 100644
index 0000000..92cd4a8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
+                <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fpm_ini_dir">{tmpl_var name='php_fpm_ini_dir_txt'}</label>
+                <input name="php_fpm_ini_dir" id="php_fpm_ini_dir" value="{tmpl_var name='php_fpm_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+                <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_list.htm b/interface/web/themes/default-v2/templates/admin/server_php_list.htm
new file mode 100644
index 0000000..44e6a1f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_php">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm
new file mode 100644
index 0000000..d9e88ff
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_id">{tmpl_var name='client_id_txt'}</label>
+                <select name="client_id" id="client_id" class="selectInput">
+                    {tmpl_var name='client_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_install.htm b/interface/web/themes/default-v2/templates/admin/software_package_install.htm
new file mode 100644
index 0000000..1d2d4de
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_package_install.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="head_txt"></h2>
+<p><tmpl_var name="desc_txt"></p>
+
+<div class="panel panel_software_repo">
+    <tmpl_if name="message_err">
+        <div id="errorMsg"><tmpl_var name="message_err"></div>
+    </tmpl_if>
+    <tmpl_if name="message_ok">
+        <div id="OKMsg"><tmpl_var name="message_ok"></div>
+    </tmpl_if>
+    <tmpl_if name="insert_key">
+        <div class="pnl_formsarea">
+            <fieldset class="inlineLabels">
+                <p>&nbsp;</p>
+                <div class="ctrlHolder">
+                    <label for="install_key">{tmpl_var name='install_key_txt'}</label>
+                    <input name="install_key" id="install_key" value="{tmpl_var name='install_key'}" size="40" maxlength="40" type="text" class="textInput" />
+                </div>
+                    
+                <input type="hidden" name="package" value="{tmpl_var name='package_name'}">
+                <input type="hidden" name="server_id" value="{tmpl_var name='server_id'}">
+                <p>&nbsp;</p>
+                <div class="buttonHolder buttons">
+                    <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/software_package_install.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                    <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/software_package_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_list.htm b/interface/web/themes/default-v2/templates/admin/software_package_list.htm
new file mode 100644
index 0000000..0cb6f47
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_package_list.htm
@@ -0,0 +1,46 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_package">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
+                    <span>{tmpl_var name="repoupdate_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+                        <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
+                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
+                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+                            <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
+                            <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
+                            <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm b/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm
new file mode 100644
index 0000000..bd8b230
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_software_repo">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="repo_name">{tmpl_var name='repo_name_txt'}</label>
+                <input name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" size="40" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_url">{tmpl_var name='repo_url_txt'}</label>
+                <input name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" size="40" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_username">{tmpl_var name='repo_username_txt'}</label>
+                <input name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_password">{tmpl_var name='repo_password_txt'}</label>
+                <input name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30" type="password" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/software_repo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/software_repo_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_list.htm b/interface/web/themes/default-v2/templates/admin/software_repo_list.htm
new file mode 100644
index 0000000..16a1749
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_repo_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_software_repo">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
+                        <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
+                        <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
+                            <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_update_list.htm b/interface/web/themes/default-v2/templates/admin/software_update_list.htm
new file mode 100644
index 0000000..8a3760e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_update_list.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_software_update">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend>Tools</legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_select_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput" onChange="submitForm('pageForm','admin/software_update_list.php');">
+                        <tmpl_loop name="servers">
+                            <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
+                        </tmpl_loop>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+                        <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
+                        <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+                            <td class="tbl_col_update_title">{tmpl_var name="update_title"}</td>
+                            <td class="tbl_col_version">{tmpl_var name="version"}</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm
new file mode 100644
index 0000000..6055879
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <div style="float:left;width:100%">
+                    <p class="label" style="width:270px">{tmpl_var name='use_domain_module_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='use_domain_module'}
+                    </div>
+                </div>
+                <div style="float:left;width:500px;margin-top:20px">{tmpl_var name='use_domain_module_hint'}</div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='new_domain_txt'}</p>
+                <div class="multiField">
+                    <textarea name="new_domain_html" id="new_domain_html" style="width: 500px; height: 250px">{tmpl_var name='new_domain_html'}</textarea>
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
new file mode 100644
index 0000000..18fdfcc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='enable_custom_login_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='enable_custom_login'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailboxlist_webmail_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="webmail_url">{tmpl_var name='webmail_url_txt'}</label>
+                <input name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailmailinglist_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailmailinglist_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailmailinglist_url">{tmpl_var name='mailmailinglist_url_txt'}</label>
+                <input name="mailmailinglist_url" id="mailmailinglist_url" value="{tmpl_var name='mailmailinglist_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="admin_mail">{tmpl_var name='admin_mail_txt'}</label>
+                <input name="admin_mail" id="admin_mail" value="{tmpl_var name='admin_mail'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
+                <input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm
new file mode 100644
index 0000000..31350cd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Misc</legend>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
+                <input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
+                <input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
+                <input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
+                <input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='maintenance_mode_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='maintenance_mode'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
new file mode 100644
index 0000000..21bbf0e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="dbname_prefix">{tmpl_var name='dbname_prefix_txt'}</label>
+                <input name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dbuser_prefix">{tmpl_var name='dbuser_prefix_txt'}</label>
+                <input name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ftpuser_prefix">{tmpl_var name='ftpuser_prefix_txt'}</label>
+                <input name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shelluser_prefix">{tmpl_var name='shelluser_prefix_txt'}</label>
+                <input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="webdavuser_prefix">{tmpl_var name='webdavuser_prefix_txt'}</label>
+                <input name="webdavuser_prefix" id="webdavuser_prefix" value="{tmpl_var name='webdavuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='dblist_phpmyadmin_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="phpmyadmin_url">{tmpl_var name='phpmyadmin_url_txt'}</label>
+                <input name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
+                <input name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm b/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm
new file mode 100644
index 0000000..cb52ae3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_users">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="default_group">{tmpl_var name='default_group_txt'}</label>
+                <select name="default_group" id="default_group" class="selectInput">
+                    {tmpl_var name='default_group'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='groups_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='groups'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_list.htm b/interface/web/themes/default-v2/templates/admin/users_list.htm
new file mode 100644
index 0000000..25cafe6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_users">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <p><tmpl_var name="warning_txt"></p>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="username" op="!=" value="admin">
+                                        <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                        <a class="icons16 icoDelete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </tmpl_if>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_user_edit.htm b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
new file mode 100644
index 0000000..66142a4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_users">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+                <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='modules_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='modules'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
+                <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+                    {tmpl_var name='startmodule'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='app_theme_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='app_theme'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='typ_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='typ'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_edit.htm b/interface/web/themes/default-v2/templates/client/client_circle_edit.htm
new file mode 100644
index 0000000..1616dd4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_circle_edit.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='circle_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="circle_name">{tmpl_var name='circle_name_txt'}*</label>
+                <input name="circle_name" id="circle_name" value="{tmpl_var name='circle_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='client_ids_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='client_ids'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_circle_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_circle_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_list.htm b/interface/web/themes/default-v2/templates/client/client_circle_list.htm
new file mode 100644
index 0000000..4c5a889
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_circle_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
+                        <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_circle_id"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" style="width:120px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_circle_id"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_circle_name"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
+                            <td class="tbl_col_description"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_circle_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_del.htm b/interface/web/themes/default-v2/templates/client/client_del.htm
new file mode 100644
index 0000000..aeb206f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_del.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_del">
+
+    <div class="pnl_formsarea">
+
+        <div id="OKMsg">
+            <tmpl_var name="delete_explanation">:<br /><br />
+                <tmpl_loop name="records">
+                    <tmpl_var name="table">, 
+                </tmpl_loop>
+        </div>
+
+        <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_del.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_address.htm b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
new file mode 100644
index 0000000..8ca7bce
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
@@ -0,0 +1,140 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Address</legend>
+            <div class="ctrlHolder">
+                <label for="company_name">{tmpl_var name='company_name_txt'}</label>
+                <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
+                <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
+                <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}*</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
+                <select name="usertheme" id="usertheme" class="selectInput">
+                    {tmpl_var name='usertheme'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="street">{tmpl_var name='street_txt'}</label>
+                <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="zip">{tmpl_var name='zip_txt'}</label>
+                <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="city">{tmpl_var name='city_txt'}</label>
+                <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="country">{tmpl_var name='country_txt'}</label>
+                <select name="country" id="country" class="selectInput flags">
+                    {tmpl_var name='country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="telephone">{tmpl_var name='telephone_txt'}</label>
+                <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mobile">{tmpl_var name='mobile_txt'}</label>
+                <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fax">{tmpl_var name='fax_txt'}</label>
+                <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="internet">{tmpl_var name='internet_txt'}</label>
+                <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="icq">{tmpl_var name='icq_txt'}</label>
+                <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
+                <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="company_id">{tmpl_var name='company_id_txt'}</label>
+                <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
+                <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_code">{tmpl_var name='bank_code_txt'}</label>
+                <input name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_name">{tmpl_var name='bank_name_txt'}</label>
+                <input name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_iban">{tmpl_var name='bank_account_iban_txt'}</label>
+                <input name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
+                <input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="notes">{tmpl_var name='notes_txt'}</label>
+                <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
new file mode 100644
index 0000000..5606345
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
@@ -0,0 +1,230 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <tmpl_if name="is_admin">
+        <div class="pnl_toolsarea">
+            <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+                <div class="buttons">
+                    <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
+                    <button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="template_master">{tmpl_var name='template_master_txt'}</label>
+                    <select name="template_master" id="template_master" class="selectInput">
+                        {tmpl_var name='template_master'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
+                    <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+                        {tmpl_var name='tpl_add_select'}
+                    </select>
+                    <div id="template_additional_list"><br /><br />{tmpl_var name='template_additional_list'}</div>
+                    <input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
+                </div>
+                <div class="ctrlHolder">
+                    &nbsp;
+                </div>
+            </tmpl_if>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
+                    <select name="default_webserver" id="default_webserver" class="selectInput">
+                        {tmpl_var name='default_webserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                    <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                        {tmpl_var name='default_mailserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
+                    <select name="default_dbserver" id="default_dbserver" class="selectInput">
+                        {tmpl_var name='default_dbserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
+                    <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+                        {tmpl_var name='default_dnsserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_message.htm b/interface/web/themes/default-v2/templates/client/client_message.htm
new file mode 100644
index 0000000..20afdb1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_message.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="page_head_txt"></h2>
+<p><tmpl_var name="form_desc_txt"></p>
+
+<div class="panel panel_client">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='form_legend_txt'}</legend>
+            <tmpl_if name="okmsg">
+                <div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="sender">{tmpl_var name='sender_txt'}</label>
+                <input name="sender" id="sender" value="{tmpl_var name='sender'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="recipient">{tmpl_var name='recipient_txt'}</label>
+                <select name="recipient" id="recipient" class="selectInput">
+                    {tmpl_var name='recipient'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <input name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea>&nbsp;{tmpl_var name="variables_txt"}&nbsp;{tmpl_var name="message_variables"}
+            </div>
+        </fieldset>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_send_txt'}" onClick="submitForm('pageForm','client/client_message.php');"><span>{tmpl_var name='btn_send_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
new file mode 100644
index 0000000..81a2e59
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
@@ -0,0 +1,176 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm
new file mode 100644
index 0000000..232fa55
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm
@@ -0,0 +1,28 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Template</legend>
+            <div class="ctrlHolder">
+                <label for="template_type">{tmpl_var name='template_type_txt'}</label>
+                <select name="template_type" id="template_type" class="selectInput">
+                    {tmpl_var name='template_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/client/client_template_list.htm b/interface/web/themes/default-v2/templates/client/client_template_list.htm
new file mode 100644
index 0000000..5249fce
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_limit_template">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
+                        <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_template_id"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
+                            <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/clients_list.htm b/interface/web/themes/default-v2/templates/client/clients_list.htm
new file mode 100644
index 0000000..c62a2ee
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/clients_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+                        <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+                        <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+                            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name="is_admin">
+                                        <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
new file mode 100644
index 0000000..5ab1535
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
@@ -0,0 +1,116 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Address</legend>
+            <div class="ctrlHolder">
+                <label for="company_name">{tmpl_var name='company_name_txt'}</label>
+                <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
+                <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
+                <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}*</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
+                <select name="usertheme" id="usertheme" class="selectInput">
+                    {tmpl_var name='usertheme'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="street">{tmpl_var name='street_txt'}</label>
+                <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="zip">{tmpl_var name='zip_txt'}</label>
+                <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="city">{tmpl_var name='city_txt'}</label>
+                <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="country">{tmpl_var name='country_txt'}</label>
+                <select name="country" id="country" class="selectInput flags">
+                    {tmpl_var name='country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="telephone">{tmpl_var name='telephone_txt'}</label>
+                <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mobile">{tmpl_var name='mobile_txt'}</label>
+                <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fax">{tmpl_var name='fax_txt'}</label>
+                <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="internet">{tmpl_var name='internet_txt'}</label>
+                <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="icq">{tmpl_var name='icq_txt'}</label>
+                <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
+                <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="notes">{tmpl_var name='notes_txt'}</label>
+                <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
new file mode 100644
index 0000000..85936e9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
@@ -0,0 +1,225 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <!--
+            <tmpl_if name="is_admin">
+                  <div class="ctrlHolder">
+                    <label for="template_master">{tmpl_var name='template_master_txt'}</label>
+                    <select name="template_master" id="template_master" class="selectInput">
+                                                    {tmpl_var name='template_master'}
+                                            </select>
+                  </div>
+                  <div class="ctrlHolder">
+                    <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
+                    <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+                                                    {tmpl_var name='tpl_add_select'}
+                                            </select>
+                          <span id="template_additional_list">{tmpl_var name='template_additional_list'}</span>
+                              <input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
+                  </div>
+                      <div class="ctrlHolder">
+                        &nbsp;
+                      </div>
+            </tmpl_if>
+            -->
+            <div class="ctrlHolder">
+                <label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
+                <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
+                    <select name="default_webserver" id="default_webserver" class="selectInput">
+                        {tmpl_var name='default_webserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                    <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                        {tmpl_var name='default_mailserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
+                    <select name="default_dbserver" id="default_dbserver" class="selectInput">
+                        {tmpl_var name='default_dbserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
+                    <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+                        {tmpl_var name='default_dnsserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/resellers_list.htm b/interface/web/themes/default-v2/templates/client/resellers_list.htm
new file mode 100644
index 0000000..fba6f1c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/resellers_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+                        <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+                        <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+                        <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+                            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+                            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_buttons">
+                            <div class="buttons icons16" style="width:60px;">
+                                <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                <a class="icons16 icoDelete" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm b/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm
new file mode 100644
index 0000000..4b06779
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm
@@ -0,0 +1,9 @@
+<ul id="submenu">
+    <li class="title"><a>{tmpl_var name='latest_news_txt'}</a></li>
+    <tmpl_loop name="news">
+        <li>
+            <a href="{tmpl_var name="link"}" target="_blank" style="margin-top:8px;padding-bottom:5px;"><b>{tmpl_var name="date"}</b><br />
+                {tmpl_var name="title"}</a>
+        </li>
+    </tmpl_loop>
+</ul>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashboard/dashboard.htm b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
new file mode 100644
index 0000000..383d6b9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
@@ -0,0 +1,39 @@
+<h1><tmpl_var name="welcome_user"></h1>
+<hr />
+<div class="panel panel_dashboard">
+    <div>
+        <tmpl_if name='error'>
+            <div class="systemmonitor-state state-error">
+                <tmpl_loop name="error">
+                    <p>{tmpl_var name='error_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+        <tmpl_if name='warning'>
+            <div class="systemmonitor-state state-warning">
+                <tmpl_loop name="warning">
+                    <p>{tmpl_var name='warning_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+        <tmpl_if name='info'>
+            <div class="systemmonitor-state state-info">
+                <tmpl_loop name="info">
+                    <p>{tmpl_var name='info_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+    </div>
+    <div style="float:left; width:350px;">
+        <tmpl_loop name='leftcol'>
+            {tmpl_var name='content'}
+            <p>&nbsp;</p>
+        </tmpl_loop>
+    </div>
+    <div style="float:left; width:350px;">
+        <tmpl_loop name='rightcol'>
+            {tmpl_var name='content'}
+            <p>&nbsp;</p>
+        </tmpl_loop>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashlets/limits.htm b/interface/web/themes/default-v2/templates/dashlets/limits.htm
new file mode 100644
index 0000000..11fe0bb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashlets/limits.htm
@@ -0,0 +1,11 @@
+	<h2>{tmpl_var name='limits_txt'}</h2>
+	<div style="width:350px;">
+	<table class="list">
+	<tmpl_loop name='rows'>
+		<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+		  <td>{tmpl_var name='field_txt'}</td>
+		  <td style="white-space: nowrap">{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
+		</tr>
+	</tmpl_loop>
+	</table>
+	</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashlets/modules.htm b/interface/web/themes/default-v2/templates/dashlets/modules.htm
new file mode 100644
index 0000000..03fb8cb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashlets/modules.htm
@@ -0,0 +1,10 @@
+	<h2>{tmpl_var name='available_modules_txt'}</h2>
+	<div style="width:350px;">
+	<tmpl_loop name='modules'>
+		<div class="dashboard-modules {tmpl_var name='modules_name'}">
+			<a href="#" onclick="capp('{tmpl_var name='modules_name'}')">
+			{tmpl_var name='modules_title'}
+			</a>
+		</div>
+	</tmpl_loop>
+	</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm
new file mode 100644
index 0000000..cce1af6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_a">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#data').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
new file mode 100644
index 0000000..913f628
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
@@ -0,0 +1,88 @@
+<div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>A</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>AAAA</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>ALIAS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>CNAME</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>HINFO</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>MX</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>NS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>PTR</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>RP</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>SRV</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>TXT</span>
+            </button>
+        </div>
+    </fieldset>
+</div>
+
+<div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+        <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                    <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                    <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
+                    <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
+                    <th class="tbl_col_ttl" scope="col"><tmpl_var name="ttl_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                    <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                    <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
+                    <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
+                    <td class="tbl_col_ttl"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="data"}</a></td>
+                        <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
+                        <td class="tbl_col_ttl"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ttl"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+        </table>
+    </fieldset>
+</div>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm
new file mode 100644
index 0000000..fdea827
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_aaaa">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_aaaa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#data').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm
new file mode 100644
index 0000000..2c859c7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_alias">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm
new file mode 100644
index 0000000..5cf86c5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_cname">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm
new file mode 100644
index 0000000..1651bcc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_hinfo">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_import.htm b/interface/web/themes/default-v2/templates/dns/dns_import.htm
new file mode 100644
index 0000000..7f462ab
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_import.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_wizard">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="zone_file_import_txt"></legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                        {tmpl_var name='server_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" onkeydown="keydown(event.which);" /><p class="value"><tmpl_var name='domain_field_desc_txt'}</p>
+            </div>    
+            <div class="ctrlHolder"">
+                <label for="file">{tmpl_var name='zonefile_to_import_txt'}</label>
+                <input name="file" id="file" size="30" type="file" class="fileUpload" />
+            </div>
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','dns/dns_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    function keydown(keynum){
+        if(keynum == 13){
+            jQuery('.positive').trigger('click');
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm
new file mode 100644
index 0000000..e986efb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm
@@ -0,0 +1,42 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_mx">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="aux">{tmpl_var name='aux_txt'}</label>
+                <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm
new file mode 100644
index 0000000..9efd881
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_ns">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm
new file mode 100644
index 0000000..5d8cf1f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_ptr">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm
new file mode 100644
index 0000000..f7852ea
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm
@@ -0,0 +1,12 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_soa">
+
+    {tmpl_var name='dns_records'}
+
+    <div class="pnl_formsarea">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm
new file mode 100644
index 0000000..86697cf
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_rp">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm
new file mode 100644
index 0000000..b6dea70
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm
@@ -0,0 +1,97 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_slave">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="secondary_zone_txt"></legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                    <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="origin">{tmpl_var name='origin_txt'}</label>
+                <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ns">{tmpl_var name='ns_txt'}</label>
+                <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="xfer">{tmpl_var name='xfer_txt'}</label>
+                <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_slave_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_slave_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#ns').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+    jQuery('#xfer').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm b/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
new file mode 100644
index 0000000..d4458e0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_slave">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+                    <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+                    <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+                        <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+                        <td class="tbl_col_buttons">
+                        <div class="buttons icons16">    
+                            <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                        </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm
new file mode 100644
index 0000000..386a2ab
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm
@@ -0,0 +1,131 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_soa">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>DNS Zone</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="origin">{tmpl_var name='origin_txt'}</label>
+                <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ns">{tmpl_var name='ns_txt'}</label>
+                <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mbox">{tmpl_var name='mbox_txt'}</label>
+                <input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="refresh">{tmpl_var name='refresh_txt'}</label>
+                <input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="retry">{tmpl_var name='retry_txt'}</label>
+                <input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="expire">{tmpl_var name='expire_txt'}</label>
+                <input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="minimum">{tmpl_var name='minimum_txt'}</label>
+                <input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="xfer">{tmpl_var name='xfer_txt'}</label>
+                <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="also_notify">{tmpl_var name='also_notify_txt'}</label>
+                <input name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="update_acl">{tmpl_var name='update_acl_txt'}</label>
+                <input name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#xfer').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+    jQuery('#also_notify').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm b/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
new file mode 100644
index 0000000..fa09c78
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_soa">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+                    <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+                    <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+                    <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+                    <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+                        <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+                        <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm
new file mode 100644
index 0000000..fbcf10d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_srv">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <input name="target" id="target" value="{tmpl_var name='target'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="weight">{tmpl_var name='weight_txt'}</label>
+                <input name="weight" id="weight" value="{tmpl_var name='weight'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="port">{tmpl_var name='port_txt'}</label>
+                <input name="port" id="port" value="{tmpl_var name='port'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="aux">{tmpl_var name='aux_txt'}</label>
+                <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm
new file mode 100644
index 0000000..b18d84a6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='fields_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='fields'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="template">{tmpl_var name='template_txt'}</label>
+                <textarea name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='visible_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='visible'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_list.htm b/interface/web/themes/default-v2/templates/dns/dns_template_list.htm
new file mode 100644
index 0000000..7039d34
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_template_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_template">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm
new file mode 100644
index 0000000..0450fc8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_txt">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_wizard.htm b/interface/web/themes/default-v2/templates/dns/dns_wizard.htm
new file mode 100644
index 0000000..51d9b76
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_wizard.htm
@@ -0,0 +1,95 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<tmpl_if name="error">
+    <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+</tmpl_if>
+
+<div class="panel panel_dns_wizard">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="dns_zone_txt"></legend>
+            <div class="ctrlHolder">
+                <label for="template_id">{tmpl_var name='template_id_txt'}</label>
+                <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
+                    {tmpl_var name='template_id_option'}
+                </select>
+            </div>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                        {tmpl_var name='server_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="DOMAIN_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="domain">{tmpl_var name='domain_txt'}</label>
+                    <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="IP_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ip">{tmpl_var name='ip_txt'}</label>
+                    <input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="NS1_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ns1">{tmpl_var name='ns1_txt'}</label>
+                    <input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="NS2_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ns2">{tmpl_var name='ns2_txt'}</label>
+                    <input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="EMAIL_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="email">{tmpl_var name='email_txt'}</label>
+                    <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+        </fieldset>
+            
+        <input type="hidden" name="create" value="0" />
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onClick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#ip').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
diff --git a/interface/web/themes/default-v2/templates/domain/domain_edit.htm b/interface/web/themes/default-v2/templates/domain/domain_edit.htm
new file mode 100644
index 0000000..75c464a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/domain/domain_edit.htm
@@ -0,0 +1,40 @@
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="edit_disabled">
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                <tmpl_else>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <tmpl_if name="is_admin">
+            <div class="ctrlHolder">
+                <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                <tmpl_if name="edit_disabled">
+                <select name="client_group_id" id="client_group_id" class="selectInput" disabled="disabled">
+                    {tmpl_var name='client_group_id'}
+                </select>
+                <tmpl_else>
+                <select name="client_group_id" id="client_group_id" class="selectInput">
+                    {tmpl_var name='client_group_id'}
+                </select>
+                </tmpl_if>
+            </div>
+            </tmpl_if>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="local">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','domain/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('domain/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/domain/domain_list.htm b/interface/web/themes/default-v2/templates/domain/domain_list.htm
new file mode 100644
index 0000000..96894fa
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/domain/domain_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <tmpl_if name="is_admin">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <tmpl_else>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_new_client.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                </tmpl_if>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','domain/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                    <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                    <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                    <td class="tbl_col_buttons">
+                        <tmpl_if name="is_admin">
+                        <div class="buttons icons16">    
+                            <a class="icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                        </div>
+                        </tmpl_if>
+                    </td>
+                </tr>
+                </tmpl_loop>
+            </tbody>
+
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/error.tpl.htm b/interface/web/themes/default-v2/templates/error.tpl.htm
new file mode 100644
index 0000000..d75fda4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/error.tpl.htm
@@ -0,0 +1,8 @@
+<div class="uniForm">
+    <div id="errorMsg">
+        <h3>Error</h3>
+        <ol>
+            <li>###ERRORMSG###</li>
+        </ol>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/form.tpl.htm b/interface/web/themes/default-v2/templates/form.tpl.htm
new file mode 100644
index 0000000..429bfd9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/form.tpl.htm
@@ -0,0 +1 @@
+<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_edit.htm b/interface/web/themes/default-v2/templates/help/faq_edit.htm
new file mode 100644
index 0000000..6513f95
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_edit.htm
@@ -0,0 +1,29 @@
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='faq_faq_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="hf_section">{tmpl_var name='faq_section_txt'}</label>
+                <select name="hf_section" id="hf_section" class="selectInput">
+                    {tmpl_var name='hf_section'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hf_question">{tmpl_var name='faq_question_txt'}</label>
+                <input name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="hf_answer">{tmpl_var name='faq_answer_txt'}</label>
+                <textarea name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/faq_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/faq_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm b/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
new file mode 100644
index 0000000..c045dfb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
@@ -0,0 +1,43 @@
+<h2>{tmpl_var name="faq_faq_questions_txt"}</h2>
+<div class="panel panel_support_message">
+    
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
+                    <span>{tmpl_var name="faq_new_question_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                    </tr>
+                </thead>
+                <tmpl_loop name="records">
+                    <tr>
+                        <td>{tmpl_var name='hf_question'}</td>
+                        <td>{tmpl_var name='hf_section'}</td>
+                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        </td>
+                        <td>
+                            <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm b/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm
new file mode 100644
index 0000000..181364b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm
@@ -0,0 +1,20 @@
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Section</legend>
+            <div class="ctrlHolder">
+                <label for="hfs_name">{tmpl_var name='faq_section_name_txt'}</label>
+                <input name="hfs_name" id="hfs_name" value="{tmpl_var name='hfs_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/faq_sections_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/faq_sections_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_list.htm b/interface/web/themes/default-v2/templates/help/help_faq_list.htm
new file mode 100644
index 0000000..6af928f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/help_faq_list.htm
@@ -0,0 +1,19 @@
+<tmpl_loop name="records">
+    <h3>{tmpl_var name='hf_question'}
+    </h3>
+    <p>
+        {tmpl_var name='hf_answer'}
+    </p>
+    <tmpl_if name='is_admin'>
+        <div class="buttons icons16">
+            <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
+        </div>
+        <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
+        <br/>
+        <br/>
+        <br/>
+    </tmpl_if>
+
+</tmpl_loop>
+
+<!--<tmpl_var name="paging">-->
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm b/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
new file mode 100644
index 0000000..ddb1a56
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
@@ -0,0 +1,43 @@
+<h2><tmpl_var name="faq_faq_sections_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_support_faq_section">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
+                    <span>{tmpl_var name="faq_new_section_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                    </tr>
+                </thead>
+                <tmpl_loop name="records">
+                    <tr>
+                        <td><b>{tmpl_var name='hfs_name'}</b></td>
+                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        </td><td>
+
+                            <a href="#" onClick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_edit.htm b/interface/web/themes/default-v2/templates/help/support_message_edit.htm
new file mode 100644
index 0000000..06c1797
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Message</legend>
+            <div class="ctrlHolder">
+                <label for="recipient_id">{tmpl_var name='recipient_id_txt'}</label>
+                <select name="recipient_id" id="recipient_id" class="selectInput">
+                    {tmpl_var name='recipient_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <input name="subject" id="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_list.htm b/interface/web/themes/default-v2/templates/help/support_message_list.htm
new file mode 100644
index 0000000..e828fe9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_support_message">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
+                        <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
+                        <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
+                            <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_view.htm b/interface/web/themes/default-v2/templates/help/support_message_view.htm
new file mode 100644
index 0000000..62f2736
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_view.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Message</legend>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <p>{tmpl_var name='subject'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <p>{tmpl_var name='message'}</p>
+            </div>
+        </fieldset>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='reply_txt'}" onClick="loadContent('help/support_message_edit.php?reply={tmpl_var name='id'}');"><span>{tmpl_var name='reply_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/listpage.tpl.htm b/interface/web/themes/default-v2/templates/listpage.tpl.htm
new file mode 100644
index 0000000..429bfd9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/listpage.tpl.htm
@@ -0,0 +1 @@
+<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/login/index.htm b/interface/web/themes/default-v2/templates/login/index.htm
new file mode 100644
index 0000000..39cbc7d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/login/index.htm
@@ -0,0 +1,33 @@
+<h2>Login</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_login">
+
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" onclick="loadContent('login/password_reset.php');">{tmpl_var name='pw_lost_txt'}</a></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='login_txt'}Login</legend>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='password_txt'}</label>
+                <input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>			
+        </fieldset>
+
+        <input type="hidden" name="s_mod" value="login" />
+        <input type="hidden" name="s_pg" value="index" />
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/login/password_reset.htm b/interface/web/themes/default-v2/templates/login/password_reset.htm
new file mode 100644
index 0000000..3b235eb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/login/password_reset.htm
@@ -0,0 +1,33 @@
+<h2>Password Reset</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_password_reset">
+  
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='pw_reset_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="email"><em>*</em> {tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username"><em>*</em> {tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" />
+            </div>			
+        </fieldset>
+
+        <input type="hidden" name="s_mod" value="login" />
+        <input type="hidden" name="s_pg" value="index" />
+
+        <div class="buttonHolder buttons">
+            <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>{tmpl_var name='pw_button_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm
new file mode 100644
index 0000000..0aa550f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_alias">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="alias">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm b/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
new file mode 100644
index 0000000..92755dd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_alias">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm
new file mode 100644
index 0000000..c41121b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_aliasdomain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='source_txt'}</label>
+                <select name="source" id="source" class="selectInput">
+                    {tmpl_var name='source_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="aliasdomain">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
new file mode 100644
index 0000000..d75c236
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_aliasdomain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm
new file mode 100644
index 0000000..493e88b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_blacklist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
new file mode 100644
index 0000000..6dd81c6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_blacklist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm
new file mode 100644
index 0000000..8dc53e1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_content_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="pattern">{tmpl_var name='pattern_txt'}</label>
+                <input name="pattern" id="pattern" value="{tmpl_var name='pattern'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="action">{tmpl_var name='action_txt'}</label>
+                <select name="action" id="action" class="selectInput">
+                    {tmpl_var name='action'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_content_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_content_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm b/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
new file mode 100644
index 0000000..fda80a6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_content_filter">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
+                        <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
+                        <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
+                            <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
new file mode 100644
index 0000000..4b26fb1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_domain_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm
new file mode 100644
index 0000000..b6b9223
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm
@@ -0,0 +1,36 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_domain_catchall">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="catchall">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_catchall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_catchall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
new file mode 100644
index 0000000..d608425
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain_catchall">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm
new file mode 100644
index 0000000..b84e2d6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="local">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
new file mode 100644
index 0000000..958f743
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm
new file mode 100644
index 0000000..d0a8503
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_forward">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <textarea rows="10" cols="40" name="destination" id="destination" type="text" class="textInput">{tmpl_var name='destination'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="forward">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_forward_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_forward_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm b/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
new file mode 100644
index 0000000..24a0538
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_forward">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm
new file mode 100644
index 0000000..1ba3f9e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_get">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_server">{tmpl_var name='source_server_txt'}</label>
+                <input name="source_server" id="source_server" value="{tmpl_var name='source_server'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_username">{tmpl_var name='source_username_txt'}</label>
+                <input name="source_username" id="source_username" value="{tmpl_var name='source_username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_password">{tmpl_var name='source_password_txt'}</label>
+                <input name="source_password" id="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255" type="password" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='source_delete_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='source_delete'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='source_read_all_txt'}</p>
+                <div class="multiField">        
+                    {tmpl_var name='source_read_all'} 
+                </div>                          
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_get_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_get_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_list.htm b/interface/web/themes/default-v2/templates/mail/mail_get_list.htm
new file mode 100644
index 0000000..2997bf7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_get_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_get">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
+                        <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
+                        <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source_server"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
+                            <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
new file mode 100644
index 0000000..e5b335c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
@@ -0,0 +1,86 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_mailinglist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Mailing List</legend>	
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="edit_disabled">
+                <div class="ctrlHolder">
+                    <label for="domain_disabled">{tmpl_var name='domain_txt'}</label>
+                    <select name="domain_disabled" id="domain_disabled" class="selectInput" disabled="disabled">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
+                </div>
+
+                <div class="ctrlHolder">
+                    <label for="listname_disabled">{tmpl_var name='listname_txt'}</label>
+                    <input name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                    <input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="email_disabled">{tmpl_var name='email_txt'}</label>
+                    <input name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                    <input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
+                </div>
+                <tmpl_else>
+                    <div class="ctrlHolder">
+                        <label for="domain">{tmpl_var name='domain_txt'}</label>
+                        <select name="domain" id="domain" class="selectInput">
+                            {tmpl_var name='domain_option'}
+                        </select>
+                    </div>
+                    <div class="ctrlHolder">
+                        <label for="listname">{tmpl_var name='listname_txt'}</label>
+                        <input name="listname" id="listname" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" />
+                    </div>
+                    <div class="ctrlHolder">
+                        <label for="email">{tmpl_var name='email_txt'}</label>
+                        <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+                    </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_mailinglist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_mailinglist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
new file mode 100644
index 0000000..cbb572f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_mailinglist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_listname"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="listname"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                                    <tmpl_if name="mailmailinglist_link"><a class="icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm
new file mode 100644
index 0000000..60ac345
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_relay_recipient">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Relay recipient</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="access" value="OK">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_relay_recipient_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_relay_recipient_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
new file mode 100644
index 0000000..7aeb45f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_relay_recipient">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
+            <span>{tmpl_var name="add_new_record_txt"}</span>
+            </button>
+        </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm
new file mode 100644
index 0000000..0bb8dfa
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_transport">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput formLengthHalf">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mx_txt'}</p>
+                <div class="multiField">
+                    <input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <input name="destination" id="transport" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="sort_order">{tmpl_var name='sort_order_txt'}</label>
+                <select name="sort_order" id="sort_order" class="selectInput formLengthHalf">
+                    {tmpl_var name='sort_order'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_transport_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_transport_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm b/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
new file mode 100644
index 0000000..3f56fb5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_transport">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
+                        <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
+                        <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
+                            <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm
new file mode 100644
index 0000000..da6edd4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
+                <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+                <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
+                <input type="checkbox" value="y" id="autoresponder" name="autoresponder"
+                       onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+                {tmpl_var name='autoresponder_start_date'}&nbsp;
+                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+                {tmpl_var name='autoresponder_end_date'}
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button"
+                    value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span>
+            </button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}"
+                    onClick="loadContent('mail/mail_user_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span>
+            </button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm
new file mode 100644
index 0000000..78c87eb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="custom_mailfilter">{tmpl_var name='custom_mailfilter_txt'}</label>
+                <textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm
new file mode 100644
index 0000000..694b618
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
+                <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+                <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
+                <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+                <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
+            </div>
+            <div class="ctrlHolder">
+                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+                <span class="">{tmpl_var name='active'}</span>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
new file mode 100644
index 0000000..f270944
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
@@ -0,0 +1,44 @@
+
+<div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+                <span>{tmpl_var name="add_new_record_txt"}</span>
+            </button>
+        </div>
+    </fieldset>
+</div>
+
+<div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+        <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+                    <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+        </table>
+    </fieldset>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_list.htm
new file mode 100644
index 0000000..a9999bd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_list.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
+                <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                                    <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
+                        <td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                        <tmpl_if name="enable_custom_login">
+                            <td class="tbl_col_login">
+                                <a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="login"}</a>
+                            </td>
+                        </tmpl_if>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <tmpl_if name="mailboxlist_webmail_link">
+                                    <a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
new file mode 100644
index 0000000..faba29d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
@@ -0,0 +1,81 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel formLengthEmailDomain">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel formLengthEmailDomain">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <tmpl_if name="enable_custom_login"><div class="ctrlHolder">
+                    <label for="login">{tmpl_var name='login_txt'}</label>
+                    <input type="text" id="login" name="login" size="20" value="{tmpl_var name='login'}" class="textInput" /></label>
+                </div></tmpl_if>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="quota">{tmpl_var name='quota_txt'}</label>
+                <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='cc_txt'}</label>
+                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='postfix_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='postfix'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='disableimap_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='disableimap'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='disablepop3_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='disablepop3'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm
new file mode 100644
index 0000000..ef053c9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='move_junk_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='move_junk'}
+                </div>
+            </div>
+        </fieldset>
+
+        {tmpl_var name='filter_records'}
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
new file mode 100644
index 0000000..2000f34
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_user_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+                        <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+                        <th class="tbl_col_mail_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+                        <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_this_month"></td>
+                        <td class="tbl_col_last_month"></td>
+                        <td class="tbl_col_this_year"></td>
+                        <td class="tbl_col_last_year"></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_this_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} MB</a></td>
+                            <td class="tbl_col_last_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
+                            <td class="tbl_col_this_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
+                            <td class="tbl_col_last_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm
new file mode 100644
index 0000000..cf2aeb5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_whitelist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
new file mode 100644
index 0000000..219345f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_whitelist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm
new file mode 100644
index 0000000..34c2249
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_blacklist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <!--
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                                                    {tmpl_var name='server_id'}
+                                            </select>
+                </div>
+            -->
+            <div class="ctrlHolder">
+                <label for="rid">{tmpl_var name='rid_txt'}</label>
+                <select name="rid" id="rid" class="selectInput">
+                    {tmpl_var name='rid'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthHalf">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
new file mode 100644
index 0000000..8a05d36
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_blacklist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm
new file mode 100644
index 0000000..2b3c85a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
+                <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
new file mode 100644
index 0000000..b84a77f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_config">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm
new file mode 100644
index 0000000..524c980
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
+                <select id="module" name="module">{tmpl_var name='module'}</select>
+            </span>
+            <span class="wf_oneField">
+                <label for="maildir_path" class="wf_preField">{tmpl_var name='maildir_path_txt'}</label>
+                <input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="homedir_path" class="wf_preField">{tmpl_var name='homedir_path_txt'}</label>
+                <input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_uid" class="wf_preField">{tmpl_var name='mailuser_uid_txt'}</label>
+                <input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_gid" class="wf_preField">{tmpl_var name='mailuser_gid_txt'}</label>
+                <input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_name" class="wf_preField">{tmpl_var name='mailuser_name_txt'}</label>
+                <input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_group" class="wf_preField">{tmpl_var name='mailuser_group_txt'}</label>
+                <input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost" class="wf_preField">{tmpl_var name='relayhost_txt'}</label>
+                <input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost_user" class="wf_preField">{tmpl_var name='relayhost_user_txt'}</label>
+                <input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost_password" class="wf_preField">{tmpl_var name='relayhost_password_txt'}</label>
+                <input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailbox_size_limit" class="wf_preField">{tmpl_var name='mailbox_size_limit_txt'}</label>
+                <input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15">
+            </span>
+            <span class="wf_oneField">
+                <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
+                <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm
new file mode 100644
index 0000000..6cdca69
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+                <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="netmask" class="wf_preField">{tmpl_var name='netmask_txt'}</label>
+                <input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="gateway" class="wf_preField">{tmpl_var name='gateway_txt'}</label>
+                <input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="hostname" class="wf_preField">{tmpl_var name='hostname_txt'}</label>
+                <input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="nameservers" class="wf_preField">{tmpl_var name='nameservers_txt'}</label>
+                <input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm
new file mode 100644
index 0000000..518be5f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm
@@ -0,0 +1,80 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="addr_extension_virus">{tmpl_var name='addr_extension_virus_txt'}</label>
+                <input name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_spam">{tmpl_var name='addr_extension_spam_txt'}</label>
+                <input name="addr_extension_spam" id="addr_extension_spam" value="{tmpl_var name='addr_extension_spam'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_banned">{tmpl_var name='addr_extension_banned_txt'}</label>
+                <input name="addr_extension_banned" id="addr_extension_banned" value="{tmpl_var name='addr_extension_banned'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_bad_header">{tmpl_var name='addr_extension_bad_header_txt'}</label>
+                <input name="addr_extension_bad_header" id="addr_extension_bad_header" value="{tmpl_var name='addr_extension_bad_header'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnvirusrecip">{tmpl_var name='warnvirusrecip_txt'}</label>
+                <select name="warnvirusrecip" id="warnvirusrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnvirusrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnbannedrecip">{tmpl_var name='warnbannedrecip_txt'}</label>
+                <select name="warnbannedrecip" id="warnbannedrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnbannedrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnbadhrecip">{tmpl_var name='warnbadhrecip_txt'}</label>
+                <select name="warnbadhrecip" id="warnbadhrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnbadhrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="newvirus_admin">{tmpl_var name='newvirus_admin_txt'}</label>
+                <input name="newvirus_admin" id="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="virus_admin">{tmpl_var name='virus_admin_txt'}</label>
+                <input name="virus_admin" id="virus_admin" value="{tmpl_var name='virus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_admin">{tmpl_var name='banned_admin_txt'}</label>
+                <input name="banned_admin" id="banned_admin" value="{tmpl_var name='banned_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_admin">{tmpl_var name='bad_header_admin_txt'}</label>
+                <input name="bad_header_admin" id="bad_header_admin" value="{tmpl_var name='bad_header_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_admin">{tmpl_var name='spam_admin_txt'}</label>
+                <input name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
+                <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;Bytes
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_rulenames">{tmpl_var name='banned_rulenames_txt'}</label>
+                <input name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm
new file mode 100644
index 0000000..7279f0a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="policy_name">{tmpl_var name='policy_name_txt'}</label>
+                <input name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="virus_lover">{tmpl_var name='virus_lover_txt'}</label>
+                <select name="virus_lover" id="virus_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='virus_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_lover">{tmpl_var name='spam_lover_txt'}</label>
+                <select name="spam_lover" id="spam_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='spam_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_files_lover">{tmpl_var name='banned_files_lover_txt'}</label>
+                <select name="banned_files_lover" id="banned_files_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='banned_files_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_lover">{tmpl_var name='bad_header_lover_txt'}</label>
+                <select name="bad_header_lover" id="bad_header_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='bad_header_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_virus_checks">{tmpl_var name='bypass_virus_checks_txt'}</label>
+                <select name="bypass_virus_checks" id="bypass_virus_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_virus_checks'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_banned_checks">{tmpl_var name='bypass_banned_checks_txt'}</label>
+                <select name="bypass_banned_checks" id="bypass_banned_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_banned_checks'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_header_checks">{tmpl_var name='bypass_header_checks_txt'}</label>
+                <select name="bypass_header_checks" id="bypass_header_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_header_checks'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
new file mode 100644
index 0000000..48d323f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_policy">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
+                        <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
+                        <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
+                        <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
+                        <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
+                        <td class="tbl_col_virus_lover"><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
+                        <td class="tbl_col_spam_lover"><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
+                        <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
+                        <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_policy_name"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
+                        <td class="tbl_col_virus_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
+                        <td class="tbl_col_spam_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
+                        <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
+                        <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm
new file mode 100644
index 0000000..98e9c3e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="virus_quarantine_to">{tmpl_var name='virus_quarantine_to_txt'}</label>
+                <input name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_quarantine_to">{tmpl_var name='spam_quarantine_to_txt'}</label>
+                <input name="spam_quarantine_to" id="spam_quarantine_to" value="{tmpl_var name='spam_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_quarantine_to">{tmpl_var name='banned_quarantine_to_txt'}</label>
+                <input name="banned_quarantine_to" id="banned_quarantine_to" value="{tmpl_var name='banned_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_quarantine_to">{tmpl_var name='bad_header_quarantine_to_txt'}</label>
+                <input name="bad_header_quarantine_to" id="bad_header_quarantine_to" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <!--
+                  <div class="ctrlHolder">
+                    <label for="clean_quarantine_to">{tmpl_var name='clean_quarantine_to_txt'}</label>
+                    <input name="clean_quarantine_to" id="clean_quarantine_to" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+                                    </div>
+                  <div class="ctrlHolder">
+                    <label for="other_quarantine_to">{tmpl_var name='other_quarantine_to_txt'}</label>
+                    <input name="other_quarantine_to" id="other_quarantine_to" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+                                    </div>
+            -->
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm
new file mode 100644
index 0000000..34577c8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="spam_tag_level">{tmpl_var name='spam_tag_level_txt'}</label>
+                <input name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_tag2_level">{tmpl_var name='spam_tag2_level_txt'}</label>
+                <input name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_kill_level">{tmpl_var name='spam_kill_level_txt'}</label>
+                <input name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_dsn_cutoff_level">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
+                <input name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_quarantine_cutoff_level">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
+                <input name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_modifies_subj">{tmpl_var name='spam_modifies_subj_txt'}</label>
+                <select name="spam_modifies_subj" id="spam_modifies_subj" class="selectInput formLengthBool">
+                    {tmpl_var name='spam_modifies_subj'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_subject_tag">{tmpl_var name='spam_subject_tag_txt'}</label>
+                <input name="spam_subject_tag" id="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_subject_tag2">{tmpl_var name='spam_subject_tag2_txt'}</label>
+                <input name="spam_subject_tag2" id="spam_subject_tag2" value="{tmpl_var name='spam_subject_tag2'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm
new file mode 100644
index 0000000..7c96208
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_users">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthLimit">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy_id">{tmpl_var name='policy_id_txt'}</label>
+                <select name="policy_id" id="policy_id" class="selectInput">
+                    {tmpl_var name='policy_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fullname">{tmpl_var name='fullname_txt'}</label>
+                <input name="fullname" id="fullname" value="{tmpl_var name='fullname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="local">{tmpl_var name='local_txt'}</label>
+                <select name="local" id="local" class="selectInput formLengthBool">
+                    {tmpl_var name='local'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
new file mode 100644
index 0000000..280e766
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_users">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
+                        <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_policy_id"><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
+                        <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_local"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                        <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
+                        <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm
new file mode 100644
index 0000000..0d31b7a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_whitelist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <!--
+                  <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                                                    {tmpl_var name='server_id'}
+                                            </select>
+                  </div>
+            -->
+            <div class="ctrlHolder">
+                <label for="rid">{tmpl_var name='rid_txt'}</label>
+                <select name="rid" id="rid" class="selectInput">
+                    {tmpl_var name='rid'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthHalf">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
new file mode 100644
index 0000000..6c7ff3d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_whitelist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
new file mode 100644
index 0000000..3930f90
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_limit" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mailuser/index.htm b/interface/web/themes/default-v2/templates/mailuser/index.htm
new file mode 100644
index 0000000..c320253
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/index.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="page_head_txt"></h2>
+<p><tmpl_var name="page_desc_txt"></p>
+
+<div class="panel panel_mailuser">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='email_txt'}</p>
+            <p class="value">{tmpl_var name='email'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='login_txt'}</p>
+            <p class="value">{tmpl_var name='login'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='server_address_txt'}</p>
+            <p class="value">{tmpl_var name='server_name'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='quota_txt'}</p>
+            <p class="value">{tmpl_var name='quota'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='cc_txt'}</p>
+            <p class="value">{tmpl_var name='cc'}</p>
+        </div>
+        <div class="buttonHolder buttons">
+            &nbsp;
+        </div>
+    </fieldset>
+  </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm
new file mode 100644
index 0000000..271fca1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_autoresponder">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
+                <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+                <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
+                <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+                {tmpl_var name='autoresponder_start_date'}&nbsp;
+                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+                {tmpl_var name='autoresponder_end_date'}
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_autoresponder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm
new file mode 100644
index 0000000..089f824
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_cc">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='cc_txt'}</label>
+                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_cc_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm
new file mode 100644
index 0000000..a9113c2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
+                <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+                <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
+                <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+                <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
+            </div>
+            <div class="ctrlHolder">
+                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+                <span class="">{tmpl_var name='active'}</span>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
new file mode 100644
index 0000000..b8501e8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mailuser_filter">
+    
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+                    <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                    <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+                    <td class="tbl_col_buttons">
+                    <div class="buttons icons16">    
+                        <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                    </div>
+                    </td>
+                </tr>
+                </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
new file mode 100644
index 0000000..2b91842
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_password">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_password_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm
new file mode 100644
index 0000000..eaa59e9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm
@@ -0,0 +1,28 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_spamfilter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_spamfilter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
new file mode 100644
index 0000000..e0184d1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/main.tpl.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html dir="ltr" lang="<tmpl_var name="language">-<tmpl_var name="country">">      
+    <head>
+        <!--Possible? Vars in lang= ?-->
+        <meta charset="<tmpl_var name="html_content_encoding">" />
+        <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+        <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+        <link href="themes/default-v2/css/styles.css" rel="stylesheet" media="screen" type="text/css"/>
+        <link href="themes/default-v2/css/print.css" rel="stylesheet" media="print" type="text/css"/>
+        <!--[if IE 9]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 8]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 7]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <link href="themes/default-v2/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+        <link rel="shortcut icon" href="/themes/default-v2/images/favicon.ico" />
+        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
+        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
+        <script type="text/javascript" src="js/scrigo.js.php"></script>
+        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
+        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+        <script language="JavaScript" type="text/javascript">
+            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+            if(!is_chrome && getInternetExplorerVersion() > 8.0) {
+                var style = document.createElement('style');
+                style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
+                document.getElementsByTagName("head")[0].appendChild(style);
+            }
+            
+            jQuery(document).ready(function() {
+                loadInitContent();
+                
+                $("#pageForm").submit(function(e){
+                    //Prevent form submit: e.preventDefault() in lists
+                    if ($(".panel #Filter").length > 0) {
+                        e.preventDefault();
+                    }
+                });
+                
+                jQuery('.subsectiontoggle').live("click", function(){
+                    jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+                });
+                
+                jQuery('#globalsearch').ispconfigSearch({
+                    dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+                    resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+                    noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+                    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+                    searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
+                });
+                
+                jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+            });
+            
+            
+            jQuery(document).bind("change", function(event) {
+                if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+                    jQuery(".panel #Filter").trigger('click');
+                }
+            });
+            
+            jQuery(document).bind("keypress", function(event) {
+                //Use jQuery submit with keypress Enter in panel filterbar
+                if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+                    jQuery(".panel #Filter").trigger('click');
+                }
+                //Use jQuery submit with keypress Enter in forms
+                if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+                    jQuery(".pnl_formsarea button.positive:first").trigger('click');
+                }
+            });
+        </script>
+    </head>
+    <body>
+        <div id="page">
+            <!-- begin: header -->
+            <header>
+                <nav id="topsubnav">
+                    <!-- start: skip link navigation -->
+                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+                    <!-- end: skip link navigation -->
+                    <tmpl_if name="cpuser">
+                        <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
+                        <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+                    </tmpl_if>
+                </nav>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
+                <span>hosting control panel</span>
+            </header>
+            <!-- end: header -->
+            <a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
+            <!-- begin: main navigation #nav -->
+            <nav id="topNav">&nbsp;</nav>
+            <!-- end: main navigation -->
+
+            <!-- begin: main content area #main -->
+            <section id="main" name="content">
+                <nav id="sideNav" class="clearfix">&nbsp;</nav>
+                <!-- begin: #content -->
+                <section id="content">
+                    <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+                        <div id="pageContent"><!-- AJAX CONTENT --></div>
+                    </form>
+                    <div id="ie_clearing">&nbsp;</div>
+                    <!-- End: IE Column Clearing -->
+                </section>
+                <!-- end: #content -->
+            </section>
+            <!-- end: #main -->
+            <!-- begin: footer -->
+            <footer>
+                Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
+            </footer><!-- end: footer -->
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/module.tpl.htm b/interface/web/themes/default-v2/templates/module.tpl.htm
new file mode 100644
index 0000000..f8a26de
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/module.tpl.htm
@@ -0,0 +1,41 @@
+<tr>
+    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
+    <td rowspan="3" class="mainContent">
+        <table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
+            <tr>
+                <td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td width="128" align="right" valign="top" bgcolor="#DEE4F2">
+        <table width="128" border="0" cellspacing="0" cellpadding="2">
+            <tr>
+                <td height="10">&nbsp;</td>
+            </tr>
+            <tr>
+                <td align="center">
+                    <tmpl_loop name="nav_left">
+                        <table bgcolor="#F4F6FB" width="115">
+                            <tr>
+                                <td class="navLeftHead"><tmpl_var name="title"></td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <tmpl_loop name="items">
+                                        <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
+                                    </tmpl_loop>
+                                </td>
+                            </tr>
+                        </table>
+                        <br />
+                    </tmpl_loop>
+                </td>   
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
+</tr>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/module_tree.tpl.htm b/interface/web/themes/default-v2/templates/module_tree.tpl.htm
new file mode 100644
index 0000000..be21381
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/module_tree.tpl.htm
@@ -0,0 +1,42 @@
+<tr>
+    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
+    <td rowspan="3" class="mainContent">
+        <table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
+            <tr>
+                <td width="200"><iframe height="100%" width="100%" frameborder="0" name="navframe" src="{tmpl_var name="navframe_page"}"></iframe></td>
+                <td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td width="128" align="right" valign="top" bgcolor="#DEE4F2">
+        <table width="128" border="0" cellspacing="0" cellpadding="2">
+            <tr>
+                <td height="10">&nbsp;</td>
+            </tr>
+            <tr>
+                <td align="center">
+                    <tmpl_loop name="nav_left">
+                        <table bgcolor="#F4F6FB" width="115">
+                            <tr>
+                                <td class="navLeftHead"><tmpl_var name="title"></td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <tmpl_loop name="items">
+                                        <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
+                                    </tmpl_loop>
+                                </td>
+                            </tr>
+                        </table>
+                        <br />
+                    </tmpl_loop>
+                </td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
+</tr>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/datalog_list.htm b/interface/web/themes/default-v2/templates/monitor/datalog_list.htm
new file mode 100644
index 0000000..158a5a8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/datalog_list.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_datalog">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+                        <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_tstamp">&nbsp;</td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
+                        <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
+                            <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
+                            <td class="tbl_col_action">{tmpl_var name="action"}</td>
+                            <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_data.htm b/interface/web/themes/default-v2/templates/monitor/show_data.htm
new file mode 100644
index 0000000..818208d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_data.htm
@@ -0,0 +1,12 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system">
+
+    <div class="pnl_formarea">
+        <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+            <div class="systemmonitor"><tmpl_var name="output"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_log.htm b/interface/web/themes/default-v2/templates/monitor/show_log.htm
new file mode 100644
index 0000000..271d46b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_log.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_logview">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+                    <select name="refreshinterval" id="refreshinterval" class="selectInput" onChange="loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
+                        {tmpl_var name='refresh'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_formarea">
+        <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+            <div class="codeview"><tmpl_var name="log_data"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm b/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm
new file mode 100644
index 0000000..740141b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_sys_state">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+                    <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+                        {tmpl_var name='refresh'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_formarea">
+        <fieldset><legend></legend>
+            <div class="stateview"><tmpl_var name="state_data"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/syslog_list.htm b/interface/web/themes/default-v2/templates/monitor/syslog_list.htm
new file mode 100644
index 0000000..e3d18cb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/syslog_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_syslog">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
+                        <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_tstamp">&nbsp;</td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_loglevel"><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
+                        <td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
+                            <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
+                            <td class="tbl_col_loglevel">{tmpl_var name="loglevel"}</td>
+                            <td class="tbl_col_message">{tmpl_var name="message"}</td>
+                            <td class="tbl_col_buttons">
+                                <tmpl_if name="loglevel" op="==" value="Error">
+                                    <div class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </div>
+                                </tmpl_if>
+                                <tmpl_if name="loglevel" op="==" value="Warning">
+                                    <div class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </div>
+                                </tmpl_if>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sidenav.tpl.htm b/interface/web/themes/default-v2/templates/sidenav.tpl.htm
new file mode 100644
index 0000000..a5051cf
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sidenav.tpl.htm
@@ -0,0 +1,24 @@
+<ul id="submenu">
+    <tmpl_loop name="nav_left">
+        <li class="title">
+        <tmpl_if name="startpage">
+            <a href="#" onClick="loadContent('<tmpl_var name='startpage'>')">
+        </tmpl_if>
+        <tmpl_var name="title">
+            <tmpl_if name="startpage">
+                </a>
+            </tmpl_if>
+        </li>
+            <tmpl_loop name="items">
+                <li <tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>
+                    <tmpl_if name="link">
+                        <a href="#" onClick="loadContent('<tmpl_var name='link'>')">
+                    </tmpl_if>
+                    <tmpl_var name="title">
+                    <tmpl_if name="link">
+                        </a>
+                    </tmpl_if>
+                </li>
+            </tmpl_loop>
+    </tmpl_loop>
+</ul>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_install_package.htm b/interface/web/themes/default-v2/templates/sites/aps_install_package.htm
new file mode 100644
index 0000000..e6ce02a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_install_package.htm
@@ -0,0 +1,56 @@
+<h2>
+    {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'}
+    <span style="float:right">
+        <tmpl_if name='pkg_icon' op='!=' value=''>
+            <img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" /> 
+        </tmpl_if>
+    </span>
+</h2>
+    
+<tmpl_if name='error'>
+    <div id="errorMsg"><h3>ERROR</h3><ol>{tmpl_var name='error'}</ol></div>
+</tmpl_if>
+
+<div class="panel panel_install_package">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <legend>{tmpl_var name='basic_settings_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="main_domain">{tmpl_var name='install_location_txt'}</label>
+                <div class="resetButton">http(s)://&nbsp;</div>DOMAIN_LIST_SPACE<div style="float:left;">&nbsp;/&nbsp;</div>
+                <input type="text" name="main_location" id="main_location" value="{tmpl_var name='inp_main_location'}" maxlength="255" class="textInput formLengthHalf" />
+            </div>
+            <tmpl_if name='pkg_requirements_database' op='!=' value=''>
+                <div class="ctrlHolder">
+                    <label for="main_database_password">{tmpl_var name='new_database_password_txt'}</label>
+                    <input type="text" class="textInput" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" size="10" maxlength="255" />
+                </div>
+            </tmpl_if>
+                
+            PKG_SETTINGS_SPACE
+                
+            <legend>{tmpl_var name='license_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="license">{tmpl_var name='license_txt'}</label>
+                <tmpl_if name='pkg_license_content' op='==' value=''>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
+                <tmpl_if name='pkg_license_type' op='==' value='url'>
+                    <a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
+                    <tmpl_elseif name='pkg_license_content'>
+                        <textarea rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="license">{tmpl_var name='acceptance_txt'}</label>
+                <input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</tmpl_if> />&nbsp;&nbsp;{tmpl_var name='acceptance_text'}
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="install" value="0" />
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install'}" name="btn_install" onClick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel'}" onClick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm b/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
new file mode 100644
index 0000000..640c0bb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
@@ -0,0 +1,62 @@
+<h2>{tmpl_var name="list_head_txt"}</h2>
+
+<div class="panel panel_list_instances">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend>{tmpl_var name="list_head_txt"}</legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
+                        <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
+                        <tmpl_if name='is_noclient'>
+                        <th class="tbl_col_customer" scope="col">{tmpl_var name='customer_txt'}</th>
+                        </tmpl_if>
+                        <th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
+                        <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
+                        <th class="tbl_col_buttons" scope="col" >&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+                        <tmpl_if name='is_noclient'>
+                        <td class="tbl_col_customer"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>
+                        </tmpl_if>
+                        <td class="tbl_col_installlocation">&nbsp;</td>
+                        <td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
+                        <td class="tbl_col_buttons">
+                        <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');">
+                            <span>{tmpl_var name='filter_txt'}</span>
+                        </button>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name='records'>
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='package_name'}</a></td>
+                            <td class="tbl_col_version">{tmpl_var name='package_version'}-{tmpl_var name='package_release'}</td>
+                            <tmpl_if name='is_noclient'>
+                                <td class="tbl_col_customer"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='CustomerID'}');">{tmpl_var name='customer_name'}</a></td>
+                            </tmpl_if>
+                            <td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
+                            <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name='delete_possible'><a class="icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <tmpl_if name='reinstall_possible'><a class="icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a></tmpl_if>
+                                </div>
+                            </td>        
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6">{tmpl_var name='paging'}</td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm b/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
new file mode 100644
index 0000000..351d3ac
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
@@ -0,0 +1,139 @@
+<h2>
+    <tmpl_if name='pkg_icon' op='!=' value=''>
+        <img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" /> 
+    </tmpl_if>
+    {tmpl_var name='pkg_name'}
+</h2>
+<b>{tmpl_var name='pkg_summary'}</b>
+<p>&nbsp;</p>
+
+<div class="pnl_toolsarea">
+    <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
+            <span>{tmpl_var name='install_package_txt'}</span>
+        </button>
+    </div>
+    <p>&nbsp;</p><p>&nbsp;</p>
+</div>
+
+
+<div class="tabbox_tabs">
+    <input type="hidden" name="next_tab" value="" />
+    <ul>
+        <li<tmpl_if name='next_tab' op='==' value='details'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('details', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='details_txt'}</a>
+        </li>
+        <tmpl_if name='pkg_screenshots'>
+        <li<tmpl_if name='next_tab' op='==' value='screenshots'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('screenshots', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='screenshots_txt'}</a>
+        </li></tmpl_if>
+        <tmpl_if name='pkg_changelog'>
+        <li<tmpl_if name='next_tab' op='==' value='changelog'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('changelog', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='changelog_txt'}</a>
+        </li></tmpl_if>
+        <li<tmpl_if name='next_tab' op='==' value='settings'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('settings', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='settings_txt'}</a>
+        </li>
+    </ul>
+</div>
+<p>&nbsp;</p>
+
+<div class="panel panel_list_packages">
+    
+    <div class="pnl_listarea">
+        <table class="list">
+            <tbody>
+                <tmpl_if name='next_tab' op='==' value='details'>
+                    <tr class="tbl_row_uneven">
+                        <td width="25%">{tmpl_var name='version_txt'}</td>
+                        <td>{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='category_txt'}</td>
+                        <td>{tmpl_var name='pkg_category'}</td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='description_txt'}</td>
+                        <td>{tmpl_var name='pkg_description'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='homepage_txt'}</td>
+                        <td>
+                            <a href="{tmpl_var name='pkg_homepage'}" target="_blank">{tmpl_var name='pkg_homepage'}</a>
+                        </td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='installed_size_txt'}</td>
+                        <td>{tmpl_var name='pkg_installed_size'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='supported_languages_txt'}</td>
+                        <td>{tmpl_var name='pkg_languages'}</td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='config_script_txt'}</td>
+                        <td>{tmpl_var name='pkg_config_script'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='license_txt'}</td>
+                        <td>
+                            <tmpl_if name='pkg_license_name'>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
+                            <tmpl_if name='pkg_license_type' op='==' value='url'><a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
+                            <tmpl_elseif name='pkg_license_content'>
+                                <textarea rows="10" cols="80">{tmpl_var name='pkg_license_content'}</textarea>
+                            </tmpl_if>
+                        </td>
+                    </tr>
+                <tmpl_elseif name='next_tab' op='==' value='screenshots'>
+                    <tmpl_if name='pkg_screenshots'>
+                        <tr class="tbl_row_even">
+                            <td style="text-align:center;">
+                                <tmpl_loop name='pkg_screenshots'>
+                                    <img src="{tmpl_var name='ScreenPath'}" alt="{tmpl_var name='ScreenDescription'}" /><br />
+                                    <em>{tmpl_var name='ScreenDescription'}</em><br /><br />
+                                </tmpl_loop>
+                            </td>
+                        </tr>
+                    </tmpl_if>
+                <tmpl_elseif name='next_tab' op='==' value='changelog'>
+                    <tmpl_if name='pkg_changelog'>
+                        <tr class="tbl_row_even">
+                            <td>
+                                <ul>
+                                    <tmpl_loop name='pkg_changelog'>
+                                    <li>{tmpl_var name='ChangelogVersion'}</li>
+                                <ul>
+                                    <tmpl_if name='ChangelogDescription'>
+                                    <li>{tmpl_var name='ChangelogDescription'}</li>
+                                    </tmpl_if>
+                                </ul>
+                                    </tmpl_loop>
+                                </ul>
+                            </td>
+                        </tr>
+                    </tmpl_if>
+                <tmpl_elseif name='next_tab' op='==' value='settings'>
+                    <tr class="tbl_row_uneven">
+                        <td width="25%">{tmpl_var name='php_extensions_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_php_extensions'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='php_settings_txt'}</td>
+                        <td>
+                            <tmpl_loop name='pkg_requirements_php_settings'>{tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}<br /></tmpl_loop>
+                        </td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='supported_php_versions_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_supported_php_versions'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='database_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_database'}</a></td>
+                    </tr>
+                </tmpl_if>
+            </tbody>
+        </table>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm b/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
new file mode 100644
index 0000000..e7db3e8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
@@ -0,0 +1,50 @@
+<h2>{tmpl_var name="list_head_txt"}</h2>
+
+<div class="panel panel_list_packages">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
+                        <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
+                        <th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
+                            <tmpl_if name='is_admin'>
+                                <th class="tbl_col_status" scope="col">{tmpl_var name='status_txt'}</th>
+                            </tmpl_if>
+                        <th class="tbl_col_buttons" scope="col" width="60px;">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+                        <td class="tbl_col_customerid"><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
+                            <tmpl_if name='is_admin'>
+                                <td class="tbl_col_status"><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
+                            </tmpl_if>
+                        <td class="tbl_col_buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name='records'>
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='id'}');">{tmpl_var name='name'}</a></td>
+                            <td class="tbl_col_version">{tmpl_var name='version'}-{tmpl_var name='release'}</td>
+                            <td class="tbl_col_category">{tmpl_var name='category'}</td>
+                                <tmpl_if name='is_admin'>
+                                    <td class="tbl_col_status"><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
+                                </tmpl_if>
+                            <td>&nbsp;</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5">{tmpl_var name='paging'}</td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/cron_edit.htm b/interface/web/themes/default-v2/templates/sites/cron_edit.htm
new file mode 100644
index 0000000..7d47b4e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/cron_edit.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_cron">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Cron Job</legend>
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_min">{tmpl_var name='run_min_txt'}</label>
+                <input name="run_min" id="run_min" value="{tmpl_var name='run_min'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */3, 10-20</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_hour">{tmpl_var name='run_hour_txt'}</label>
+                <input name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */2, 0, 10-12</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_mday">{tmpl_var name='run_mday_txt'}</label>
+                <input name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */4, 1-5</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_month">{tmpl_var name='run_month_txt'}</label>
+                <input name="run_month" id="run_month" value="{tmpl_var name='run_month'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, 1-6</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_wday">{tmpl_var name='run_wday_txt'}</label>
+                <input name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, 0, 1-5</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="command">{tmpl_var name='command_txt'}</label>
+                <input name="command" id="command" value="{tmpl_var name='command'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. /var/www/clients/client1/myscript.sh or http://www.mydomain.com/path/script.php</p>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/cron_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/cron_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/cron_list.htm b/interface/web/themes/default-v2/templates/sites/cron_list.htm
new file mode 100644
index 0000000..f822b89
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/cron_list.htm
@@ -0,0 +1,74 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_cron">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
+                    <span>{tmpl_var name="add_new_cron_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_run_min" scope="col"><tmpl_var name="run_min_txt"></th>
+                        <th class="tbl_col_run_hour" scope="col"><tmpl_var name="run_hour_txt"></th>
+                        <th class="tbl_col_run_mday" scope="col"><tmpl_var name="run_mday_txt"></th>
+                        <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
+                        <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
+                        <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_run_min"><input type="text" name="search_run_min" size="1" value="{tmpl_var name='search_run_min'}" /></td>
+                        <td class="tbl_col_run_hour"><input type="text" name="search_run_hour" size="1" value="{tmpl_var name='search_run_hour'}" /></td>
+                        <td class="tbl_col_run_mday"><input type="text" name="search_run_mday" size="1" value="{tmpl_var name='search_run_mday'}" /></td>
+                        <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="1" value="{tmpl_var name='search_run_month'}" /></td>
+                        <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="1" value="{tmpl_var name='search_run_wday'}" /></td>
+                        <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_run_min"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_min"}</a></td>
+                            <td class="tbl_col_run_hour"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_hour"}</a></td>
+                            <td class="tbl_col_run_mday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_mday"}</a></td>
+                            <td class="tbl_col_run_month"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_month"}</a></td>
+                            <td class="tbl_col_run_wday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_wday"}</a></td>
+                            <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="10"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
new file mode 100644
index 0000000..b6c90b5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_database_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
+                        <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
+                            <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_edit.htm b/interface/web/themes/default-v2/templates/sites/database_edit.htm
new file mode 100644
index 0000000..ada2f94
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_edit.htm
@@ -0,0 +1,121 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_database">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput formLengthHalf">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_name">{tmpl_var name='database_name_txt'}</label>
+                <p class="prefix">{tmpl_var name='database_name_prefix'}</p>
+                <tmpl_if name="edit_disabled">
+                    <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
+                    <input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+                    <tmpl_else>
+                        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_user">{tmpl_var name='database_user_txt'}</label>
+                <p class="prefix">{tmpl_var name='database_user_prefix'}</p>
+                <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_password">{tmpl_var name='database_password_txt'}</label>
+                <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('database_password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('database_password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
+                    <select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
+                        {tmpl_var name='database_charset'}
+                    </select>
+                    <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+                    <tmpl_else>
+                        <label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
+                        <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
+                            {tmpl_var name='database_charset'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='remote_access_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='remote_access'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="remote_ips">{tmpl_var name='remote_ips_txt'}</label>
+                <input name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" size="60" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#remote_ips').ispconfigSearch({
+        dataSrc: '/sites/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_list.htm b/interface/web/themes/default-v2/templates/sites/database_list.htm
new file mode 100644
index 0000000..d3b9ac5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_list.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_database">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+                        <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm
new file mode 100644
index 0000000..175b5fe
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="uid">{tmpl_var name='uid_txt'}</label>
+                <input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="gid">{tmpl_var name='gid_txt'}</label>
+                <input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="quota_files">{tmpl_var name='quota_files_txt'}</label>
+                <input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">{tmpl_var name='quota_files_unity_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ul_ratio">{tmpl_var name='ul_ratio_txt'}</label>
+                <input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dl_ratio">{tmpl_var name='dl_ratio_txt'}</label>
+                <input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ul_bandwidth">{tmpl_var name='ul_bandwidth_txt'}</label>
+                <input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dl_bandwidth">{tmpl_var name='dl_bandwidth_txt'}</label>
+                <input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm
new file mode 100644
index 0000000..5918c6d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
new file mode 100644
index 0000000..25ea629
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
+                <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
new file mode 100644
index 0000000..d455e0d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_ftp_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="webftp_link">
+                                        <a class="icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm b/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm
new file mode 100644
index 0000000..bad78c8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_shell_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="puser">{tmpl_var name='puser_txt'}</label>
+                <input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="pgroup">{tmpl_var name='pgroup_txt'}</label>
+                <input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shell">{tmpl_var name='shell_txt'}</label>
+                <input name="shell" id="shell" value="{tmpl_var name='shell'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
new file mode 100644
index 0000000..554dbb9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
@@ -0,0 +1,72 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_shell_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'} </p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth"/>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="chroot">{tmpl_var name='chroot_txt'}</label>
+                <select name="chroot" id="chroot" class="selectInput formLengthHalf">
+                    {tmpl_var name='chroot'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
+                <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
+                <textarea name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_list.htm b/interface/web/themes/default-v2/templates/sites/shell_user_list.htm
new file mode 100644
index 0000000..9087c66
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_shell_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
new file mode 100644
index 0000000..adb1e35
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_system_user"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_soft" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
+                            <td class="tbl_col_hard" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
+                            <td class="tbl_col_files" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm
new file mode 100644
index 0000000..0ccaa5e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm
@@ -0,0 +1,125 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+                <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+                    {tmpl_var name='subdomain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('#parent_domain_id').val();
+    var serverId;
+    getServerId(webId);
+		
+    jQuery('#parent_domain_id').change(function(){
+        webId = $(this).val();
+        getServerId(webId);
+    });
+		
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+		
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+					
+                jQuery("#redirect_type option[value='R']").hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+					
+                jQuery('#redirect_type option[value="last"]').show();
+                jQuery('#redirect_type option[value="break"]').show();
+                jQuery('#redirect_type option[value="redirect"]').show();
+                jQuery('#redirect_type option[value="permanent"]').show();
+					
+                jQuery('#redirect_type option[value="last"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="break"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+					
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+					
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+					
+                jQuery('#redirect_type option[value="R"]').show();
+                jQuery('#redirect_type option[value="L"]').show();
+                jQuery('#redirect_type option[value="R,L"]').show();
+                jQuery('#redirect_type option[value="R=301,L"]').show();
+					
+                jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
+					
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
new file mode 100644
index 0000000..faab74e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_aliasdomain">
+
+    <div class="pnl_listsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_backup_list.htm b/interface/web/themes/default-v2/templates/sites/web_backup_list.htm
new file mode 100644
index 0000000..8563977
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_backup_list.htm
@@ -0,0 +1,41 @@
+<tmpl_if name="msg">
+    <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+</tmpl_if>
+<tmpl_if name="error">
+    <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+</tmpl_if>
+<h3><tmpl_var name="list_head_txt"></h3>
+
+<div class="panel panel_list_web_backup">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
+                        <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
+                        <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_date">{tmpl_var name="date"}</td>
+                            <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
+                            <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
+                            <td class="tbl_col_buttons" style="width:300px;">
+                                <div class="buttons" >
+                                    <button class="iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
+                                    <button class="iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm b/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
new file mode 100644
index 0000000..f363e44
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_domain_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm b/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm
new file mode 100644
index 0000000..8710740
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm
@@ -0,0 +1,146 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
+            <div class="ctrlHolder">
+                <label for="system_user">{tmpl_var name='system_user_txt'}</label>
+                <label for="system_user">{tmpl_var name='system_user'}</label>
+                <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="system_group">{tmpl_var name='system_group_txt'}</label>
+                <label for="system_group">{tmpl_var name='system_group'}</label>
+                <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
+                <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="phpfpm">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='php_fpm_use_socket'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm">{tmpl_var name='pm_txt'}</label>
+                    <select name="pm" id="pm" class="selectInput">
+                        {tmpl_var name='pm'}
+                    </select>
+                </div>
+                <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+                    {tmpl_var name='pm_ondemand_hint_txt'}
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
+                    <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
+                    <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
+                    <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
+                    <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_ondemand">
+                    <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
+                    <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />&nbsp;s
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
+                    <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
+                <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput"  style="width:400px;" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
+                <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
+                <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
+                <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('input[name="id"]').val();
+    var serverId;
+    getServerId();
+    adjustForm();
+		
+    var pm = jQuery('#pm').val();
+    pmMode(pm);
+    jQuery('#pm').change(function(){
+        pm = jQuery(this).val();
+        pmMode(pm);
+    });
+		
+    function pmMode(pm){
+        switch(pm){
+            case "static":
+                jQuery('.pm_dynamic').add('.pm_ondemand').hide();
+                jQuery('.pm_static').show();
+                break;
+            case "dynamic":
+                jQuery('.pm_static').add('.pm_ondemand').hide();
+                jQuery('.pm_dynamic').show();
+                break;
+            case "ondemand":
+                jQuery('.pm_static').add('.pm_dynamic').hide();
+                jQuery('.pm_ondemand').show();
+                break;
+        }
+    }
+		
+    function getServerId(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+        });
+    }
+		
+    function adjustForm(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            if(data.servertype == "nginx"){
+                jQuery('.nginx').show();
+                jQuery('.apache').hide();
+            } else {
+                jQuery('.nginx').hide();
+                jQuery('.apache').show();
+            }
+        });
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
+            if(data.phptype == "php-fpm"){
+                jQuery('.phpfpm').show();
+            } else {
+                jQuery('.phpfpm').hide();
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm b/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm
new file mode 100644
index 0000000..c46d4e2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Backup</legend>
+            <div class="ctrlHolder">
+                <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
+                <select name="backup_interval" id="backup_interval" class="selectInput">
+                    {tmpl_var name='backup_interval'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
+                <select name="backup_copies" id="backup_copies" class="selectInput">
+                    {tmpl_var name='backup_copies'}
+                </select>
+            </div>
+        </fieldset>
+
+        {tmpl_var name='backup_records'}
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
new file mode 100644
index 0000000..496ddec
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
@@ -0,0 +1,227 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+                <tmpl_else>
+                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
+                    {tmpl_var name='ip_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ipv6_address">{tmpl_var name='ipv6_address_txt'}</label>
+                <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv4">
+                    {tmpl_var name='ipv6_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
+                <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
+                <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />&nbsp;MB <tmpl_var name='traffic_quota_exceeded_txt'>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='cgi_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='cgi'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ssi_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ssi'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='ruby_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ruby'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='python_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='python'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='suexec_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='suexec'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='errordocs_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='errordocs'}
+                </div>
+            </div>
+
+            <div class="ctrlHolder">
+                <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+                <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+                    {tmpl_var name='subdomain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ssl_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ssl'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="php">{tmpl_var name='php_txt'}</label>
+                <select name="php" id="php" class="selectInput formLengthHalf">
+                    {tmpl_var name='php'}
+                </select>
+            </div>
+            <div class="ctrlHolder fastcgi_php_version">
+                <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
+                <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
+                    {tmpl_var name='fastcgi_php_version'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var serverId;
+    var clientGroupId = jQuery('#client_group_id').val();
+    var serverIdDisabled = jQuery('#server_id_disabled').val();
+    if(serverIdDisabled > 0){
+        serverId = serverIdDisabled;
+    } else {
+        serverId = jQuery('#server_id').val();
+        jQuery('#server_id').change(function(){
+            serverId = $(this).val();
+            adjustForm();
+            reloadWebIP();
+            reloadFastcgiPHPVersions();
+        });
+    }
+    adjustForm();
+		
+    jQuery('#client_group_id').change(function(){
+        clientGroupId = $(this).val();
+        reloadWebIP();
+    });
+		
+    if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
+        jQuery('.fastcgi_php_version:hidden').show();
+    } else {
+        jQuery('.fastcgi_php_version:visible').hide();
+    }
+    jQuery('#php').change(function(){
+        reloadFastcgiPHPVersions();
+        if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
+            jQuery('.fastcgi_php_version:hidden').show();
+        } else {
+            jQuery('.fastcgi_php_version:visible').hide();
+        }
+    });
+		
+    function adjustForm(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            if(data.servertype == "nginx"){
+                var selected = jQuery('#php').val();
+                jQuery('.apache').hide();
+                jQuery('.apache').hide();
+                jQuery('#php option[value="fast-cgi"]').hide();
+                jQuery('#php option[value="cgi"]').hide();
+                jQuery('#php option[value="mod"]').hide();
+                jQuery('#php option[value="suphp"]').hide();
+                if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
+            } else {
+                jQuery('.apache').show();
+                jQuery('.apache').show();
+                jQuery('#php option[value="fast-cgi"]').show();
+                jQuery('#php option[value="cgi"]').show();
+                jQuery('#php option[value="mod"]').show();
+                jQuery('#php option[value="suphp"]').show();
+            }
+        });
+    }
+		
+    function reloadWebIP() {
+        loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
+        loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
+    }
+		
+    function reloadFastcgiPHPVersions() {
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
+            var options = '<option value="">Default</option>';
+            var phpfastcgiselected = '';
+            $.each(data, function(key, val) {
+                if($('#fastcgi_php_version').val() == key){
+                    phpfastcgiselected = ' selected="selected"';
+                } else {
+                    phpfastcgiselected = '';
+                }
+                options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
+            });
+            $('#fastcgi_php_version').html(options);
+        });
+    }
+			
+</script>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_list.htm b/interface/web/themes/default-v2/templates/sites/web_domain_list.htm
new file mode 100644
index 0000000..4ce5d5d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm b/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm
new file mode 100644
index 0000000..66a1703
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm
@@ -0,0 +1,76 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+                <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
+                    {tmpl_var name='seo_redirect'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('input[name="id"]').val();
+    var serverId;
+    getServerId(webId);
+		
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+		
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+
+                jQuery('#redirect_type option[value="R"]').hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+					
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
new file mode 100644
index 0000000..0b1d1fe
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
+                <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
+                <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
+                <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
+                <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
+                <select name="ssl_country" id="ssl_country" class="selectInput flags">
+                    {tmpl_var name='ssl_country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
+                <select name="ssl_domain" id="ssl_domain" class="selectInput">
+                    {tmpl_var name='ssl_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
+                <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
+                <textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
+                <textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
+                <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
+                    {tmpl_var name='ssl_action'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
new file mode 100644
index 0000000..b5ffe73
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
+                <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('stats_password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('stats_password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
+                <select name="stats_type" id="stats_type" class="selectInput" >
+                    {tmpl_var name='stats_type'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm b/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm
new file mode 100644
index 0000000..4165ab7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_folder">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Folder</legend>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="path">{tmpl_var name='path_txt'}</label>
+                <input name="path" id="path" value="{tmpl_var name='path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_folder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_folder_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_list.htm b/interface/web/themes/default-v2/templates/sites/web_folder_list.htm
new file mode 100644
index 0000000..3dcb9ee
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_folder">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_path"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                        <td class="tbl_col_path"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="path"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
new file mode 100644
index 0000000..1e9cae1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_folder_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Folder</legend>
+            <div class="ctrlHolder">
+                <label for="web_folder_id">{tmpl_var name='web_folder_id_txt'}</label>
+                <select name="web_folder_id" id="web_folder_id" class="selectInput">
+                    {tmpl_var name='web_folder_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_folder_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_folder_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm b/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
new file mode 100644
index 0000000..2df924f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_folder_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_web_folder_id"><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_web_folder_id"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_folder_id"}</a></td>
+                        <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
new file mode 100644
index 0000000..a0814ad
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_sites_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+                        <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+                        <th class="tbl_col_web_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+                        <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_this_month"></td>
+                        <td class="tbl_col_last_month"></td>
+                        <td class="tbl_col_this_year"></td>
+                        <td class="tbl_col_last_year"></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_this_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} MB</a></td>
+                        <td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
+                        <td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
+                        <td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm
new file mode 100644
index 0000000..a8b0fe9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm
@@ -0,0 +1,112 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_subdomain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='host_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
+                <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    //var webId = jQuery('input[name="id"]').val();
+    var webId = jQuery('#parent_domain_id').val();
+    var serverId;
+    getServerId(webId);
+    
+    jQuery('#parent_domain_id').change(function(){
+        webId = $(this).val();
+        getServerId(webId);
+    });
+    
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+    
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+                
+                jQuery("#redirect_type option[value='R']").hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+                
+                jQuery('#redirect_type option[value="last"]').show();
+                jQuery('#redirect_type option[value="break"]').show();
+                jQuery('#redirect_type option[value="redirect"]').show();
+                jQuery('#redirect_type option[value="permanent"]').show();
+                
+                jQuery('#redirect_type option[value="last"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="break"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+                
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+                
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+                
+                jQuery('#redirect_type option[value="R"]').show();
+                jQuery('#redirect_type option[value="L"]').show();
+                jQuery('#redirect_type option[value="R,L"]').show();
+                jQuery('#redirect_type option[value="R=301,L"]').show();
+                
+                jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
+                
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+    
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm b/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
new file mode 100644
index 0000000..237cd85
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_subdomain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
new file mode 100644
index 0000000..7a110c7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_webdav_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <p class="prefix">webdav/</p>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+            </div>
+
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/webdav_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/webdav_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm b/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
new file mode 100644
index 0000000..ee2b45d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_webdav_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/webdav_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm b/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm
new file mode 100644
index 0000000..2890e1b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm
@@ -0,0 +1,27 @@
+<tmpl_if name="form_hint">
+    <h2><tmpl_var name="form_hint"></h2>
+</tmpl_if>
+<div class="tabbox_tabs">
+    <ul>
+        <tmpl_loop name="formTab">
+            <tmpl_if name="active">
+                <li class="active"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
+            <tmpl_else>
+                <li><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
+            </tmpl_if>
+        </tmpl_loop>
+    </ul>
+</div>
+<div id="tabbox_content">
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+    
+    <tmpl_dyninclude name="content_tpl">
+</div>
+
+<input type="hidden" name="next_tab" value="">
+<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm b/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm
new file mode 100644
index 0000000..b4fad7e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm
@@ -0,0 +1,56 @@
+<h2>Import DNS recods from Tupa PowerDNS controlpanel</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database hostname</p>
+                <div class="multiField">
+                    <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database name</p>
+                <div class="multiField">
+                    <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database user</p>
+                <div class="multiField">
+                    <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database password</p>
+                <div class="multiField">
+                    <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">Import DNS Records</p>
+                <div class="multiField">
+                    <input id="start" type="checkbox" value="1" name="start" checked/>
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm b/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm
new file mode 100644
index 0000000..7d7b4c1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm
@@ -0,0 +1,103 @@
+<h2>{tmpl_var name="head_txt"}</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+            <div class="ctrlHolder">
+                <p class="label">Remote API URL</p>
+                <div class="multiField">
+                    <input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Remote User</p>
+                <div class="multiField">
+                    <input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Remote password</p>
+                <div class="multiField">
+                    <input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
+                </div>
+            </div>
+        </fieldset>
+    </div>
+    <tmpl_if name="connected">
+        <div class="pnl_formsarea">
+            <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
+                <div class="ctrlHolder">
+                    <label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
+                    <select name="mail_domain" id="mail_domain" class="selectInput">
+                        {tmpl_var name='mail_domain'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_mailbox_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_user_filter_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_alias_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_forward_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
+                    </div>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+	 
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+	
+    <input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
+    <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
+    <tmpl_if name="connected">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    <tmpl_else>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    </tmpl_if>
+  </div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/import_plesk.htm b/interface/web/themes/default-v2/templates/tools/import_plesk.htm
new file mode 100644
index 0000000..f72096c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/import_plesk.htm
@@ -0,0 +1,74 @@
+<h2>Import plesk panel data</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Plesk data import</legend>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database hostname</p>
+                <div class="multiField">
+                    <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database name</p>
+                <div class="multiField">
+                    <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database user</p>
+                <div class="multiField">
+                    <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database password</p>
+                <div class="multiField">
+                    <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Web content backup file (on this server, optional)</p>
+                <div class="multiField">
+                    <input id="webcontent" type="text" value="{tmpl_var name='webcontent'}" name="webcontent" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Maildir content backup file (on this server, optional)</p>
+                <div class="multiField">
+                    <input id="mailcontent" type="text" value="{tmpl_var name='mailcontent'}" name="mailcontent" />
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">Import all data (that can be imported)</p>
+                <div class="multiField">
+                    <input id="start" type="checkbox" value="1" name="start" checked/>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Import database contents (make sure the database user has the rights to do so)</p>
+                <div class="multiField">
+                    <input id="dbdata" type="checkbox" value="1" name="dbdata" checked/>
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/resync.htm b/interface/web/themes/default-v2/templates/tools/resync.htm
new file mode 100644
index 0000000..c7611b8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/resync.htm
@@ -0,0 +1,67 @@
+<h2>{tmpl_var name="head_txt"}</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_sites_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_sites" type="checkbox" value="1" name="resync_sites" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_ftp_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_ftp" type="checkbox" value="1" name="resync_ftp" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_shell_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_shell" type="checkbox" value="1" name="resync_shell" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_cron_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_cron" type="checkbox" value="1" name="resync_cron" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_db_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_db" type="checkbox" value="1" name="resync_db" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_mailbox_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_mailbox" type="checkbox" value="1" name="resync_mailbox" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_dns_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_dns" type="checkbox" value="1" name="resync_dns" />
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    </div>
+  
+</div>
diff --git a/interface/web/themes/default-v2/templates/tools/user_settings.htm b/interface/web/themes/default-v2/templates/tools/user_settings.htm
new file mode 100644
index 0000000..a6ea072
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/user_settings.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_usersettings">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+                <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+        </fieldset>
+        
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','tools/user_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/topnav.tpl.htm b/interface/web/themes/default-v2/templates/topnav.tpl.htm
new file mode 100644
index 0000000..b86b9ab
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/topnav.tpl.htm
@@ -0,0 +1,9 @@
+<ul id="topmenu">
+    <tmpl_loop name="nav_top">
+        <tmpl_if name="active">
+            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+        <tmpl_else>
+            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+        </tmpl_if>
+    </tmpl_loop>
+</ul>
diff --git a/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl b/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
new file mode 100644
index 0000000..5bdd385
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
@@ -0,0 +1,50 @@
+
+# Template version
+VERSION="2"
+
+# Parameters
+ONBOOT="{tmpl_var name='onboot'}"
+KMEMSIZE="{tmpl_var name='kmemsize'}"
+LOCKEDPAGES="{tmpl_var name='lockedpages'}"
+PRIVVMPAGES="{tmpl_var name='privvmpages'}"
+SHMPAGES="{tmpl_var name='shmpages'}"
+NUMPROC="{tmpl_var name='numproc'}"
+PHYSPAGES="{tmpl_var name='physpages'}"
+VMGUARPAGES="{tmpl_var name='vmguarpages'}"
+OOMGUARPAGES="{tmpl_var name='oomguarpages'}"
+NUMTCPSOCK="{tmpl_var name='numtcpsock'}"
+NUMFLOCK="{tmpl_var name='numflock'}"
+NUMPTY="{tmpl_var name='numpty'}"
+NUMSIGINFO="{tmpl_var name='numsiginfo'}"
+TCPSNDBUF="{tmpl_var name='tcpsndbuf'}"
+TCPRCVBUF="{tmpl_var name='tcprcvbuf'}"
+OTHERSOCKBUF="{tmpl_var name='othersockbuf'}"
+DGRAMRCVBUF="{tmpl_var name='dgramrcvbuf'}"
+NUMOTHERSOCK="{tmpl_var name='numothersock'}"
+DCACHESIZE="{tmpl_var name='dcachesize'}"
+NUMFILE="{tmpl_var name='numfile'}"
+AVNUMPROC="{tmpl_var name='avnumproc'}"
+NUMIPTENT="{tmpl_var name='numiptent'}"
+
+DISKSPACE="{tmpl_var name='diskspace'}"
+DISKINODES="{tmpl_var name='diskinodes'}"
+QUOTAUGIDLIMIT="10000"
+IOPRIO="{tmpl_var name='io_priority'}"
+QUOTATIME="0"
+
+CPUS="{tmpl_var name='cpu_num'}"
+CPUUNITS="{tmpl_var name='cpu_units'}"
+CPULIMIT="{tmpl_var name='cpu_limit'}"
+
+VE_ROOT="/vz/root/$VEID"
+VE_PRIVATE="/vz/private/$VEID"
+OSTEMPLATE="{tmpl_var name='ostemplate'}"
+ORIGIN_SAMPLE="vps.basic"
+HOSTNAME="{tmpl_var name='hostname'}"
+IP_ADDRESS="{tmpl_var name='ip_address'}"
+NAMESERVER="{tmpl_var name='nameserver'}"
+# alternative meminfo: "pages:256000"
+MEMINFO="privvmpages:1"
+# SWAPPAGES="{tmpl_var name='swappages'}"
+
+CAPABILITY="{tmpl_var name='capability'}"
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_action.htm b/interface/web/themes/default-v2/templates/vm/openvz_action.htm
new file mode 100644
index 0000000..057c851
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_action.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
+            
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='start_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='stop_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='restart_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ostemplate_txt'}</p>
+                <div class="multiField">
+                    <input style="float:left; margin-right:10px;" id="action" type="radio" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
+                           <input name="ostemplate_name" size="30" maxlength="255" type="text" class="textInput" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /> &nbsp;{tmpl_var name='ostemplate_desc_txt'}
+                </div>
+            </div>
+        </fieldset>     
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_action.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm
new file mode 100644
index 0000000..8b8f34b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm
@@ -0,0 +1,46 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_ip">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>IP address</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vm_id">{tmpl_var name='vm_id_txt'}</label>
+                <select name="vm_id" id="vm_id" class="selectInput" disabled="disabled">
+                    {tmpl_var name='vm_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='reserved_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='reserved'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    var vm_id = jQuery('#vm_id').val();
+    jQuery('#vm_id').attr({name: 'vm_id_disabled', id: 'vm_id_disabled'});
+    jQuery('#vm_id_disabled').after('<input type="hidden" name="vm_id" value="'+vm_id+'">');
+    
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
new file mode 100644
index 0000000..886d4b9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_ip">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_vm_id"><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_reserved"><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_vm_id"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vm_id"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_reserved"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="reserved"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm
new file mode 100644
index 0000000..6f08d15
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm
@@ -0,0 +1,48 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_ostemplate">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Domain</legend>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="template_file">{tmpl_var name='template_file_txt'}</label>
+                <input name="template_file" id="template_file" value="{tmpl_var name='template_file'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='allservers_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='allservers'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_ostemplate_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_ostemplate_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
new file mode 100644
index 0000000..c152774
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_ostemplate">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_allservers"><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_ostemplate_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_allservers"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="allservers"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm
new file mode 100644
index 0000000..6741ce9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm
@@ -0,0 +1,110 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Advanced</legend>
+            <div class="ctrlHolder">
+                <label for="numproc">{tmpl_var name='numproc_txt'}</label>
+                <input name="numproc" id="numproc" value="{tmpl_var name='numproc'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numtcpsock">{tmpl_var name='numtcpsock_txt'}</label>
+                <input name="numtcpsock" id="numtcpsock" value="{tmpl_var name='numtcpsock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numothersock">{tmpl_var name='numothersock_txt'}</label>
+                <input name="numothersock" id="numothersock" value="{tmpl_var name='numothersock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vmguarpages">{tmpl_var name='vmguarpages_txt'}</label>
+                <input name="vmguarpages" id="vmguarpages" value="{tmpl_var name='vmguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="kmemsize">{tmpl_var name='kmemsize_txt'}</label>
+                <input name="kmemsize" id="kmemsize" value="{tmpl_var name='kmemsize'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcpsndbuf">{tmpl_var name='tcpsndbuf_txt'}</label>
+                <input name="tcpsndbuf" id="tcpsndbuf" value="{tmpl_var name='tcpsndbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcprcvbuf">{tmpl_var name='tcprcvbuf_txt'}</label>
+                <input name="tcprcvbuf" id="tcprcvbuf" value="{tmpl_var name='tcprcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="othersockbuf">{tmpl_var name='othersockbuf_txt'}</label>
+                <input name="othersockbuf" id="othersockbuf" value="{tmpl_var name='othersockbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dgramrcvbuf">{tmpl_var name='dgramrcvbuf_txt'}</label>
+                <input name="dgramrcvbuf" id="dgramrcvbuf" value="{tmpl_var name='dgramrcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="oomguarpages">{tmpl_var name='oomguarpages_txt'}</label>
+                <input name="oomguarpages" id="oomguarpages" value="{tmpl_var name='oomguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="privvmpages">{tmpl_var name='privvmpages_txt'}</label>
+                <input name="privvmpages" id="privvmpages" value="{tmpl_var name='privvmpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="lockedpages">{tmpl_var name='lockedpages_txt'}</label>
+                <input name="lockedpages" id="lockedpages" value="{tmpl_var name='lockedpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shmpages">{tmpl_var name='shmpages_txt'}</label>
+                <input name="shmpages" id="shmpages" value="{tmpl_var name='shmpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="physpages">{tmpl_var name='physpages_txt'}</label>
+                <input name="physpages" id="physpages" value="{tmpl_var name='physpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numfile">{tmpl_var name='numfile_txt'}</label>
+                <input name="numfile" id="numfile" value="{tmpl_var name='numfile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="avnumproc">{tmpl_var name='avnumproc_txt'}</label>
+                <input name="avnumproc" id="avnumproc" value="{tmpl_var name='avnumproc'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numflock">{tmpl_var name='numflock_txt'}</label>
+                <input name="numflock" id="numflock" value="{tmpl_var name='numflock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numpty">{tmpl_var name='numpty_txt'}</label>
+                <input name="numpty" id="numpty" value="{tmpl_var name='numpty'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numsiginfo">{tmpl_var name='numsiginfo_txt'}</label>
+                <input name="numsiginfo" id="numsiginfo" value="{tmpl_var name='numsiginfo'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dcachesize">{tmpl_var name='dcachesize_txt'}</label>
+                <input name="dcachesize" id="dcachesize" value="{tmpl_var name='dcachesize'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numiptent">{tmpl_var name='numiptent_txt'}</label>
+                <input name="numiptent" id="numiptent" value="{tmpl_var name='numiptent'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="swappages">{tmpl_var name='swappages_txt'}</label>
+                <input name="swappages" id="swappages" value="{tmpl_var name='swappages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="capability">{tmpl_var name='capability_txt'}</label>
+                <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm
new file mode 100644
index 0000000..ce356af
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm
@@ -0,0 +1,74 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Template</legend>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
+                <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;GB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram">{tmpl_var name='ram_txt'}</label>
+                <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
+                <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
+                <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(8 - 500000)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
+                <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(1 - 64)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
+                <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(10 - 6400)
+            </div>
+            <div class="ctrlHolder">
+                <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
+                <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(0 - 7)
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='create_dns_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='create_dns'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
+                <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='nameserver_desc_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
new file mode 100644
index 0000000..78f102b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_template">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm
new file mode 100644
index 0000000..a0bf42d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_vm">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Advanced</legend>
+            <div class="ctrlHolder">
+                <label for="veid">{tmpl_var name='veid_txt'}</label>
+                <input name="veid" id="veid" value="{tmpl_var name='veid'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='create_dns_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='create_dns'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
+                <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;GB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram">{tmpl_var name='ram_txt'}</label>
+                <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
+                <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
+                <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(8 - 500000)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
+                <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(1 - 64)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
+                <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(10 - 6400)
+            </div>
+            <div class="ctrlHolder">
+                <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
+                <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(0 - 7)
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
+                <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='nameserver_desc_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="capability">{tmpl_var name='capability_txt'}</label>
+                <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm
new file mode 100644
index 0000000..402bad3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm
@@ -0,0 +1,107 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_vm">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Settings</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                    <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="edit_disabled">
+                <div class="ctrlHolder">
+                    <label for="ostemplate_id_disabled">{tmpl_var name='ostemplate_id_txt'}</label>
+                    <select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="selectInput" disabled="disabled">
+                        {tmpl_var name='ostemplate_id'}
+                    </select>
+                </div>
+                <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
+            <tmpl_else>
+                <div class="ctrlHolder">
+                    <label for="ostemplate_id">{tmpl_var name='ostemplate_id_txt'}</label>
+                    <select name="ostemplate_id" id="ostemplate_id" class="selectInput">
+                        {tmpl_var name='ostemplate_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="template_id">{tmpl_var name='template_id_txt'}</label>
+                <select name="template_id" id="template_id" class="selectInput">
+                    {tmpl_var name='template_id_select'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <select name="ip_address" id="ip_address" class="selectInput">
+                    {tmpl_var name='ip_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vm_password">{tmpl_var name='vm_password_txt'}</label>
+                <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='start_boot_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='start_boot'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="active_until_date">{tmpl_var name='active_until_date_txt'}</label>
+                <input name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" size="30" maxlength="255" type="text" class="textInput formLengthDate" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery( "#active_until_date" ).datepicker({ dateFormat: '<tmpl_var name="date_format">', changeMonth: true, changeYear: true, yearRange: '-100:+100', dayNamesMin: ['<tmpl_var name="daynamesmin_su">','<tmpl_var name="daynamesmin_mo">','<tmpl_var name="daynamesmin_tu">','<tmpl_var name="daynamesmin_we">','<tmpl_var name="daynamesmin_th">','<tmpl_var name="daynamesmin_fr">','<tmpl_var name="daynamesmin_sa">'], dayNames: ['<tmpl_var name="daynames_sunday">','<tmpl_var name="daynames_monday">','<tmpl_var name="daynames_tuesday">','<tmpl_var name="daynames_wednesday">','<tmpl_var name="daynames_thursday">','<tmpl_var name="daynames_friday">','<tmpl_var name="daynames_saturday">'], monthNamesShort: ['<tmpl_var name="monthnamesshort_jan">','<tmpl_var name="monthnamesshort_feb">','<tmpl_var name="monthnamesshort_mar">','<tmpl_var name="monthnamesshort_apr">','<tmpl_var name="monthnamesshort_may">','<tmpl_var name="monthnamesshort_jun">','<tmpl_var name="monthnamesshort_jul">','<tmpl_var name="monthnamesshort_aug">','<tmpl_var name="monthnamesshort_sep">','<tmpl_var name="monthnamesshort_oct">','<tmpl_var name="monthnamesshort_nov">','<tmpl_var name="monthnamesshort_dec">'], nextText: '<tmpl_var name="datepicker_nextText">', prevText: '<tmpl_var name="datepicker_prevText">', firstDay: 1 });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
new file mode 100644
index 0000000..57ad7f7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_vm">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_veid" scope="col"><tmpl_var name="veid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
+                        <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
+                        <th class="tbl_col_hostname" scope="col"><tmpl_var name="hostname_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_veid"><input type="text" name="search_veid" style="width:40px;" value="{tmpl_var name='search_veid'}" /></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_ostemplate_id"><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
+                        <td class="tbl_col_template_id"><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
+                        <td class="tbl_col_hostname"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" style="width:80px;" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_veid"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="veid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_ostemplate_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
+                            <td class="tbl_col_template_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
+                            <td class="tbl_col_hostname"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hostname"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16" href="#" onClick="loadContent('vm/openvz_action.php?id={tmpl_var name='id'}')" style="background-image: url('themes/default/icons/x16/arrow.png');"><span>&nbsp;</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file

--
Gitblit v1.9.1