refactored default css rules to be in themes/default, added helperapplication to combine multiple css files, changed app init process again

svn changeset:4226/svn branch:trunk

194 files changed, 1899 insertions, 147 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/accordion.css b/WebContent/ITMILL/themes/default/accordion/accordion.css
index 05ef651b56..05ef651b56 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/accordion.css
+++ b/WebContent/ITMILL/themes/default/accordion/accordion.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/collapsed-icon.png b/WebContent/ITMILL/themes/default/accordion/img/collapsed-icon.png
index 1443459eb4..1443459eb4 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/collapsed-icon.png
+++ b/WebContent/ITMILL/themes/default/accordion/img/collapsed-icon.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/expanded-icon.png b/WebContent/ITMILL/themes/default/accordion/img/expanded-icon.png
index 8a28fb8811..8a28fb8811 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/expanded-icon.png
+++ b/WebContent/ITMILL/themes/default/accordion/img/expanded-icon.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/selected-bg.png b/WebContent/ITMILL/themes/default/accordion/img/selected-bg.png
index 99dca1c2d9..99dca1c2d9 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/accordion/img/selected-bg.png
+++ b/WebContent/ITMILL/themes/default/accordion/img/selected-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css
index 2f8ffe0d28..2f8ffe0d28 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/button/button.css
+++ b/WebContent/ITMILL/themes/default/button/button.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/caption/caption.css b/WebContent/ITMILL/themes/default/caption/caption.css
index 22dad5bd31..22dad5bd31 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/caption/caption.css
+++ b/WebContent/ITMILL/themes/default/caption/caption.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css b/WebContent/ITMILL/themes/default/common/common.css
index f5e3c1e274..f5e3c1e274 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
+++ b/WebContent/ITMILL/themes/default/common/common.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader-big.gif b/WebContent/ITMILL/themes/default/common/img/ajax-loader-big.gif
index 73dc88e31f..73dc88e31f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader-big.gif
+++ b/WebContent/ITMILL/themes/default/common/img/ajax-loader-big.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader-medium.gif b/WebContent/ITMILL/themes/default/common/img/ajax-loader-medium.gif
index 0a0c6aaef0..0a0c6aaef0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader-medium.gif
+++ b/WebContent/ITMILL/themes/default/common/img/ajax-loader-medium.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader.gif b/WebContent/ITMILL/themes/default/common/img/ajax-loader.gif
index 354dc4685c..354dc4685c 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/ajax-loader.gif
+++ b/WebContent/ITMILL/themes/default/common/img/ajax-loader.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.gif b/WebContent/ITMILL/themes/default/common/img/blank.gif
index 3776af0784..3776af0784 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.gif
+++ b/WebContent/ITMILL/themes/default/common/img/blank.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator-delay.gif b/WebContent/ITMILL/themes/default/common/img/loading-indicator-delay.gif
index 48810bb064..48810bb064 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator-delay.gif
+++ b/WebContent/ITMILL/themes/default/common/img/loading-indicator-delay.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator-wait.gif b/WebContent/ITMILL/themes/default/common/img/loading-indicator-wait.gif
index 5f7aab9afd..5f7aab9afd 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator-wait.gif
+++ b/WebContent/ITMILL/themes/default/common/img/loading-indicator-wait.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator.gif b/WebContent/ITMILL/themes/default/common/img/loading-indicator.gif
index cedaa56b10..cedaa56b10 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/loading-indicator.gif
+++ b/WebContent/ITMILL/themes/default/common/img/loading-indicator.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/datefield.css b/WebContent/ITMILL/themes/default/datefield/datefield.css
index c5a7b87ccc..c5a7b87ccc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/datefield.css
+++ b/WebContent/ITMILL/themes/default/datefield/datefield.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/nextmonth.png b/WebContent/ITMILL/themes/default/datefield/img/nextmonth.png
index 3315125dd1..3315125dd1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/nextmonth.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/nextmonth.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/nextyear.png b/WebContent/ITMILL/themes/default/datefield/img/nextyear.png
index 22633fd31a..22633fd31a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/nextyear.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/nextyear.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/open-button.png b/WebContent/ITMILL/themes/default/datefield/img/open-button.png
index 548ca12f70..548ca12f70 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/open-button.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/open-button.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/prevmonth.png b/WebContent/ITMILL/themes/default/datefield/img/prevmonth.png
index d114632fef..d114632fef 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/prevmonth.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/prevmonth.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/prevyear.png b/WebContent/ITMILL/themes/default/datefield/img/prevyear.png
index f174713092..f174713092 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/prevyear.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/prevyear.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/selected-bg.png b/WebContent/ITMILL/themes/default/datefield/img/selected-bg.png
index 799915ab8f..799915ab8f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/img/selected-bg.png
+++ b/WebContent/ITMILL/themes/default/datefield/img/selected-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/expandlayout/expandlayout.css b/WebContent/ITMILL/themes/default/expandlayout/expandlayout.css
index f4ed9c6e7a..f4ed9c6e7a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/expandlayout/expandlayout.css
+++ b/WebContent/ITMILL/themes/default/expandlayout/expandlayout.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-down.png b/WebContent/ITMILL/themes/default/icons/16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-down.png
+++ b/WebContent/ITMILL/themes/default/icons/16/arrow-down.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-left.png b/WebContent/ITMILL/themes/default/icons/16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-left.png
+++ b/WebContent/ITMILL/themes/default/icons/16/arrow-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-right.png b/WebContent/ITMILL/themes/default/icons/16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-right.png
+++ b/WebContent/ITMILL/themes/default/icons/16/arrow-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-up.png b/WebContent/ITMILL/themes/default/icons/16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-up.png
+++ b/WebContent/ITMILL/themes/default/icons/16/arrow-up.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/attention.png b/WebContent/ITMILL/themes/default/icons/16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/attention.png
+++ b/WebContent/ITMILL/themes/default/icons/16/attention.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/calendar.png b/WebContent/ITMILL/themes/default/icons/16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/calendar.png
+++ b/WebContent/ITMILL/themes/default/icons/16/calendar.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/cancel.png b/WebContent/ITMILL/themes/default/icons/16/cancel.png
index 19a0783733..19a0783733 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/cancel.png
+++ b/WebContent/ITMILL/themes/default/icons/16/cancel.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-add.png b/WebContent/ITMILL/themes/default/icons/16/document-add.png
index d84e349526..d84e349526 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-add.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-delete.png b/WebContent/ITMILL/themes/default/icons/16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-doc.png b/WebContent/ITMILL/themes/default/icons/16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-doc.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-doc.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-image.png b/WebContent/ITMILL/themes/default/icons/16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-image.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-image.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-pdf.png b/WebContent/ITMILL/themes/default/icons/16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-pdf.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-pdf.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-ppt.png b/WebContent/ITMILL/themes/default/icons/16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-ppt.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-ppt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-txt.png b/WebContent/ITMILL/themes/default/icons/16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-txt.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-txt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-web.png b/WebContent/ITMILL/themes/default/icons/16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-web.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-web.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-xsl.png b/WebContent/ITMILL/themes/default/icons/16/document-xsl.png
index 571823847f..571823847f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-xsl.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document-xsl.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document.png b/WebContent/ITMILL/themes/default/icons/16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document.png
+++ b/WebContent/ITMILL/themes/default/icons/16/document.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-reply.png b/WebContent/ITMILL/themes/default/icons/16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-reply.png
+++ b/WebContent/ITMILL/themes/default/icons/16/email-reply.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-send.png b/WebContent/ITMILL/themes/default/icons/16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-send.png
+++ b/WebContent/ITMILL/themes/default/icons/16/email-send.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email.png b/WebContent/ITMILL/themes/default/icons/16/email.png
index 68d6c93465..68d6c93465 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email.png
+++ b/WebContent/ITMILL/themes/default/icons/16/email.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/error.png b/WebContent/ITMILL/themes/default/icons/16/error.png
index d1079cf2e0..d1079cf2e0 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/error.png
+++ b/WebContent/ITMILL/themes/default/icons/16/error.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-add.png b/WebContent/ITMILL/themes/default/icons/16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-add.png
+++ b/WebContent/ITMILL/themes/default/icons/16/folder-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-delete.png b/WebContent/ITMILL/themes/default/icons/16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/16/folder-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder.png b/WebContent/ITMILL/themes/default/icons/16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder.png
+++ b/WebContent/ITMILL/themes/default/icons/16/folder.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/globe.png b/WebContent/ITMILL/themes/default/icons/16/globe.png
index ea4034c149..ea4034c149 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/globe.png
+++ b/WebContent/ITMILL/themes/default/icons/16/globe.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/help.png b/WebContent/ITMILL/themes/default/icons/16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/help.png
+++ b/WebContent/ITMILL/themes/default/icons/16/help.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/lock.png b/WebContent/ITMILL/themes/default/icons/16/lock.png
index 29f1023613..29f1023613 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/lock.png
+++ b/WebContent/ITMILL/themes/default/icons/16/lock.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/note.png b/WebContent/ITMILL/themes/default/icons/16/note.png
index efafae5570..efafae5570 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/note.png
+++ b/WebContent/ITMILL/themes/default/icons/16/note.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/ok.png b/WebContent/ITMILL/themes/default/icons/16/ok.png
index 89591faef2..89591faef2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/ok.png
+++ b/WebContent/ITMILL/themes/default/icons/16/ok.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/reload.png b/WebContent/ITMILL/themes/default/icons/16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/reload.png
+++ b/WebContent/ITMILL/themes/default/icons/16/reload.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/settings.png b/WebContent/ITMILL/themes/default/icons/16/settings.png
index 019f0df663..019f0df663 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/settings.png
+++ b/WebContent/ITMILL/themes/default/icons/16/settings.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash-full.png b/WebContent/ITMILL/themes/default/icons/16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash-full.png
+++ b/WebContent/ITMILL/themes/default/icons/16/trash-full.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash.png b/WebContent/ITMILL/themes/default/icons/16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash.png
+++ b/WebContent/ITMILL/themes/default/icons/16/trash.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/user.png b/WebContent/ITMILL/themes/default/icons/16/user.png
index 522f864884..522f864884 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/user.png
+++ b/WebContent/ITMILL/themes/default/icons/16/user.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/users.png b/WebContent/ITMILL/themes/default/icons/16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/users.png
+++ b/WebContent/ITMILL/themes/default/icons/16/users.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-down.png b/WebContent/ITMILL/themes/default/icons/32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-down.png
+++ b/WebContent/ITMILL/themes/default/icons/32/arrow-down.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-left.png b/WebContent/ITMILL/themes/default/icons/32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-left.png
+++ b/WebContent/ITMILL/themes/default/icons/32/arrow-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-right.png b/WebContent/ITMILL/themes/default/icons/32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-right.png
+++ b/WebContent/ITMILL/themes/default/icons/32/arrow-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-up.png b/WebContent/ITMILL/themes/default/icons/32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-up.png
+++ b/WebContent/ITMILL/themes/default/icons/32/arrow-up.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/attention.png b/WebContent/ITMILL/themes/default/icons/32/attention.png
index 6b00733567..6b00733567 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/attention.png
+++ b/WebContent/ITMILL/themes/default/icons/32/attention.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/calendar.png b/WebContent/ITMILL/themes/default/icons/32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/calendar.png
+++ b/WebContent/ITMILL/themes/default/icons/32/calendar.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/cancel.png b/WebContent/ITMILL/themes/default/icons/32/cancel.png
index 725240d558..725240d558 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/cancel.png
+++ b/WebContent/ITMILL/themes/default/icons/32/cancel.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-add.png b/WebContent/ITMILL/themes/default/icons/32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-add.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-delete.png b/WebContent/ITMILL/themes/default/icons/32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-doc.png b/WebContent/ITMILL/themes/default/icons/32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-doc.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-doc.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-image.png b/WebContent/ITMILL/themes/default/icons/32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-image.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-image.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-pdf.png b/WebContent/ITMILL/themes/default/icons/32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-pdf.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-pdf.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-ppt.png b/WebContent/ITMILL/themes/default/icons/32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-ppt.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-ppt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-txt.png b/WebContent/ITMILL/themes/default/icons/32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-txt.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-txt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-web.png b/WebContent/ITMILL/themes/default/icons/32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-web.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-web.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-xsl.png b/WebContent/ITMILL/themes/default/icons/32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-xsl.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document-xsl.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document.png b/WebContent/ITMILL/themes/default/icons/32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document.png
+++ b/WebContent/ITMILL/themes/default/icons/32/document.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-reply.png b/WebContent/ITMILL/themes/default/icons/32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-reply.png
+++ b/WebContent/ITMILL/themes/default/icons/32/email-reply.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-send.png b/WebContent/ITMILL/themes/default/icons/32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-send.png
+++ b/WebContent/ITMILL/themes/default/icons/32/email-send.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email.png b/WebContent/ITMILL/themes/default/icons/32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email.png
+++ b/WebContent/ITMILL/themes/default/icons/32/email.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-add.png b/WebContent/ITMILL/themes/default/icons/32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-add.png
+++ b/WebContent/ITMILL/themes/default/icons/32/folder-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-delete.png b/WebContent/ITMILL/themes/default/icons/32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/32/folder-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder.png b/WebContent/ITMILL/themes/default/icons/32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder.png
+++ b/WebContent/ITMILL/themes/default/icons/32/folder.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/globe.png b/WebContent/ITMILL/themes/default/icons/32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/globe.png
+++ b/WebContent/ITMILL/themes/default/icons/32/globe.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/help.png b/WebContent/ITMILL/themes/default/icons/32/help.png
index 218910c98d..218910c98d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/help.png
+++ b/WebContent/ITMILL/themes/default/icons/32/help.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/lock.png b/WebContent/ITMILL/themes/default/icons/32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/lock.png
+++ b/WebContent/ITMILL/themes/default/icons/32/lock.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/note.png b/WebContent/ITMILL/themes/default/icons/32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/note.png
+++ b/WebContent/ITMILL/themes/default/icons/32/note.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/ok.png b/WebContent/ITMILL/themes/default/icons/32/ok.png
index ac0438828c..ac0438828c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/ok.png
+++ b/WebContent/ITMILL/themes/default/icons/32/ok.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/reload.png b/WebContent/ITMILL/themes/default/icons/32/reload.png
index c3556ec890..c3556ec890 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/reload.png
+++ b/WebContent/ITMILL/themes/default/icons/32/reload.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/settings.png b/WebContent/ITMILL/themes/default/icons/32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/settings.png
+++ b/WebContent/ITMILL/themes/default/icons/32/settings.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash-full.png b/WebContent/ITMILL/themes/default/icons/32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash-full.png
+++ b/WebContent/ITMILL/themes/default/icons/32/trash-full.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash.png b/WebContent/ITMILL/themes/default/icons/32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash.png
+++ b/WebContent/ITMILL/themes/default/icons/32/trash.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/user.png b/WebContent/ITMILL/themes/default/icons/32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/user.png
+++ b/WebContent/ITMILL/themes/default/icons/32/user.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/users.png b/WebContent/ITMILL/themes/default/icons/32/users.png
index af225a9e46..af225a9e46 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/users.png
+++ b/WebContent/ITMILL/themes/default/icons/32/users.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-down.png b/WebContent/ITMILL/themes/default/icons/64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-down.png
+++ b/WebContent/ITMILL/themes/default/icons/64/arrow-down.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-left.png b/WebContent/ITMILL/themes/default/icons/64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-left.png
+++ b/WebContent/ITMILL/themes/default/icons/64/arrow-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-right.png b/WebContent/ITMILL/themes/default/icons/64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-right.png
+++ b/WebContent/ITMILL/themes/default/icons/64/arrow-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-up.png b/WebContent/ITMILL/themes/default/icons/64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-up.png
+++ b/WebContent/ITMILL/themes/default/icons/64/arrow-up.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/attention.png b/WebContent/ITMILL/themes/default/icons/64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/attention.png
+++ b/WebContent/ITMILL/themes/default/icons/64/attention.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/calendar.png b/WebContent/ITMILL/themes/default/icons/64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/calendar.png
+++ b/WebContent/ITMILL/themes/default/icons/64/calendar.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/cancel.png b/WebContent/ITMILL/themes/default/icons/64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/cancel.png
+++ b/WebContent/ITMILL/themes/default/icons/64/cancel.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-add.png b/WebContent/ITMILL/themes/default/icons/64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-add.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-delete.png b/WebContent/ITMILL/themes/default/icons/64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-doc.png b/WebContent/ITMILL/themes/default/icons/64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-doc.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-doc.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-image.png b/WebContent/ITMILL/themes/default/icons/64/document-image.png
index 079978e850..079978e850 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-image.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-image.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-pdf.png b/WebContent/ITMILL/themes/default/icons/64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-pdf.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-pdf.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-ppt.png b/WebContent/ITMILL/themes/default/icons/64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-ppt.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-ppt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-txt.png b/WebContent/ITMILL/themes/default/icons/64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-txt.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-txt.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-web.png b/WebContent/ITMILL/themes/default/icons/64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-web.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-web.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-xls.png b/WebContent/ITMILL/themes/default/icons/64/document-xls.png
index 6008085a34..6008085a34 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-xls.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document-xls.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document.png b/WebContent/ITMILL/themes/default/icons/64/document.png
index 224de0bc84..224de0bc84 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document.png
+++ b/WebContent/ITMILL/themes/default/icons/64/document.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-reply.png b/WebContent/ITMILL/themes/default/icons/64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-reply.png
+++ b/WebContent/ITMILL/themes/default/icons/64/email-reply.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-send.png b/WebContent/ITMILL/themes/default/icons/64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-send.png
+++ b/WebContent/ITMILL/themes/default/icons/64/email-send.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email.png b/WebContent/ITMILL/themes/default/icons/64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email.png
+++ b/WebContent/ITMILL/themes/default/icons/64/email.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-add.png b/WebContent/ITMILL/themes/default/icons/64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-add.png
+++ b/WebContent/ITMILL/themes/default/icons/64/folder-add.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-delete.png b/WebContent/ITMILL/themes/default/icons/64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-delete.png
+++ b/WebContent/ITMILL/themes/default/icons/64/folder-delete.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder.png b/WebContent/ITMILL/themes/default/icons/64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder.png
+++ b/WebContent/ITMILL/themes/default/icons/64/folder.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/globe.png b/WebContent/ITMILL/themes/default/icons/64/globe.png
index 1786635b45..1786635b45 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/globe.png
+++ b/WebContent/ITMILL/themes/default/icons/64/globe.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/help.png b/WebContent/ITMILL/themes/default/icons/64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/help.png
+++ b/WebContent/ITMILL/themes/default/icons/64/help.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/lock.png b/WebContent/ITMILL/themes/default/icons/64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/lock.png
+++ b/WebContent/ITMILL/themes/default/icons/64/lock.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/note.png b/WebContent/ITMILL/themes/default/icons/64/note.png
index 1383847ed1..1383847ed1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/note.png
+++ b/WebContent/ITMILL/themes/default/icons/64/note.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/ok.png b/WebContent/ITMILL/themes/default/icons/64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/ok.png
+++ b/WebContent/ITMILL/themes/default/icons/64/ok.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/reload.png b/WebContent/ITMILL/themes/default/icons/64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/reload.png
+++ b/WebContent/ITMILL/themes/default/icons/64/reload.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/settings.png b/WebContent/ITMILL/themes/default/icons/64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/settings.png
+++ b/WebContent/ITMILL/themes/default/icons/64/settings.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash-full.png b/WebContent/ITMILL/themes/default/icons/64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash-full.png
+++ b/WebContent/ITMILL/themes/default/icons/64/trash-full.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash.png b/WebContent/ITMILL/themes/default/icons/64/trash.png
index 41ef761061..41ef761061 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash.png
+++ b/WebContent/ITMILL/themes/default/icons/64/trash.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/user.png b/WebContent/ITMILL/themes/default/icons/64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/user.png
+++ b/WebContent/ITMILL/themes/default/icons/64/user.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/users.png b/WebContent/ITMILL/themes/default/icons/64/users.png
index 3a42c17790..3a42c17790 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/users.png
+++ b/WebContent/ITMILL/themes/default/icons/64/users.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/notification.css b/WebContent/ITMILL/themes/default/notification/notification.css
index 8dab65eb81..7fc09dcdba 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/notification.css
+++ b/WebContent/ITMILL/themes/default/notification/notification.css
@@ -1,41 +1,41 @@
-

-.i-Notification {

-	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;

-	background-color: #999999;

-	color: #ffffff;

-	padding: 0.3em;

-	cursor: pointer;

-	-moz-border-radius: 3px;

-	-webkit-border-radius: 3px;

-	border-radius: 3px;

-}

-.i-Notification H1,

-.i-Notification p,

-.i-Notification.error H1,

-.i-Notification.error p,

-.i-Notification.warning H1,

-.i-Notification.warning p {

-	display: inline;

-	padding: 0.1em;

-}

-.i-Notification.tray H1,

-.i-Notification.tray p {

-	display: block;

-	font-size: 1em;

-	line-height: 0.5em;

-}

-

-.i-Notification.warning {

-	background: #f14c1a;

-}

-

-.i-Notification.error {

-	background-color: #ff0a0a;

-	background-image: url('img/notification-error.png');

-	background-repeat: no-repeat;

-	background-position: center right;

-	padding-right: 30px;

-}

-.i-Notification.tray {

-

-}

+
+.i-Notification {
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	background-color: #999999;
+	color: #ffffff;
+	padding: 0.3em;
+	cursor: pointer;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+.i-Notification H1,
+.i-Notification p,
+.i-Notification.error H1,
+.i-Notification.error p,
+.i-Notification.warning H1,
+.i-Notification.warning p {
+	display: inline;
+	padding: 0.1em;
+}
+.i-Notification.tray H1,
+.i-Notification.tray p {
+	display: block;
+	font-size: 1em;
+	line-height: 0.5em;
+}
+
+.i-Notification.warning {
+	background: #f14c1a;
+}
+
+.i-Notification.error {
+	background-color: #ff0a0a;
+	background-image: url('img/notification-error.png');
+	background-repeat: no-repeat;
+	background-position: center right;
+	padding-right: 30px;
+}
+.i-Notification.tray {
+
+}
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/orderedlayout/orderedlayout.css b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
index 1a429b2af0..1a429b2af0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/orderedlayout/orderedlayout.css
+++ b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png b/WebContent/ITMILL/themes/default/panel/img/bottom-left.png
index d5c950bc45..d5c950bc45 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png
+++ b/WebContent/ITMILL/themes/default/panel/img/bottom-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png b/WebContent/ITMILL/themes/default/panel/img/bottom-right.png
index 3ad916f694..3ad916f694 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png
+++ b/WebContent/ITMILL/themes/default/panel/img/bottom-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png b/WebContent/ITMILL/themes/default/panel/img/top-left.png
index 8108eab8e4..8108eab8e4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png
+++ b/WebContent/ITMILL/themes/default/panel/img/top-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png b/WebContent/ITMILL/themes/default/panel/img/top-right.png
index 9fc0f86635..9fc0f86635 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png
+++ b/WebContent/ITMILL/themes/default/panel/img/top-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css b/WebContent/ITMILL/themes/default/panel/panel.css
index e6c3ee46b7..e6c3ee46b7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css
+++ b/WebContent/ITMILL/themes/default/panel/panel.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/img/base.gif b/WebContent/ITMILL/themes/default/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/img/base.gif
+++ b/WebContent/ITMILL/themes/default/progressindicator/img/base.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/img/progress.png b/WebContent/ITMILL/themes/default/progressindicator/img/progress.png
index c1aca57369..c1aca57369 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/img/progress.png
+++ b/WebContent/ITMILL/themes/default/progressindicator/img/progress.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/progressindicator.css b/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
index 57bc14aba8..57bc14aba8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/progressindicator/progressindicator.css
+++ b/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-down.png b/WebContent/ITMILL/themes/default/select/img/arrow-down.png
index ee795fd069..ee795fd069 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-down.png
+++ b/WebContent/ITMILL/themes/default/select/img/arrow-down.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-up.png b/WebContent/ITMILL/themes/default/select/img/arrow-up.png
index 055ad61ef1..055ad61ef1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/arrow-up.png
+++ b/WebContent/ITMILL/themes/default/select/img/arrow-up.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png b/WebContent/ITMILL/themes/default/select/img/bg-left-filter.png
index 58dae1d470..58dae1d470 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-left-filter.png
+++ b/WebContent/ITMILL/themes/default/select/img/bg-left-filter.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png b/WebContent/ITMILL/themes/default/select/img/bg-right-filter.png
index 04cb8e4089..04cb8e4089 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/bg-right-filter.png
+++ b/WebContent/ITMILL/themes/default/select/img/bg-right-filter.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/button-bg.png b/WebContent/ITMILL/themes/default/select/img/button-bg.png
index 9653ed949b..9653ed949b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/img/button-bg.png
+++ b/WebContent/ITMILL/themes/default/select/img/button-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css b/WebContent/ITMILL/themes/default/select/select.css
index a60a63a1bf..54064221bb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css
+++ b/WebContent/ITMILL/themes/default/select/select.css
@@ -1,3 +1,71 @@
+.i-select {
+	text-align: left /* Force default alignment */

+}

+.i-select-option {

+

+}

+

+.i-select-optiongroup {

+

+}

+

+.i-select-optiongroup .i-select-option {

+	display: block;

+	white-space: nowrap;

+}

+

+.i-select-select {

+	/*

+	border: 1px solid #b6b6b6;

+	border-bottom-color: #9d9d9d;

+	border-top-color: #d6d6d6;

+	border-left-color: #d6d6d6;

+	*/

+	display: block;

+	font-size: 13px;

+}

+

+/* Twincol style */

+.i-select-twincol {

+	white-space: nowrap;

+}

+.i-select-twincol-options {

+	float: left;

+	font-size: 13px;

+}

+.i-select-twincol-selections {

+	font-size: 13px;

+	font-weight: bold;

+}

+

+.i-select-twincol-buttons {

+	float: left;

+	padding: 2px; /* does not work in first render in FF ? */

+	text-align: center;

+}

+

+.i-select-twincol-buttons .i-select-twincol-deco {

+	clear:both;

+}

+

+.i-select-twincol .i-textfield {

+	display: block;

+	float: left;

+	clear: left;

+}

+

+.i-select-twincol .i-button {

+	display: block;

+	float: left;

+}

+

+.i-select-twincol-buttons .i-button {

+	display: inline;

+	float: none;

+}
+
+/** Filterselect aka ComboBox styles */
+
 .i-filterselect {
 	height: 23px;
 	background: transparent url(img/bg-left-filter.png) no-repeat;
@@ -38,8 +106,8 @@
 	line-height: 18px;
 	margin-top: -1px;
 }
-.i-filterselect-suggestmenu {

-	margin-left: -2px;

+.i-filterselect-suggestmenu {
+	margin-left: -2px;
 }
 .i-filterselect-suggestmenu .gwt-MenuItem {
 	padding: 1px 5px;
@@ -64,7 +132,7 @@
 	margin: 2px 0 0 0;
 	overflow:hidden;
 }
-.i-filterselect-prevpage,

+.i-filterselect-prevpage,
 .i-filterselect-prevpage-off {
 	background-position: 50% -1px;
 	margin: 0 0 2px 0;
@@ -76,8 +144,8 @@
 	background-position: 50% -12px;
 }
 .i-filterselect-nextpage span,
-.i-filterselect-nextpage-off span,

-.i-filterselect-prevpage-off span,

+.i-filterselect-nextpage-off span,
+.i-filterselect-prevpage-off span,
 .i-filterselect-prevpage span {
 	display: block;
 	height: 12px;
@@ -87,20 +155,20 @@
 	cursor: pointer;
 	overflow: hidden;
 }
-.i-filterselect-nextpage span,

+.i-filterselect-nextpage span,
 .i-filterselect-nextpage-off span {
 	background: transparent url(img/arrow-down.png) no-repeat 50% 60%;
 }
 
 .i-filterselect-nextpage-off,
 .i-filterselect-prevpage-off {
-	color: #666;

-	opacity: 0.5;

+	color: #666;
+	opacity: 0.5;
 	filter: Alpha(opacity=50);
-}

-.i-filterselect-nextpage-off span,

-.i-filterselect-prevpage-off span {

-	cursor: default;

+}
+.i-filterselect-nextpage-off span,
+.i-filterselect-prevpage-off span {
+	cursor: default;
 }
 
 .i-filterselect-status {
@@ -135,3 +203,4 @@
 	margin-top: -24px;
 }
 
+
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png b/WebContent/ITMILL/themes/default/slider/img/handle-horizontal.png
index 620b86f1da..620b86f1da 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png
+++ b/WebContent/ITMILL/themes/default/slider/img/handle-horizontal.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png b/WebContent/ITMILL/themes/default/slider/img/handle-vertical.png
index b7f63b91b7..b7f63b91b7 100755
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png
+++ b/WebContent/ITMILL/themes/default/slider/img/handle-vertical.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css b/WebContent/ITMILL/themes/default/slider/slider.css
index 5b10e6a110..5b10e6a110 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css
+++ b/WebContent/ITMILL/themes/default/slider/slider.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_hor.png b/WebContent/ITMILL/themes/default/splitpanel/img/bg_hor.png
index 268cfaf18a..268cfaf18a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_hor.png
+++ b/WebContent/ITMILL/themes/default/splitpanel/img/bg_hor.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_ver.png b/WebContent/ITMILL/themes/default/splitpanel/img/bg_ver.png
index 9dfe06dafb..9dfe06dafb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_ver.png
+++ b/WebContent/ITMILL/themes/default/splitpanel/img/bg_ver.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css b/WebContent/ITMILL/themes/default/splitpanel/splitpanel.css
index bb7c087269..bb7c087269 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css
+++ b/WebContent/ITMILL/themes/default/splitpanel/splitpanel.css
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
new file mode 100644
index 0000000000..82a14cbbf9
--- /dev/null
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -0,0 +1,1649 @@
+/* Automatically compiled css file from subdirectories. */
+.i-accordion {
+	outline: none;
+	overflow: hidden;
+	text-align: left /* Force default alignment */
+}
+
+.i-accordion-item-caption {
+	height: 24px;
+	padding: 7px 0 0 18px;
+	overflow: hidden;
+	white-space: nowrap;
+	background: #edf0f0 url(tabsheet/img/tab-bg.png);
+	font-size: 15px;
+	color: #656d73;
+	border-top: 1px solid #c8cccd;
+	cursor: pointer;
+}
+
+.i-accordion-item-open .i-accordion-item-caption {
+	color: #3b4b57;
+	background: #d5dee2 url(accordion/img/selected-bg.png);
+	border-top-color: #cbd7de;
+	border-bottom-color: #bfc9d4;
+	cursor: default;
+	text-shadow: #fafafa 1px 1px 0;
+}
+
+.i-accordion-item-content {
+	border-top: 1px solid #c8cccd;
+}
+.i-button {
+	cursor: pointer;
+	font-size: 13px;
+}
+
+.i-button img {
+	display:inline;
+}
+
+.i-button-link {
+	border: none;
+	text-align: left;
+	text-decoration: underline;
+	background: none;
+	padding: 0;
+}
+.i-button-link span {
+	text-decoration: underline;
+}
+/* Provide some extra whitespace for wrapped elements
+   (these elements usually need the extra space, since 
+   they aren't even handling their own caption) */
+.i-captionwrapper {
+	margin: 0.3em 0 0 0;
+	text-align: left /* Force default alignment */
+}
+
+.i-errorindicator {
+	width: 16px;
+	height: 16px;
+	padding-right:2px;
+	display: block;
+	float:left;
+	background: transparent url(icons/16/error.png) no-repeat;
+	vertical-align: middle;
+}
+
+.i-caption .i-icon {
+	padding-right:2px;
+	vertical-align: middle;
+}
+
+.i-error {
+	padding-left: 15px;
+	background: #fff;
+	border: 1px solid red;
+}
+/* body tag created by servlet */
+.i-generated-body {
+	background: #e9eced;
+	width:100%;
+	height:100%;
+	border:0;
+	margin:0;
+	overflow:auto;
+}
+.i-app {
+	background: #e9eced;
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+	font-size: 13px;
+	line-height: 18px;
+	height: 100%;
+}
+
+.i-view {
+	height: 100%;
+	width: 100%;
+	overflow: auto; 
+	/* avoid scrollbars with margins in root layout */
+	margin-top:-1px;
+	border-top:1px solid transparent;
+}
+
+.i-app input, 
+.i-window input, 
+.i-app select, 
+.i-window select, 
+.i-app textarea, 
+.i-window textarea, 
+.i-app button,
+.i-window button {
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+}
+
+.i-app select,
+.i-window select {
+	padding: 0;
+	margin: 0;
+}
+
+.i-disabled {
+	opacity: 0.3;
+	filter: Alpha(opacity=30);
+}
+
+
+
+/**
+ * Context menu styles 
+ */
+
+.i-contextmenu {
+	background: #e9eced url(tabsheet/img/tab-bg.png);
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	background-color: #f6f7f7;
+	color: #464f52;
+	font-size: 12px;
+	line-height: 14px;
+}
+
+.i-contextmenu .gwt-MenuBar {
+	border-right: 2px solid #c6cbcc;
+	border-bottom: 2px solid #c6cbcc;
+	border-top: 1px solid #d0d4d5;
+	border-left: 1px solid #d0d4d5;
+}
+
+.i-contextmenu .gwt-MenuItem {
+	padding: 2px 0;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+.i-contextmenu .gwt-MenuItem div {
+	/*border: 1px solid #f6f7f7;*/
+	padding: 1px 20px 1px 8px;
+	cursor: pointer;
+	vertical-align: middle;
+	white-space: nowrap;
+}
+
+.i-contextmenu .gwt-MenuItem-selected div {
+	color: #fff;
+	background: #5daee8;
+}
+
+.i-contextmenu table {
+	border-collapse:collapse;
+	margin:0;
+	padding:0;
+}
+.i-contextmenu .gwt-MenuItem img {
+	margin-right: 10px;
+	vertical-align: middle;
+}
+
+
+/**
+ * Link component styles 
+ * (useless to move into a separate file)
+ */
+
+.i-link span {
+	text-decoration: underline;
+	cursor:pointer;
+}
+
+.i-label {
+	overflow: hidden;
+}
+
+/* Loading indicator states */
+
+.i-loading-indicator,
+.i-loading-indicator-delay,
+.i-loading-indicator-wait {
+	width: 31px;
+	height: 31px;
+	background: transparent url(common/img/loading-indicator.gif);
+}
+.i-loading-indicator-delay {
+	background: transparent url(common/img/loading-indicator-delay.gif);
+}
+.i-loading-indicator-wait {
+	background: transparent url(common/img/loading-indicator-wait.gif);
+}
+.i-datefield .i-button {
+	width: 22px;
+	height: 25px;
+	padding: 0;
+	overflow: hidden;
+	border: none;
+	background: transparent url(datefield/img/open-button.png) no-repeat right 1px;
+	text-indent: -90000px;
+}
+
+.i-datefield-popup {
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+	font-size: 12px;
+	background: #f6f7f7;
+	border: 1px solid #b6bbbc;
+	padding: 6px;
+}
+
+.i-datefield-calendarpanel {
+	width: 19em;
+	font-size: 12px;
+}
+
+.i-datefield-popup .i-datefield-calendarpanel {
+	width: 16em;
+}
+
+.i-datefield-calendarpanel table {
+	width: 100%;
+}
+
+.i-datefield-calendarpanel td {
+	text-align: right;
+	width: 14.2%;
+	padding: 0;
+	margin: 0;
+}
+
+.i-datefield-calendarpanel td span {
+	display: block;
+}
+
+.i-datefield-calendarpanel-header {
+	height: 30px;
+}
+
+.i-datefield-calendarpanel-header,
+.i-datefield-calendarpanel strong {
+	font-size: 13px;
+}
+
+.i-datefield-popup .i-datefield-calendarpanel-header,
+.i-datefield-popup .i-datefield-calendarpanel strong {
+	font-size: 12px;
+}
+
+.i-datefield-calendarpanel-header td {
+	text-align: center;
+}
+
+.i-datefield-calendarpanel-month {
+	font-weight: bold;
+	text-align: center;
+	text-shadow: #ffffff 2px 2px 0;
+	white-space: nowrap;
+}
+
+/* Year buttons */
+.i-datefield-calendarpanel .i-button-prevyear,
+.i-datefield-calendarpanel .i-button-nextyear {
+	display: block;
+	width: 16px;
+	height: 16px;
+	border: none;
+	padding: 0;
+	background: transparent url(datefield/img/prevyear.png) no-repeat;
+	text-indent: -90000px;
+	margin: 0 auto;
+}
+.i-datefield-calendarpanel .i-button-nextyear {
+	background: transparent url(datefield/img/nextyear.png) no-repeat;
+}
+.i-datefield-calendarpanel .i-button-prevyear:hover,
+.i-datefield-calendarpanel .i-button-nextyear:hover {
+	background-position: left bottom;
+}
+
+/* Month buttons */
+.i-datefield-calendarpanel .i-button-prevmonth,
+.i-datefield-calendarpanel .i-button-nextmonth {
+	display: block;
+	width: 11px;
+	height: 16px;
+	border: none;
+	padding: 0;
+	background: transparent url(datefield/img/prevmonth.png) no-repeat;
+	text-indent: -90000px;
+	margin: 0 auto;
+}
+.i-datefield-calendarpanel .i-button-nextmonth {
+	background: transparent url(datefield/img/nextmonth.png) no-repeat;
+}
+.i-datefield-calendarpanel .i-button-prevmonth:hover,
+.i-datefield-calendarpanel .i-button-nextmonth:hover {
+	background-position: left bottom;
+}
+
+.i-datefield-calendarpanel strong {
+	color: #ee5311;
+	display: block;
+	width: 20px;
+}
+
+.i-datefield-calendarpanel-day,
+.i-datefield-calendarpanel-day-today {
+	cursor: pointer;
+	padding: 1px 3px;
+	width: 14px;
+	height: 16px;
+}
+
+.i-datefield-calendarpanel-day-today {
+	border: 1px solid #429ce9;
+	width: 12px;
+	height: 14px
+}
+
+.i-disabled .i-datefield-calendarpanel-day,
+.i-disabled .i-datefield-calendarpanel-day-today {
+	cursor: default;
+}
+
+.i-datefield-calendarpanel-day-entry {
+	color: #6a98b5;
+}
+
+.i-datefield-calendarpanel-day-disabled {
+	font-weight: normal;
+	color: #dddddd;
+	cursor: default;
+	opacity: 0.5;
+}
+
+.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled {
+	color: #afd6f8;
+}
+
+.i-datefield-calendarpanel-day-selected {
+	font-weight: bold;
+	width: 14px;
+	height: 16px;
+	color: #fff;
+	padding: 1px 3px;
+	background: transparent url(datefield/img/selected-bg.png) no-repeat 50% 50%;
+	cursor: default;
+	border: none;
+}
+
+.i-datefield-time {
+	white-space: nowrap;
+	font-size: 11px;
+}
+
+.i-datefield-time .i-label {
+	display: inline;
+}
+
+.i-datefield-time .i-select {
+	font-size: 10px;
+	padding: 0;
+	margin: 0;
+}
+.i-expandlayout-lo-table {
+	margin:0;
+	padding:0;
+	height:100%;
+	border:0;
+	border-spacing: 0;
+}
+.i-expandlayout-lo-td {
+	margin:0;
+	padding:0;
+	height:100%;
+	border:0;
+}
+
+.i-expandlayout-valign {
+	margin:0;
+	padding:0;
+	border:0;
+	border-collapse:collapse;
+	border-spacing:0;
+	height:100%;
+	width:100%;
+}
+
+.i-expandlayout-margin-top {
+	padding-top: 15px;
+}
+.i-expandlayout-margin-right {
+	padding-right: 18px;
+}
+.i-expandlayout-margin-bottom {
+	padding-bottom: 15px;
+}
+.i-expandlayout-margin-left {
+	padding-left: 18px;
+}
+
+.i-expandlayout-vspacing {
+	margin-top: 8px;
+}
+.i-expandlayout-hspacing {
+	margin-left: 8px;
+}
+
+.i-Notification {
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	background-color: #999999;
+	color: #ffffff;
+	padding: 0.3em;
+	cursor: pointer;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+.i-Notification H1,
+.i-Notification p,
+.i-Notification.error H1,
+.i-Notification.error p,
+.i-Notification.warning H1,
+.i-Notification.warning p {
+	display: inline;
+	padding: 0.1em;
+}
+.i-Notification.tray H1,
+.i-Notification.tray p {
+	display: block;
+	font-size: 1em;
+	line-height: 0.5em;
+}
+
+.i-Notification.warning {
+	background: #f14c1a;
+}
+
+.i-Notification.error {
+	background-color: #ff0a0a;
+	background-image: url(notification/'img/notification-error.png');
+	background-repeat: no-repeat;
+	background-position: center right;
+	padding-right: 30px;
+}
+.i-Notification.tray {
+
+}
+.i-orderedlayout-margin-top {
+	padding-top: 15px;
+}
+.i-orderedlayout-margin-right {
+	padding-right: 18px;
+}
+.i-orderedlayout-margin-bottom {
+	padding-bottom: 15px;
+}
+.i-orderedlayout-margin-left {
+	padding-left: 18px;
+}
+
+.i-orderedlayout-vspacing {
+	margin-top: 8px;
+}
+.i-orderedlayout-hspacing {
+	padding-left: 8px;
+}
+.i-panel,
+.i-panel-caption,
+.i-panel-content,
+.i-panel-deco,
+.i-panel-light,
+.i-panel-caption-light,
+.i-panel-content-light,
+.i-panel-deco-light {
+	outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
+	text-align: left /* Force default alignment */
+}
+
+.i-panel:before {
+	display: block;
+	content: "";
+	background: transparent url(panel/img/top-right.png) repeat-x right top;
+	height: 9px;
+	margin-left: 9px;
+}
+
+.i-panel-caption,
+.i-panel-caption-light {
+	font-size: 18px;
+	line-height: 18px;
+	font-weight: normal;
+	letter-spacing: -0.03em;
+	color: #f14c1a;
+	white-space: nowrap;
+	height: 18px;
+	padding: 6px 18px 14px 18px;
+	border: 1px solid #babfc0;
+	border-top: none;
+	background: #fff;
+}
+
+.i-panel-nocaption {
+	height: 9px;
+	border-bottom: 1px solid #dee2e3;
+}
+
+.i-panel-caption:before,
+.i-panel-nocaption:before {
+	display: block;
+	content: "";
+	position: relative;
+	width: 9px;
+	height: 9px;
+	background: transparent url(panel/img/top-left.png) no-repeat;
+	margin: -15px 0 5px -19px;
+}
+
+.i-panel-nocaption:before {
+	margin: -9px 0 0 0;
+}
+
+.i-panel-content {
+	border: 1px solid #babfc0;
+	border-top: none;
+	border-bottom: 1px solid #dee2e3;
+	background-color: #fff;
+	overflow: auto;
+}
+
+.i-panel-deco {
+	height: 9px;
+	background: transparent url(panel/img/bottom-right.png) repeat-x right top;
+	margin-left: 9px;
+}
+
+.i-panel-deco:before {
+	display: block;
+	content: "";
+	width: 9px;
+	height: 9px;
+	margin-left: -9px;
+	background: transparent url(panel/img/bottom-left.png) no-repeat;
+}
+
+
+
+
+
+
+/* Light panel style */
+
+.i-panel-light:before {
+	display: none;
+}
+
+.i-panel-caption-light {
+	border-left: none;
+	border-right: none;
+	background: transparent;
+	padding-top: 14px;
+	overflow: hidden;
+}
+
+.i-panel-caption-light:before,
+.i-panel-nocaption-light:before {
+	display: none;
+}
+
+.i-panel-nocaption-light {
+	height: 1px;
+	background: #babfc0;
+	overflow: hidden;
+	border: none;
+}
+
+.i-panel-content-light {
+	border: none;
+	background: transparent;
+}
+
+.i-panel-deco-light {
+	height: 0;
+	overflow: hidden;
+}
+
+
+
+
+
+/* Light panel contained within another panel or a tabsheet */
+
+.i-panel .i-panel-caption-light,
+.i-tabsheet .i-panel-caption-light {
+	margin-top: -1px;
+	padding-top: 14px;
+	border-top: 1px solid #babfc0;
+}
+
+
+
+
+
+/* IE specific rules (different selectors for IE6 and IE7.
+ * These selectors must be separate because IE6 won't 
+ * apply them if they are grouped together 
+ * (it doesn't recognize the '+' selector).
+*/
+* html .i-panel-caption {
+	border: 1px solid #babfc0;
+	padding-top: 14px;
+}
+*+html .i-panel-caption {
+	border: 1px solid #babfc0;
+	padding-top: 14px;
+}
+
+* html .i-panel-caption-light {
+	border-left: none;
+	border-right: none;
+}
+*+html .i-panel-caption-light {
+	border-left: none;
+	border-right: none;
+}
+
+* html .i-panel-content {
+	border-bottom: 1px solid #babfc0;
+}
+*+html .i-panel-content {
+	border-bottom: 1px solid #babfc0;
+}
+
+* html .i-panel-content-light {
+	border-bottom: none;
+}
+*+html .i-panel-content-light {
+	border-bottom: none;
+}
+
+* html .i-panel-deco {
+	height: 0;
+	overflow: hidden;
+}
+*+html .i-panel-deco {
+	height: 0;
+	overflow: hidden;
+}
+
+/* Without caption */
+* html .i-panel-nocaption {
+	height: 1px;
+	overflow: hidden;
+	background: #c1c6cc;
+	border: none;
+}
+*+html .i-panel-nocaption {
+	height: 1px;
+	overflow: hidden;
+	background: #c1c6cc;
+	border: none;
+}
+.i-progressindicator {
+	background: #dfe2e4 url(progressindicator/img/base.gif);
+	height: 9px;
+	border: 1px solid #b6bbbc;
+	overflow: hidden; /* for IE6 */
+}
+
+.i-progressindicator div {
+	background: #f7f9f9 url(progressindicator/img/progress.png);
+	height: 9px;
+	overflow: hidden; /* for IE6 */
+}
+
+.i-progressindicator-indeterminate {
+	background: #dfe2e4 url(common/img/ajax-loader-medium.gif);
+	height: 16px;
+	width: 16px;
+	overflow: hidden; /* for IE6 */
+}
+.i-select {
+	text-align: left /* Force default alignment */
+}
+.i-select-option {
+
+}
+
+.i-select-optiongroup {
+
+}
+
+.i-select-optiongroup .i-select-option {
+	display: block;
+	white-space: nowrap;
+}
+
+.i-select-select {
+	/*
+	border: 1px solid #b6b6b6;
+	border-bottom-color: #9d9d9d;
+	border-top-color: #d6d6d6;
+	border-left-color: #d6d6d6;
+	*/
+	display: block;
+	font-size: 13px;
+}
+
+/* Twincol style */
+.i-select-twincol {
+	white-space: nowrap;
+}
+.i-select-twincol-options {
+	float: left;
+	font-size: 13px;
+}
+.i-select-twincol-selections {
+	font-size: 13px;
+	font-weight: bold;
+}
+
+.i-select-twincol-buttons {
+	float: left;
+	padding: 2px; /* does not work in first render in FF ? */
+	text-align: center;
+}
+
+.i-select-twincol-buttons .i-select-twincol-deco {
+	clear:both;
+}
+
+.i-select-twincol .i-textfield {
+	display: block;
+	float: left;
+	clear: left;
+}
+
+.i-select-twincol .i-button {
+	display: block;
+	float: left;
+}
+
+.i-select-twincol-buttons .i-button {
+	display: inline;
+	float: none;
+}
+
+/** Filterselect aka ComboBox styles */
+
+.i-filterselect {
+	height: 23px;
+	background: transparent url(select/img/bg-left-filter.png) no-repeat;
+	margin-right: 1px;
+	white-space: nowrap;
+	text-align: left /* Force default alignment */
+}
+
+.i-filterselect-input {
+	width: 99%;
+	border: none;
+	background: transparent;
+	height: 20px;
+	margin: 0;
+	padding: 3px 0 0 4px;
+	font-size: 13px;
+}
+
+.i-filterselect-button {
+	float: right;
+	margin: -23px -1px 0 0;
+	width: 25px;
+	height: 23px;
+	cursor: pointer;
+	background: transparent url(select/img/bg-right-filter.png);
+	position: relative;
+}
+.i-filterselect-button:hover {
+	background-position: bottom left;
+}
+
+.i-filterselect-suggestpopup {
+	background: #f6f7f7;
+	border: 1px solid #b6bbbc;
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+	font-size: 12px;
+	line-height: 18px;
+	margin-top: -1px;
+}
+.i-filterselect-suggestmenu {
+	margin-left: -2px;
+}
+.i-filterselect-suggestmenu .gwt-MenuItem {
+	padding: 1px 5px;
+	cursor: pointer;
+	height: 18px;
+	white-space: nowrap;
+}
+
+.i-filterselect-suggestmenu .gwt-MenuItem-selected {
+	background: #5daee8;
+	color: #fff;
+}
+
+.i-filterselect-nextpage,
+.i-filterselect-nextpage-off,
+.i-filterselect-prevpage-off,
+.i-filterselect-prevpage {
+	height: 11px;
+	width:100%;
+	background: transparent url(select/img/button-bg.png) no-repeat 50% 0;
+	text-align: center;
+	margin: 2px 0 0 0;
+	overflow:hidden;
+}
+.i-filterselect-prevpage,
+.i-filterselect-prevpage-off {
+	background-position: 50% -1px;
+	margin: 0 0 2px 0;
+}
+.i-filterselect-prevpage:hover {
+	background-position: 50% bottom;
+}
+.i-filterselect-nextpage:hover {
+	background-position: 50% -12px;
+}
+.i-filterselect-nextpage span,
+.i-filterselect-nextpage-off span,
+.i-filterselect-prevpage-off span,
+.i-filterselect-prevpage span {
+	display: block;
+	height: 12px;
+	width:100%;
+	background: transparent url(select/img/arrow-up.png) no-repeat 50% 40%;
+	text-indent: -90000px;
+	cursor: pointer;
+	overflow: hidden;
+}
+.i-filterselect-nextpage span,
+.i-filterselect-nextpage-off span {
+	background: transparent url(select/img/arrow-down.png) no-repeat 50% 60%;
+}
+
+.i-filterselect-nextpage-off,
+.i-filterselect-prevpage-off {
+	color: #666;
+	opacity: 0.5;
+	filter: Alpha(opacity=50);
+}
+.i-filterselect-nextpage-off span,
+.i-filterselect-prevpage-off span {
+	cursor: default;
+}
+
+.i-filterselect-status {
+	font-size: 11px;
+	line-height: 11px;
+	width:100%;
+	padding: 4px 0px;
+	height: 11px;
+	white-space: nowrap;
+	text-align: center;
+	border-top: 1px solid #b6bbbc;
+}
+
+/* IE specific styles */
+
+* html .i-filterselect {
+
+}
+* html .i-filterselect-input {
+	margin-top: -1px;
+}
+
+*+html .i-filterselect-input {
+	margin-top: -1px;
+}
+* html .i-filterselect-button {
+	position: static;
+	margin-top: -24px;
+}
+*+html .i-filterselect-button {
+	position: static;
+	margin-top: -24px;
+}
+
+
+/*--------------------------
+  Default (horizontal) styles
+  --------------------------*/
+
+.i-slider {
+	border: 1px solid #cccfd0;
+	height: 3px;
+	margin: 5px 0;
+}
+
+.i-slider-base {
+	height: 2px;
+	border-top: 1px solid #cbcdce;
+	background: #f3f3f4;
+}
+.i-slider-handle {
+	background: transparent url(slider/img/handle-horizontal.png);
+	width: 12px;
+	height: 12px;
+	margin-top: -5px;
+	font-size: 0;
+	cursor: pointer;
+}
+.i-slider-handle:hover {
+	background-position: left bottom;
+}
+/* TODO
+.i-slider-bigger {
+	background: #dde4ef url(slider/img/arrow-right.png);
+	float: right;
+	width: 14px;
+	height: 14px;
+	overflow: hidden;
+	margin: 0 0 0 1px;
+}
+
+.i-slider-bigger:hover {
+	background-image: url(slider/img/arrow-right-over.png);
+}
+
+.i-slider-smaller {
+	background: #dde4ef url(slider/img/arrow-left.png);
+	float: left;
+	width: 14px;
+	height: 14px;
+	overflow: hidden;
+	margin: 0 1px 0 0;
+}
+
+.i-slider-smaller:hover {
+	background-image: url(slider/img/arrow-left-over.png);
+}
+*/
+
+
+/*-----------------
+  Vertical styles 
+  -----------------*/
+
+.i-slider-vertical {
+	width: 3px;
+	height: auto;
+	margin: 0 5px;
+}
+.i-slider-vertical .i-slider-base {
+	width: 2px;
+	border-left: 1px solid #cbcdce;
+	background: #f3f3f4;
+}
+.i-slider-vertical .i-slider-handle {
+	background: transparent url(slider/img/handle-vertical.png);
+	width: 12px;
+	height: 12px;
+	font-size: 0;
+	cursor: pointer;
+	margin-left: -5px;
+}
+.i-slider-vertical .i-slider-handle:hover {
+	background-position: left bottom;
+}
+.i-slider-vertical .i-slider-bigger {
+
+}
+.i-slider-vertical .i-slider-smaller {
+
+}
+
+
+
+/* IE specific styles */
+
+* html .i-slider,
+* html .i-slider-vertical {
+	margin: 0;
+}
+* html .i-slider .i-slider-handle {
+	margin: -1px 0;
+}
+* html .i-slider-vertical .i-slider-handle {
+	margin: 0 -1px;
+}
+.i-splitpanel-horizontal .i-splitpanel-hsplitter {
+	width: 6px;
+	font-size: 1px; /* for IE6 */
+}
+
+.i-splitpanel-horizontal .i-splitpanel-hsplitter div {
+	width: 6px;
+	font-size: 1px; /* for IE6 */
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	background: #ccd2d0 url(splitpanel/img/bg_hor.png);
+	border: 1px solid #b6bbbc;
+	cursor: e-resize;
+	margin: 0 -1px;
+}
+
+.i-splitpanel-vertical .i-splitpanel-vsplitter {
+	height: 6px;
+	font-size: 1px; /* for IE6 */
+}
+
+.i-splitpanel-vertical .i-splitpanel-vsplitter div {
+	height: 6px;
+	font-size: 1px; /* for IE6 */
+	background: #ccd2d0 url(splitpanel/img/bg_ver.png);
+	border: 1px solid #b6bbbc;
+	cursor: n-resize;
+	margin: -1px 0;
+}
+
+
+
+
+
+/* IE specific styles */
+
+* html .i-splitpanel-horizontal .i-splitpanel-hsplitter div {
+	height: 99%;
+}
+
+* html .i-splitpanel-vertical .i-splitpanel-vsplitter {
+	height: 8px;
+}
+
+* html .i-splitpanel-vertical .i-splitpanel-vsplitter div {
+	margin: 0;
+}
+
+.i-table {
+	border: 1px solid #b6bbbc;
+	overflow: hidden;
+	text-align: left /* Force default alignment */
+}
+
+.i-table.table-inline {
+	border-left: none;
+	border-right: none;
+	/*margin: -16px -18px 0 -18px;*/
+}
+
+.i-table-header-wrap {
+	height: 36px;
+	background: #e7edf3 url(table/img/header-bg.png) repeat-x;
+	border-bottom: 1px solid #b6bbbc;
+	overflow: hidden;
+}
+
+.i-table-header {
+	height: 36px;
+}
+
+.i-table-header table,
+.i-table-table {
+	border-collapse: collapse;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+
+.i-table-header td,
+.i-table-table td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+
+.i-table-header td {
+	cursor: pointer;
+}
+
+.i-table-resizer {
+	display: block;
+	height: 36px;
+	float: right;
+	background: transparent url(table/img/resizer-bg.png) repeat-y 50% 50%;
+	cursor: col-resize;
+}
+
+.i-table-caption-container {
+	float: right;
+	overflow: hidden;
+	white-space: nowrap;
+	color: #393a3c;
+	font-size: 15px;
+	padding-top: 9px;
+	text-shadow: #ffffff 2px 2px 0;
+}
+
+.i-table-header-cell-asc .i-table-caption-container {
+	background: transparent url(table/img/sort-asc.png) no-repeat right 80%;
+}
+.i-table-header-cell-desc .i-table-caption-container {
+	background: transparent url(table/img/sort-desc.png) no-repeat right 80%;
+}
+.i-table-header-cell:hover,
+.i-table-header-cell-asc:hover,
+.i-table-header-cell-desc:hover {
+	background: transparent url(table/img/header-bg-over.png) repeat-x;
+}
+
+
+.i-table-body {
+	background: #fff;
+}
+
+.i-table-row-spacer {
+	height: 10px;
+	overflow: hidden; /* IE hack to allow < one line height divs */
+}
+
+.i-table-row,
+.i-table-row-odd {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	background-color: #fff;
+	cursor: default;
+}
+.i-table-row-odd {
+	background-color: #f6f7f7;
+}
+.i-table-row:hover,
+.i-table-row-odd:hover {
+	background-color: #edeeee;
+}
+.i-table .i-selected {
+	background: #d5dde0;
+	color: #456572;
+}
+.i-table-row td,
+.i-table-row-odd td {
+	padding: 3px 0;
+}
+.i-table-cell-content {
+	white-space: nowrap;
+	overflow: hidden;
+	padding-left: 3px;
+}
+
+
+
+.i-table-column-selector {
+	float: right;
+	background: transparent url(table/img/colsel.png) no-repeat;
+	margin: -36px 0 0 0;
+	height: 36px;
+	width: 15px;
+	position: relative; /* hide this from IE, it works without it */
+}
+
+.i-table-focus-slot-left {
+	border-left: 2px solid #b6bbbc;
+	margin-right: -2px;
+}
+.i-table-focus-slot-right {
+	border-right: 2px solid #b6bbbc;
+	margin-left: -2px;
+}
+
+.i-table-header-drag {
+	position: absolute;
+	background: #e7edf3 url(table/img/header-bg.png) repeat-x;
+	border: 1px solid #b6bbbc;
+	padding: 4px;
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+	font-size: 15px;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	margin-top: 20px;
+	z-index: 20000;
+}
+
+.i-table-scrollposition {
+	width: 160px;
+	height: 39px;
+	background: transparent url(table/img/scroll-position-bg.png);
+}
+
+.i-table-scrollposition span {
+	display: block;
+	margin-top: 8px;
+	text-align: center;
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	color: #464f52;
+	font-size: 15px;
+	text-shadow: #ffffff 2px 2px 0;
+}
+
+
+/* rowe in column selector */
+.i-on div {
+	background-image: url(table/img/check.gif);
+	background-repeat: no-repeat;
+	background-position: 2px center;
+	text-indent: 6px;
+}
+.i-off div {
+	text-indent: 6px;
+}
+
+
+/* IE specific styles */
+* html .i-table-scrollposition {
+	background: transparent;
+	/* We need multiple different filters because we cannot be sure of the context 
+	   the browser is currently in (i.e. with ending slash or without). */
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
+}
+.i-tabsheet,
+.i-tabsheet-content,
+.i-tabsheet-deco {
+	outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
+	text-align: left /* Force default alignment */
+}
+
+
+.i-tabsheet-tabs {
+	empty-cells: hide;
+	border-collapse: collapse;
+	height: 48px;
+	background: transparent url(tabsheet/img/tabs-bg.png) repeat-x bottom left;
+	width: 100%;
+	overflow:hidden;
+}
+
+.i-tabsheet-tabs .i-caption {
+	white-space: nowrap;
+}
+
+/* for IE (does not inherit) */
+.i-tabsheet-tabs .i-caption span {
+	white-space: nowrap;
+}
+
+.i-tabsheet-tabs .gwt-TabBarFirst {
+	display: none;
+}
+
+.i-tabsheet-tabs .gwt-TabBarRest {
+	border: 1px solid #b6bbbc;
+	background: #f8f9f9 url(tabsheet/img/tab-bg.png);
+	height: 37px;
+}
+
+.i-tabsheet-tabs .gwt-TabBarItem {
+	border: 1px solid #b6bbbc;
+	border-right: none;
+	height: 20px;
+	padding: 9px 15px 8px 15px;
+	margin-top: 9px;
+	color: #777f85;
+	font-size: 15px;
+	line-height: 15px;
+	background: #f8f9f9 url(tabsheet/img/tab-bg.png);
+	cursor: pointer;
+}
+
+.i-tabsheet-tabs .gwt-TabBarItem-selected {
+	border: none;
+	background: transparent url(panel/img/top-left.png) no-repeat;
+	margin-top: -9px;
+	padding-left: 16px;
+	height: 30px;
+	cursor: default;
+	color: #ee5311;
+}
+
+.i-tabsheet-tabs .gwt-TabBarItem:hover {
+	color: #4b5257;
+}
+
+.i-tabsheet-tabs .gwt-TabBarItem-selected:hover {
+	color: #ee5311;
+}
+
+.i-tabsheet-tabs .gwt-TabBarItem-selected:before {
+	display: block;
+	height: 9px;
+	background: transparent url(panel/img/top-right.png) repeat-x right top;
+	content: "";
+	margin: -9px -16px 9px -6px;
+}
+
+.i-tabsheet-content {
+	border: 1px solid #babfc0;
+	background-color: #fff;
+	border-bottom: none;
+	border-top: none;
+}
+
+.i-tabsheet-deco {
+	height: 9px;
+	background: transparent url(panel/img/bottom-right.png) repeat-x right top;
+	margin-left: 9px;
+}
+
+.i-tabsheet-deco:before {
+	display: block;
+	content: "";
+	width: 9px;
+	height: 9px;
+	margin-left: -9px;
+	background: transparent url(panel/img/bottom-left.png) no-repeat;
+}
+
+
+
+/* Progress indication */
+
+.i-tabsheet-loading .i-tabsheet-tabs .gwt-TabBarItem-selected span{
+	background: transparent url(common/img/ajax-loader.gif) no-repeat;
+	display: block;
+	margin-left: -10px;
+	padding-left: 10px;
+	margin-top: -12px;
+	padding-top: 12px;
+}
+
+.i-tabsheet-loading .i-tabsheet-content * {
+	visibility: hidden;
+	overflow: hidden;
+}
+
+
+
+
+/* IE specific styles */
+
+* html .i-tabsheet-tabs {
+	height: 46px;
+}
+*+html .i-tabsheet-tabs {
+	height: 46px;
+}
+
+* html .i-tabsheet-tabs .gwt-TabBarItem-selected {
+	border: 1px solid #babfc0;
+	border-bottom: none;
+	background: #fff;
+	margin-top: 0;
+	height: 23px;
+	padding: 18px 14px 6px 15px;
+	cursor: default;
+	color: #ee5311;
+}
+*+html .i-tabsheet-tabs .gwt-TabBarItem-selected {
+	border: 1px solid #babfc0;
+	border-bottom: none;
+	background: #fff;
+	margin-top: 0;
+	height: 23px;
+	padding: 18px 14px 6px 15px;
+	cursor: default;
+	color: #ee5311;
+}
+
+* html .i-tabsheet-deco {
+	height: 1px;
+	background: #babfc0;
+	overflow: hidden;
+	margin: 0;
+}
+*+html .i-tabsheet-deco {
+	height: 1px;
+	background: #babfc0;
+	overflow: hidden;
+	margin: 0;
+}
+.i-textfield {
+	background: #fff url(textfield/img/bg.png) repeat-x;
+	padding: 2px;
+	border: 1px solid #b6b6b6;
+	border-top-color: #9d9d9d;
+	border-bottom-color: #d6d6d6;
+	border-right-color: #d6d6d6;
+	margin: 0;
+	font-size: 13px;
+	height: 18px;
+	text-align: left /* Force default alignment */
+}
+
+.i-textarea {
+	background: #fff url(textfield/img/bg.png) repeat-x;
+	padding: 2px;
+	border: 1px solid #b6b6b6;
+	border-top-color: #9d9d9d;
+	border-bottom-color: #d6d6d6;
+	border-right-color: #d6d6d6;
+	margin: 0;
+	font-size: 13px;
+}
+
+.i-textfield-focus,
+.i-textarea-focus {
+	border-color: #5daee8;
+}
+
+.i-textfield-error,
+.i-textarea-error {
+	background: #ff9999;
+}
+
+.i-textfield.i-readonly,
+.i-textarea.i-readonly {
+	background: transparent;
+	color: #222;
+	border: none;
+}
+
+
+.i-richtextarea {
+	border: 1px solid #b6b6b6;
+	overflow: hidden;
+}
+.i-richtextarea .gwt-RichTextArea {
+	background: #fff url(textfield/img/bg.png) repeat-x;
+}
+.i-richtextarea iframe {
+	border: 0;
+}
+.i-tree {
+	text-align: left /* Force default alignment */
+}
+
+.i-tree-node {
+	background: transparent url(tree/img/collapsed.png) no-repeat 2px 1px;
+}
+.i-tree-node-expanded {
+	background: transparent url(tree/img/expanded.png) no-repeat 2px 1px;
+}
+.i-tree-node-leaf {
+	background-image: none;
+}
+.i-tree-node-caption {
+	margin-left: 16px;
+}
+.i-tree-node span {
+	padding: 0 2px;
+	cursor: pointer;
+	white-space: nowrap;
+}
+.i-tree-node-selected span {
+	background: #5daee8;
+	color: #fff;
+	padding: 0 2px;
+	cursor: pointer;
+}
+.i-tree-node-children {
+	padding-left: 16px;
+}
+.i-window {
+	color: #464f52;
+	font-size: 13px;
+	line-height: 18px;
+}
+
+.i-window:before {
+	display: block;
+	content: "";
+	background: transparent url(window/img/top-right.png) repeat-x right top;
+	height: 21px;
+	margin-left: 21px;
+}
+
+.i-window-wrap {
+	padding-left: 20px;
+	background: transparent url(window/img/left-bg.png) repeat-y;
+	/* somehow this won't inherit from .i-window */
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+}
+
+.i-window-wrap2 {
+	padding-right: 20px;
+	background: transparent url(window/img/right-bg.png) repeat-y top right;
+}
+
+.i-window-outerheader {
+	height: 18px;
+	padding: 8px 34px 14px 12px;
+	background: #fff;
+}
+
+.i-window-header {
+	font-size: 18px;
+	line-height: 18px;
+	font-weight: normal;
+	letter-spacing: -0.03em;
+	color: #f14c1a;
+	white-space: nowrap;
+	cursor: move;
+	text-overflow:ellipsis;
+	overflow:hidden;
+}
+
+.i-window-outerheader:before {
+	display: block;
+	content: "";
+	width: 21px;
+	height: 21px;
+	margin: -29px 0 6px -32px;
+	background: transparent url(window/img/top-left.png);
+}
+
+.i-window-contents {
+	background: #fff;
+	border: 1px solid #babfc0;
+	font-size: 13px;
+	line-height: 18px;
+}
+
+.i-window-footer {
+	height: 0;
+	font-size: 0px;
+	/* Occupy more height to prevent scrollbars in Mac FF */
+	margin-bottom: 46px;
+}
+
+.i-window-footer:before {
+	display: block;
+	content: "";
+	width: 21px;
+	height: 46px;
+	background: transparent url(window/img/bottom-left.png);
+	margin-left: -20px;
+}
+
+.i-window-footer:after {
+	display: block;
+	content: "";
+	height: 46px;
+	background: transparent url(window/img/bottom-right.png) no-repeat top right;
+	margin: -46px -20px 0 1px;
+}
+
+.i-window-resizebox {
+	position:absolute;
+	bottom: 24px;
+	right: 0;
+	width: 25px;
+	height: 21px;
+	cursor: se-resize;
+	background: transparent url(window/img/resize.png);
+}
+
+.i-window-closebox {
+	position:absolute;
+	top: 33px;
+	right: 36px;
+	width: 12px;
+	height: 11px;
+	background: transparent url(window/img/close.png);
+	cursor: pointer;
+	overflow: hidden;
+}
+.i-window-closebox:hover {
+	background-position: 0 -11px;
+}
+
+.i-window-modalitycurtain {
+	top:0;
+	left:0;
+	background:white;
+	opacity: 0.5;
+	position:fixed;
+	width:100%;
+	height:100%;
+	filter: alpha(opacity=50);
+}
+
+/* IE6 workaround for position:fixed; */
+* html .i-window-modalitycurtain { 
+	position: absolute;
+	top: expression((ignoreMe = document.documentElement.scrollTop) + "px"); 
+}
+
+/* IE specific styles */
+
+* html .i-window-wrap {
+	padding: 12px;
+	border: 1px solid #e8e9e9;
+	background: #d8dee0;
+	/*filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/window/img/bg-color.png", sizingMethod="scale");*/
+	/*zoom: 1;  to gain hasLayout, IE won't apply filter otherwise */
+}
+*+html .i-window-wrap {
+	padding: 12px;
+	border: 1px solid #e8e9e9;
+	background: transparent url(window/img/bg-color.png) repeat;
+}
+
+* html .i-window-wrap2 {
+	padding: 6px;
+	border: 1px solid #babfc0;
+	background: #fff;
+}
+*+html .i-window-wrap2 {
+	padding: 6px;
+	border: 1px solid #babfc0;
+	background: #fff;
+}
+
+* html .i-window-footer {
+	margin-bottom: 0;
+}
+*+html .i-window-footer {
+	margin-bottom: 0;
+}
+
+* html .i-window-resizebox {
+	bottom: 1px;
+	right:  1px;
+	width: 15px;
+	height: 12px;
+	background: url(window/img/resize.png);
+}
+*+html .i-window-resizebox {
+	bottom: 0;
+	background-position: 3px 3px;
+}
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/check.gif b/WebContent/ITMILL/themes/default/table/img/check.gif
index 0a89195168..0a89195168 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/check.gif
+++ b/WebContent/ITMILL/themes/default/table/img/check.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/colsel.png b/WebContent/ITMILL/themes/default/table/img/colsel.png
index 7cf5abc8b2..7cf5abc8b2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/colsel.png
+++ b/WebContent/ITMILL/themes/default/table/img/colsel.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg-over.png b/WebContent/ITMILL/themes/default/table/img/header-bg-over.png
index 6c888676e9..6c888676e9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg-over.png
+++ b/WebContent/ITMILL/themes/default/table/img/header-bg-over.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg.png b/WebContent/ITMILL/themes/default/table/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg.png
+++ b/WebContent/ITMILL/themes/default/table/img/header-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/resizer-bg.png b/WebContent/ITMILL/themes/default/table/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/resizer-bg.png
+++ b/WebContent/ITMILL/themes/default/table/img/resizer-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/scroll-position-bg.png b/WebContent/ITMILL/themes/default/table/img/scroll-position-bg.png
index d5968fdf51..d5968fdf51 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/scroll-position-bg.png
+++ b/WebContent/ITMILL/themes/default/table/img/scroll-position-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/sort-asc.png b/WebContent/ITMILL/themes/default/table/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/sort-asc.png
+++ b/WebContent/ITMILL/themes/default/table/img/sort-asc.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/sort-desc.png b/WebContent/ITMILL/themes/default/table/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/sort-desc.png
+++ b/WebContent/ITMILL/themes/default/table/img/sort-desc.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css b/WebContent/ITMILL/themes/default/table/table.css
index 6ed463c134..dd6daf441f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
+++ b/WebContent/ITMILL/themes/default/table/table.css
@@ -162,7 +162,7 @@
 
 /* rowe in column selector */

 .i-on div {

-	background-image: url('img/check.gif');

+	background-image: url(img/check.gif);

 	background-repeat: no-repeat;

 	background-position: 2px center;

 	text-indent: 6px;

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-bg.png
index a4235e9a83..a4235e9a83 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-left.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-left.png
index a3f43bc7e5..a3f43bc7e5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-left.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-right.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-right.png
index 59c7162305..59c7162305 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-right.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-bg.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-bg.png
index 4c04dee4aa..4c04dee4aa 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-bg.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-left.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-left.png
index 12bdc0ab03..12bdc0ab03 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-left.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-right.png b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-right.png
index 828f62b8e5..828f62b8e5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-right.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tab-selected-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tabs-bg.png b/WebContent/ITMILL/themes/default/tabsheet/img/tabs-bg.png
index ad023ad103..ad023ad103 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tabs-bg.png
+++ b/WebContent/ITMILL/themes/default/tabsheet/img/tabs-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
index 565117e1fd..565117e1fd 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css
+++ b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/img/bg.png b/WebContent/ITMILL/themes/default/textfield/img/bg.png
index 43c7ac7b47..43c7ac7b47 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/img/bg.png
+++ b/WebContent/ITMILL/themes/default/textfield/img/bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/textfield.css b/WebContent/ITMILL/themes/default/textfield/textfield.css
index 10aa9811f4..10aa9811f4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/textfield.css
+++ b/WebContent/ITMILL/themes/default/textfield/textfield.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png b/WebContent/ITMILL/themes/default/tree/img/collapsed.png
index 8d4064de0a..8d4064de0a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png
+++ b/WebContent/ITMILL/themes/default/tree/img/collapsed.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/expanded.png b/WebContent/ITMILL/themes/default/tree/img/expanded.png
index 4ac2554eac..4ac2554eac 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/expanded.png
+++ b/WebContent/ITMILL/themes/default/tree/img/expanded.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css b/WebContent/ITMILL/themes/default/tree/tree.css
index f905658f63..f905658f63 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css
+++ b/WebContent/ITMILL/themes/default/tree/tree.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bg-color.png b/WebContent/ITMILL/themes/default/window/img/bg-color.png
index 08cdb43bce..08cdb43bce 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bg-color.png
+++ b/WebContent/ITMILL/themes/default/window/img/bg-color.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bottom-left.png b/WebContent/ITMILL/themes/default/window/img/bottom-left.png
index 14808c98ea..14808c98ea 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bottom-left.png
+++ b/WebContent/ITMILL/themes/default/window/img/bottom-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bottom-right.png b/WebContent/ITMILL/themes/default/window/img/bottom-right.png
index 99e118de45..99e118de45 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/bottom-right.png
+++ b/WebContent/ITMILL/themes/default/window/img/bottom-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/close.png b/WebContent/ITMILL/themes/default/window/img/close.png
index 8f1006ac5f..8f1006ac5f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/close.png
+++ b/WebContent/ITMILL/themes/default/window/img/close.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/left-bg.png b/WebContent/ITMILL/themes/default/window/img/left-bg.png
index e9fd861993..e9fd861993 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/left-bg.png
+++ b/WebContent/ITMILL/themes/default/window/img/left-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/notification-error.png b/WebContent/ITMILL/themes/default/window/img/notification-error.png
index 32852d5907..32852d5907 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/notification-error.png
+++ b/WebContent/ITMILL/themes/default/window/img/notification-error.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/resize.png b/WebContent/ITMILL/themes/default/window/img/resize.png
index 8c4c00a11c..8c4c00a11c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/resize.png
+++ b/WebContent/ITMILL/themes/default/window/img/resize.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/right-bg.png b/WebContent/ITMILL/themes/default/window/img/right-bg.png
index 35d39c772f..35d39c772f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/right-bg.png
+++ b/WebContent/ITMILL/themes/default/window/img/right-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/top-left.png b/WebContent/ITMILL/themes/default/window/img/top-left.png
index 0a46a98d4d..0a46a98d4d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/top-left.png
+++ b/WebContent/ITMILL/themes/default/window/img/top-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/top-right.png b/WebContent/ITMILL/themes/default/window/img/top-right.png
index 00fdb54543..00fdb54543 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/img/top-right.png
+++ b/WebContent/ITMILL/themes/default/window/img/top-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css b/WebContent/ITMILL/themes/default/window/window.css
index a9774d756b..a9774d756b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css
+++ b/WebContent/ITMILL/themes/default/window/window.css
diff --git a/WebContent/ITMILL/themes/example/styles.css b/WebContent/ITMILL/themes/example/styles.css
index e69de29bb2..dfe81e21d4 100644
--- a/WebContent/ITMILL/themes/example/styles.css
+++ b/WebContent/ITMILL/themes/example/styles.css
@@ -0,0 +1,2 @@
+@import url(../default/styles.css);
+
diff --git a/WebContent/ITMILL/themes/liferay/styles.css b/WebContent/ITMILL/themes/liferay/styles.css
index 718988aacc..5010a14bc9 100644
--- a/WebContent/ITMILL/themes/liferay/styles.css
+++ b/WebContent/ITMILL/themes/liferay/styles.css
@@ -1,3 +1,5 @@
+@import url(../default/styles.css);
+
 /*
  * Simplified default theme to work seamlessly with Liferay
  */
diff --git a/WebContent/ITMILL/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css
index e4f77100ae..dae0dd18d2 100644
--- a/WebContent/ITMILL/themes/reservr/styles.css
+++ b/WebContent/ITMILL/themes/reservr/styles.css
@@ -1,3 +1,5 @@
+@import url(../default/styles.css);
+
 /* Reservr styles */

 body {

 	background-color: #E9ECED;

diff --git a/WebContent/ITMILL/themes/testingtools/styles.css b/WebContent/ITMILL/themes/testingtools/styles.css
index 403dfa89cd..8206e239d1 100644
--- a/WebContent/ITMILL/themes/testingtools/styles.css
+++ b/WebContent/ITMILL/themes/testingtools/styles.css
@@ -1,3 +1,5 @@
+@import url(../default/styles.css);
+
 .resulttable {

 	border-spacing: 0px;

 	margin: 0px 0px 0px 0px;

diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/styles.css b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
index 735fa83e3c..088e6608c0 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
@@ -1,3 +1,5 @@
+@import url(../default/styles.css);
+
 body, html {

 	background: #e9eced;

 	margin: 0;

diff --git a/WebContent/ITMILL/themes/tests-magi/styles.css b/WebContent/ITMILL/themes/tests-magi/styles.css
index 9d704a2191..afa1bda0d5 100644
--- a/WebContent/ITMILL/themes/tests-magi/styles.css
+++ b/WebContent/ITMILL/themes/tests-magi/styles.css
@@ -1,3 +1,5 @@
+@import url(../default/styles.css);
+
 /*****************************************************************************/
 /* Styling for tests.magi application.                                       */
 /*****************************************************************************/
diff --git a/WebContent/reservr.html b/WebContent/reservr.html
index a08b689b3f..4a4eb2bb02 100644
--- a/WebContent/reservr.html
+++ b/WebContent/reservr.html
@@ -34,6 +34,18 @@
 	}
 	itmill.toolkitConfigurations["itmill-ajax-window"] = {appUri:'/Reservr', pathInfo: '/', themeUri:'/ITMILL/themes/reservr'};
 	//]]>
+	</script>
+	<script type="text/javascript">
+	//<![CDATA[
+	if(!itmill.themesLoaded['reservr']) {
+	var stylesheet = document.createElement('link');
+	stylesheet.setAttribute('rel', 'stylesheet');
+	stylesheet.setAttribute('type', 'text/css');
+	stylesheet.setAttribute('href', '/ITMILL/themes/reservr/styles.css');
+	document.getElementsByTagName('head')[0].appendChild(stylesheet);
+	itmill.themesLoaded['reservr'] = true;
+	}
+	//]]>
 	</script>

 	<div id="itmill-ajax-window"></div>	

 </body>

diff --git a/build/build.xml b/build/build.xml
index 258642ba69..dc835ed6ee 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -521,7 +521,7 @@
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   WebContent
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="webcontent" depends="preprocess-src">
+	<target name="webcontent" depends="preprocess-src,defaulttheme">
 
 		<!-- copy 3rd part libraries used by demo -->
 		<copy todir="${output-dir}/WebContent/demo/lib">
@@ -585,6 +585,15 @@
 		<javac source="1.4" target="1.4" classpathref="compile.classpath" srcdir="${result-path}/src" destdir="${result-path}/classes" includes="${toolkit-package}/**" debug="true">
 		</javac>
 	</target>
+	
+	<target name="defaulttheme" >
+		<echo>Combining default themes css files</echo>
+		<java classname="com.itmill.toolkit.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
+			<classpath>
+				<pathelement location="build/buildhelpers" />
+			</classpath>
+		</java>
+	</target>
 
 	<target name="compile-client-side" depends="webcontent">
 		<echo>Compiling src (client-side)</echo>
@@ -690,7 +699,7 @@
 			</fileset>
 		</copy>
 	</target>
-
+	
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   Documentation 
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java
new file mode 100644
index 0000000000..d5da4cf6f4
--- /dev/null
+++ b/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java
@@ -0,0 +1,69 @@
+package com.itmill.toolkit.buildhelpers;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Helper to combine css diveded into separate per component dirs into one to
+ * optimize http requests.
+ * 
+ */
+public class CompileDefaultTheme {
+
+    private static final String SRCDIR = "./WebContent/ITMILL/themes/default";
+
+    /**
+     * @param args
+     * @throws IOException
+     */
+    public static void main(String[] args) throws IOException {
+        File f = new File(SRCDIR);
+
+        StringBuffer combinedCss = new StringBuffer();
+        combinedCss
+                .append("/* Automatically compiled css file from subdirectories. */\n");
+
+        File[] subdir = f.listFiles();
+
+        for (int i = 0; i < subdir.length; i++) {
+            File dir = subdir[i];
+            String name = dir.getName();
+
+            File cssFile = new File(dir.getPath() + "/" + name + ".css");
+            if (cssFile.isFile()) {
+                FileInputStream fstream = new FileInputStream(cssFile);
+                // Get the object of DataInputStream
+                DataInputStream in = new DataInputStream(fstream);
+                BufferedReader br = new BufferedReader(
+                        new InputStreamReader(in));
+                String strLine;
+                while ((strLine = br.readLine()) != null) {
+                    if (strLine.indexOf("url(../") > 0) {
+                        strLine = strLine.replaceAll("url\\(../", ("url\\("));
+
+                    } else {
+                        strLine = strLine.replaceAll("url\\(",
+                                ("url\\(" + name + "/"));
+
+                    }
+                    combinedCss.append(strLine);
+                    combinedCss.append("\n");
+                }
+                // Close the input stream
+                in.close();
+            }
+        }
+
+        BufferedWriter out = new BufferedWriter(new FileWriter(SRCDIR
+                + "/styles.css"));
+        out.write(combinedCss.toString());
+        out.close();
+
+    }
+}
diff --git a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
index 82b848b129..7520019676 100644
--- a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
+++ b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
@@ -21,7 +21,6 @@
 		Default theme for this widget set. 

 		Please name the sub directory differently when creating a extended widget set

 		(e.g. src="mywidgets/styles.css") to avoid naming conflicts.

-	 -->
 	
 	<stylesheet src="default/common/common.css"/>
 	<stylesheet src="default/button/button.css"/>
@@ -42,5 +41,6 @@
 	<stylesheet src="default/expandlayout/expandlayout.css"/>
 	<stylesheet src="default/orderedlayout/orderedlayout.css"/>
 	<stylesheet src="default/accordion/accordion.css"/>
+	 -->
 
 </module>
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 8a9380ff5a..1b8f0f0b31 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -97,10 +97,6 @@ public class ApplicationConnection {
         this.widgetSet = widgetSet;
         configuration = cnf;
 
-        if (cnf.getThemeUri() != null) {
-            injectCss(cnf.getThemeUri() + "/styles.css");
-        }
-
         if (isDebugMode()) {
             console = new DebugConsole(this);
         } else {
@@ -131,27 +127,6 @@ public class ApplicationConnection {
     }
 
     /**
-     * Injects CSS to head element
-     * 
-     * TODO since gwt 1.5 this can be made non-native
-     * 
-     * @param css
-     */
-    private native static void injectCss(String cssUri)
-    /*-{
-        
-        if(!$wnd.itmill.themesLoaded[cssUri]) {
-            var stylesheet = $doc.createElement('link');
-            stylesheet.setAttribute('rel', 'stylesheet');
-            stylesheet.setAttribute('type', 'text/css');
-            stylesheet.setAttribute('href', cssUri);
-            var h = $doc.getElementsByTagName("head")[0];   
-            h.appendChild(stylesheet);
-            $wnd.itmill.themesLoaded[cssUri] = true;
-        }
-    }-*/;
-
-    /**
      * Method to check if application is in testing mode. Can be used after
      * application init.
      * 
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css
deleted file mode 100644
index 335d77277e..0000000000
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css
+++ /dev/null
@@ -1,65 +0,0 @@
-.i-select {
-	text-align: left /* Force default alignment */

-}

-.i-select-option {

-

-}

-

-.i-select-optiongroup {

-

-}

-

-.i-select-optiongroup .i-select-option {

-	display: block;

-	white-space: nowrap;

-}

-

-.i-select-select {

-	/*

-	border: 1px solid #b6b6b6;

-	border-bottom-color: #9d9d9d;

-	border-top-color: #d6d6d6;

-	border-left-color: #d6d6d6;

-	*/

-	display: block;

-	font-size: 13px;

-}

-

-/* Twincol style */

-.i-select-twincol {

-	white-space: nowrap;

-}

-.i-select-twincol-options {

-	float: left;

-	font-size: 13px;

-}

-.i-select-twincol-selections {

-	font-size: 13px;

-	font-weight: bold;

-}

-

-.i-select-twincol-buttons {

-	float: left;

-	padding: 2px; /* does not work in first render in FF ? */

-	text-align: center;

-}

-

-.i-select-twincol-buttons .i-select-twincol-deco {

-	clear:both;

-}

-

-.i-select-twincol .i-textfield {

-	display: block;

-	float: left;

-	clear: left;

-}

-

-.i-select-twincol .i-button {

-	display: block;

-	float: left;

-}

-

-.i-select-twincol-buttons .i-button {

-	display: inline;

-	float: none;

-}
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index af972ca82c..14d5da3ebf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -459,6 +459,10 @@ public class ApplicationServlet extends HttpServlet {
                     themeName = request.getParameter("theme");
                 }
 
+                if (themeName == null) {
+                    themeName = "default";
+                }
+
                 // Handles resource requests
                 if (handleResourceRequest(request, response, themeName)) {
                     return;
@@ -798,6 +802,24 @@ public class ApplicationServlet extends HttpServlet {
         }
         page.write("};\n//]]>\n</script>\n");
 
+        if (themeName != null) {
+            // Custom theme's stylesheet, load only once, in different script
+            // tag to be dominate styles injected by widget
+            // set
+            page.write("<script type=\"text/javascript\">\n");
+            page.write("//<![CDATA[\n");
+            page.write("if(!itmill.themesLoaded['" + themeName + "']) {\n");
+            page.write("var stylesheet = document.createElement('link');\n");
+            page.write("stylesheet.setAttribute('rel', 'stylesheet');\n");
+            page.write("stylesheet.setAttribute('type', 'text/css');\n");
+            page.write("stylesheet.setAttribute('href', '" + themeUri
+                    + "/styles.css');\n");
+            page
+                    .write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n");
+            page.write("itmill.themesLoaded['" + themeName + "'] = true;\n}\n");
+            page.write("//]]>\n</script>\n");
+        }
+
         page.write("<div id=\"" + appId + "\" class=\"i-app\"></div>\n");
 
         if (!fragment) {