793 files changed, 55 insertions, 55 deletions

diff --git a/WebContent/ITMILL/readme.txt b/WebContent/VAADIN/readme.txt
index 4e4d0030aa..4e4d0030aa 100644
--- a/WebContent/ITMILL/readme.txt
+++ b/WebContent/VAADIN/readme.txt
diff --git a/WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
index b2c2ed2858..b2c2ed2858 100644
--- a/WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css
+++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
diff --git a/WebContent/ITMILL/themes/base/accordion/accordion.css b/WebContent/VAADIN/themes/base/accordion/accordion.css
index 5c1a7d77b8..5c1a7d77b8 100644
--- a/WebContent/ITMILL/themes/base/accordion/accordion.css
+++ b/WebContent/VAADIN/themes/base/accordion/accordion.css
diff --git a/WebContent/ITMILL/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index c7e2fab8f6..c7e2fab8f6 100644
--- a/WebContent/ITMILL/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
diff --git a/WebContent/ITMILL/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css
index 32a77eed08..32a77eed08 100644
--- a/WebContent/ITMILL/themes/base/caption/caption.css
+++ b/WebContent/VAADIN/themes/base/caption/caption.css
diff --git a/WebContent/ITMILL/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index 3ed9b8daad..3ed9b8daad 100644
--- a/WebContent/ITMILL/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
diff --git a/WebContent/ITMILL/themes/base/common/img/sprites.png b/WebContent/VAADIN/themes/base/common/img/sprites.png
index c5d2e89b97..c5d2e89b97 100644
--- a/WebContent/ITMILL/themes/base/common/img/sprites.png
+++ b/WebContent/VAADIN/themes/base/common/img/sprites.png
diff --git a/WebContent/ITMILL/themes/base/customcomponent/customcomponent.css b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.css
index f6cfd31390..f6cfd31390 100644
--- a/WebContent/ITMILL/themes/base/customcomponent/customcomponent.css
+++ b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.css
diff --git a/WebContent/ITMILL/themes/base/customlayout/customlayout.css b/WebContent/VAADIN/themes/base/customlayout/customlayout.css
index b9c20dbbf8..b9c20dbbf8 100644
--- a/WebContent/ITMILL/themes/base/customlayout/customlayout.css
+++ b/WebContent/VAADIN/themes/base/customlayout/customlayout.css
diff --git a/WebContent/ITMILL/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index e18a19c706..e18a19c706 100644
--- a/WebContent/ITMILL/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
diff --git a/WebContent/ITMILL/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css
index dd5e8d6662..dd5e8d6662 100644
--- a/WebContent/ITMILL/themes/base/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css
diff --git a/WebContent/ITMILL/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
index 039f080ac2..039f080ac2 100644
--- a/WebContent/ITMILL/themes/base/gridlayout/gridlayout.css
+++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
diff --git a/WebContent/ITMILL/themes/base/link/link.css b/WebContent/VAADIN/themes/base/link/link.css
index 322fb3e7ba..322fb3e7ba 100644
--- a/WebContent/ITMILL/themes/base/link/link.css
+++ b/WebContent/VAADIN/themes/base/link/link.css
diff --git a/WebContent/ITMILL/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index 712769536c..712769536c 100644
--- a/WebContent/ITMILL/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
diff --git a/WebContent/ITMILL/themes/base/notification/notification.css b/WebContent/VAADIN/themes/base/notification/notification.css
index 514d274488..514d274488 100644
--- a/WebContent/ITMILL/themes/base/notification/notification.css
+++ b/WebContent/VAADIN/themes/base/notification/notification.css
diff --git a/WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
index 6dafa2d252..6dafa2d252 100644
--- a/WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css
+++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
diff --git a/WebContent/ITMILL/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css
index 126d3da91c..126d3da91c 100644
--- a/WebContent/ITMILL/themes/base/panel/panel.css
+++ b/WebContent/VAADIN/themes/base/panel/panel.css
diff --git a/WebContent/ITMILL/themes/base/popupview/popupview.css b/WebContent/VAADIN/themes/base/popupview/popupview.css
index 8cf1c6066f..8cf1c6066f 100644
--- a/WebContent/ITMILL/themes/base/popupview/popupview.css
+++ b/WebContent/VAADIN/themes/base/popupview/popupview.css
diff --git a/WebContent/ITMILL/themes/base/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css
index 18b1f1e4a7..18b1f1e4a7 100644
--- a/WebContent/ITMILL/themes/base/progressindicator/progressindicator.css
+++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css
diff --git a/WebContent/ITMILL/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css
index 9bfcfefd45..9bfcfefd45 100644
--- a/WebContent/ITMILL/themes/base/select/select.css
+++ b/WebContent/VAADIN/themes/base/select/select.css
diff --git a/WebContent/ITMILL/themes/base/shadow/img/bottom-left.png b/WebContent/VAADIN/themes/base/shadow/img/bottom-left.png
index 6b2cd00a0d..6b2cd00a0d 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/bottom-left.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/bottom-left.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/bottom-right.png b/WebContent/VAADIN/themes/base/shadow/img/bottom-right.png
index c5c10a7bf5..c5c10a7bf5 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/bottom-right.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/bottom-right.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/bottom.png b/WebContent/VAADIN/themes/base/shadow/img/bottom.png
index 14935a81d4..14935a81d4 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/bottom.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/bottom.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/center.png b/WebContent/VAADIN/themes/base/shadow/img/center.png
index 1db9a53c75..1db9a53c75 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/center.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/center.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/left.png b/WebContent/VAADIN/themes/base/shadow/img/left.png
index 45634c05d8..45634c05d8 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/left.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/left.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/right.png b/WebContent/VAADIN/themes/base/shadow/img/right.png
index 619c4034db..619c4034db 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/right.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/right.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/top-left.png b/WebContent/VAADIN/themes/base/shadow/img/top-left.png
index 10e743875e..10e743875e 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/top-left.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/top-left.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/top-right.png b/WebContent/VAADIN/themes/base/shadow/img/top-right.png
index 2088806475..2088806475 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/top-right.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/top-right.png
diff --git a/WebContent/ITMILL/themes/base/shadow/img/top.png b/WebContent/VAADIN/themes/base/shadow/img/top.png
index 9daf3f41f4..9daf3f41f4 100644
--- a/WebContent/ITMILL/themes/base/shadow/img/top.png
+++ b/WebContent/VAADIN/themes/base/shadow/img/top.png
diff --git a/WebContent/ITMILL/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css
index bc67f3cc59..bc67f3cc59 100644
--- a/WebContent/ITMILL/themes/base/shadow/shadow.css
+++ b/WebContent/VAADIN/themes/base/shadow/shadow.css
diff --git a/WebContent/ITMILL/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css
index 2288cfc47a..2288cfc47a 100644
--- a/WebContent/ITMILL/themes/base/slider/slider.css
+++ b/WebContent/VAADIN/themes/base/slider/slider.css
diff --git a/WebContent/ITMILL/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
index 7406c4f3c8..7406c4f3c8 100644
--- a/WebContent/ITMILL/themes/base/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
diff --git a/WebContent/ITMILL/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 42680407c3..42680407c3 100644
--- a/WebContent/ITMILL/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
diff --git a/WebContent/ITMILL/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index c6fccfa835..c6fccfa835 100644
--- a/WebContent/ITMILL/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
diff --git a/WebContent/ITMILL/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 090e246e8d..090e246e8d 100644
--- a/WebContent/ITMILL/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
diff --git a/WebContent/ITMILL/themes/base/textfield/textfield.css b/WebContent/VAADIN/themes/base/textfield/textfield.css
index 94e17ad477..94e17ad477 100644
--- a/WebContent/ITMILL/themes/base/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/base/textfield/textfield.css
diff --git a/WebContent/ITMILL/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index d823404704..d823404704 100644
--- a/WebContent/ITMILL/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/bottom-left.png b/WebContent/VAADIN/themes/base/window/img/shadow/bottom-left.png
index f40e53f939..f40e53f939 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/bottom-left.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/bottom-left.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/bottom-right.png b/WebContent/VAADIN/themes/base/window/img/shadow/bottom-right.png
index 8ef8376f7a..8ef8376f7a 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/bottom-right.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/bottom-right.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/bottom.png b/WebContent/VAADIN/themes/base/window/img/shadow/bottom.png
index 89096316e6..89096316e6 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/bottom.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/bottom.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/center.png b/WebContent/VAADIN/themes/base/window/img/shadow/center.png
index 1db9a53c75..1db9a53c75 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/center.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/center.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/left.png b/WebContent/VAADIN/themes/base/window/img/shadow/left.png
index bc526b1674..bc526b1674 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/left.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/left.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/right.png b/WebContent/VAADIN/themes/base/window/img/shadow/right.png
index b837d90545..b837d90545 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/right.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/right.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/top-left.png b/WebContent/VAADIN/themes/base/window/img/shadow/top-left.png
index abd7943b21..abd7943b21 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/top-left.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/top-left.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/top-right.png b/WebContent/VAADIN/themes/base/window/img/shadow/top-right.png
index d54b748be7..d54b748be7 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/top-right.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/top-right.png
diff --git a/WebContent/ITMILL/themes/base/window/img/shadow/top.png b/WebContent/VAADIN/themes/base/window/img/shadow/top.png
index 4d5272e7f3..4d5272e7f3 100644
--- a/WebContent/ITMILL/themes/base/window/img/shadow/top.png
+++ b/WebContent/VAADIN/themes/base/window/img/shadow/top.png
diff --git a/WebContent/ITMILL/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index bf14c0a453..bf14c0a453 100644
--- a/WebContent/ITMILL/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
diff --git a/WebContent/ITMILL/themes/contacts/favicon.ico b/WebContent/VAADIN/themes/contacts/favicon.ico
index 2c731f8f85..2c731f8f85 100644
--- a/WebContent/ITMILL/themes/contacts/favicon.ico
+++ b/WebContent/VAADIN/themes/contacts/favicon.ico
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/arrow-down.png b/WebContent/VAADIN/themes/contacts/icons/32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/arrow-down.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/arrow-down.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/arrow-left.png b/WebContent/VAADIN/themes/contacts/icons/32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/arrow-left.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/arrow-left.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/arrow-right.png b/WebContent/VAADIN/themes/contacts/icons/32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/arrow-right.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/arrow-right.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/arrow-up.png b/WebContent/VAADIN/themes/contacts/icons/32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/arrow-up.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/arrow-up.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/attention.png b/WebContent/VAADIN/themes/contacts/icons/32/attention.png
index 6b00733567..6b00733567 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/attention.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/attention.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/calendar.png b/WebContent/VAADIN/themes/contacts/icons/32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/calendar.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/calendar.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/cancel.png b/WebContent/VAADIN/themes/contacts/icons/32/cancel.png
index 725240d558..725240d558 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/cancel.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/cancel.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-add.png b/WebContent/VAADIN/themes/contacts/icons/32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-add.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-add.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-delete.png b/WebContent/VAADIN/themes/contacts/icons/32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-delete.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-delete.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-doc.png b/WebContent/VAADIN/themes/contacts/icons/32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-doc.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-doc.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-edit.png b/WebContent/VAADIN/themes/contacts/icons/32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-edit.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-edit.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-image.png b/WebContent/VAADIN/themes/contacts/icons/32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-image.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-image.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-pdf.png b/WebContent/VAADIN/themes/contacts/icons/32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-pdf.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-pdf.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-ppt.png b/WebContent/VAADIN/themes/contacts/icons/32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-ppt.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-ppt.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-txt.png b/WebContent/VAADIN/themes/contacts/icons/32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-txt.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-txt.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-web.png b/WebContent/VAADIN/themes/contacts/icons/32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-web.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-web.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document-xsl.png b/WebContent/VAADIN/themes/contacts/icons/32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document-xsl.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document-xsl.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/document.png b/WebContent/VAADIN/themes/contacts/icons/32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/document.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/document.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/email-reply.png b/WebContent/VAADIN/themes/contacts/icons/32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/email-reply.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/email-reply.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/email-send.png b/WebContent/VAADIN/themes/contacts/icons/32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/email-send.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/email-send.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/email.png b/WebContent/VAADIN/themes/contacts/icons/32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/email.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/email.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/folder-add.png b/WebContent/VAADIN/themes/contacts/icons/32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/folder-add.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/folder-add.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/folder-delete.png b/WebContent/VAADIN/themes/contacts/icons/32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/folder-delete.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/folder-delete.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/folder.png b/WebContent/VAADIN/themes/contacts/icons/32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/folder.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/folder.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/globe.png b/WebContent/VAADIN/themes/contacts/icons/32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/globe.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/globe.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/help.png b/WebContent/VAADIN/themes/contacts/icons/32/help.png
index 218910c98d..218910c98d 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/help.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/help.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/lock.png b/WebContent/VAADIN/themes/contacts/icons/32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/lock.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/lock.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/note.png b/WebContent/VAADIN/themes/contacts/icons/32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/note.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/note.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/ok.png b/WebContent/VAADIN/themes/contacts/icons/32/ok.png
index ac0438828c..ac0438828c 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/ok.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/ok.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/reload.png b/WebContent/VAADIN/themes/contacts/icons/32/reload.png
index c3556ec890..c3556ec890 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/reload.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/reload.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/settings.png b/WebContent/VAADIN/themes/contacts/icons/32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/settings.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/settings.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/trash-full.png b/WebContent/VAADIN/themes/contacts/icons/32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/trash-full.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/trash-full.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/trash.png b/WebContent/VAADIN/themes/contacts/icons/32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/trash.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/trash.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/user.png b/WebContent/VAADIN/themes/contacts/icons/32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/user.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/user.png
diff --git a/WebContent/ITMILL/themes/contacts/icons/32/users.png b/WebContent/VAADIN/themes/contacts/icons/32/users.png
index af225a9e46..af225a9e46 100644
--- a/WebContent/ITMILL/themes/contacts/icons/32/users.png
+++ b/WebContent/VAADIN/themes/contacts/icons/32/users.png
diff --git a/WebContent/ITMILL/themes/contacts/images/gradient.png b/WebContent/VAADIN/themes/contacts/images/gradient.png
index d609412ce2..d609412ce2 100644
--- a/WebContent/ITMILL/themes/contacts/images/gradient.png
+++ b/WebContent/VAADIN/themes/contacts/images/gradient.png
diff --git a/WebContent/ITMILL/themes/contacts/images/logo.png b/WebContent/VAADIN/themes/contacts/images/logo.png
index 7999626a66..7999626a66 100644
--- a/WebContent/ITMILL/themes/contacts/images/logo.png
+++ b/WebContent/VAADIN/themes/contacts/images/logo.png
diff --git a/WebContent/ITMILL/themes/contacts/images/table-header-bg.png b/WebContent/VAADIN/themes/contacts/images/table-header-bg.png
index a7b13ae6aa..a7b13ae6aa 100644
--- a/WebContent/ITMILL/themes/contacts/images/table-header-bg.png
+++ b/WebContent/VAADIN/themes/contacts/images/table-header-bg.png
diff --git a/WebContent/ITMILL/themes/contacts/styles.css b/WebContent/VAADIN/themes/contacts/styles.css
index 8425158680..8425158680 100644
--- a/WebContent/ITMILL/themes/contacts/styles.css
+++ b/WebContent/VAADIN/themes/contacts/styles.css
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.000.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.000.jpg
index 81ce189440..81ce189440 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.000.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.000.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.001.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.001.jpg
index 0040565e98..0040565e98 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.001.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.001.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.002.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.002.jpg
index 78da40cbf8..78da40cbf8 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.002.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.002.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.003.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.003.jpg
index 10b6390d65..10b6390d65 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.003.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.003.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.004.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.004.jpg
index ed8a6b29c1..ed8a6b29c1 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.004.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.004.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.005.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.005.jpg
index 528cf934bf..528cf934bf 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.005.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.005.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.006.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.006.jpg
index 8c45bb4a1e..8c45bb4a1e 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.006.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.006.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.007.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.007.jpg
index 6c5bee25dd..6c5bee25dd 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.007.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.007.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.008.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.008.jpg
index ef66bf4a97..ef66bf4a97 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.008.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.008.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.009.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.009.jpg
index ebe38538c7..ebe38538c7 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.009.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.009.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.010.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.010.jpg
index b03cd84404..b03cd84404 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.010.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.010.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.011.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.011.jpg
index 30edf8b318..30edf8b318 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.011.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.011.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.012.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.012.jpg
index 1581afcdf5..1581afcdf5 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.012.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.012.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.013.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.013.jpg
index 83494dab3a..83494dab3a 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.013.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.013.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.014.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.014.jpg
index 89211a0823..89211a0823 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.014.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.014.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.015.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.015.jpg
index a0d91a2661..a0d91a2661 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.015.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.015.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.016.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.016.jpg
index 889aa8221a..889aa8221a 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.016.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.016.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.017.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.017.jpg
index 85216e2a66..85216e2a66 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.017.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.017.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.018.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.018.jpg
index ec1273329c..ec1273329c 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.018.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.018.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.019.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.019.jpg
index 2cfd4e290f..2cfd4e290f 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.019.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.019.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.020.jpg b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.020.jpg
index ec1273329c..ec1273329c 100644
--- a/WebContent/ITMILL/themes/coverflow/images/slideshow-example.020.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/slideshow-example.020.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.000.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.000.jpg
index 8c2214a68c..8c2214a68c 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.000.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.000.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.001.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.001.jpg
index 2ee07c0efb..2ee07c0efb 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.001.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.001.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.002.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.002.jpg
index 2d3178a44f..2d3178a44f 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.002.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.002.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.003.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.003.jpg
index 8b72ecdc69..8b72ecdc69 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.003.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.003.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.004.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.004.jpg
index 8dc0466d6c..8dc0466d6c 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.004.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.004.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.005.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.005.jpg
index 8ddd11f0b0..8ddd11f0b0 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.005.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.005.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.006.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.006.jpg
index f428f0e702..f428f0e702 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.006.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.006.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.007.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.007.jpg
index 2e2420ea58..2e2420ea58 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.007.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.007.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.008.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.008.jpg
index 6a4fa7416d..6a4fa7416d 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.008.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.008.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.009.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.009.jpg
index 3fa0a0d3ae..3fa0a0d3ae 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.009.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.009.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.010.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.010.jpg
index 041545fa1d..041545fa1d 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.010.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.010.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.011.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.011.jpg
index 27c6f22809..27c6f22809 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.011.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.011.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.012.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.012.jpg
index bbbb7e5304..bbbb7e5304 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.012.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.012.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.013.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.013.jpg
index 7803f7e3d8..7803f7e3d8 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.013.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.013.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.014.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.014.jpg
index f3543a253e..f3543a253e 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.014.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.014.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.015.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.015.jpg
index aa972a7185..aa972a7185 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.015.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.015.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.016.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.016.jpg
index 0f2bbd0bdf..0f2bbd0bdf 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.016.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.016.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.017.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.017.jpg
index cdd2e12d65..cdd2e12d65 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.017.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.017.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.018.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.018.jpg
index 318de01a99..318de01a99 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.018.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.018.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.019.jpg b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.019.jpg
index 8ca3ffd94e..8ca3ffd94e 100644
--- a/WebContent/ITMILL/themes/coverflow/images/thumbs/slideshow-example.019.jpg
+++ b/WebContent/VAADIN/themes/coverflow/images/thumbs/slideshow-example.019.jpg
diff --git a/WebContent/ITMILL/themes/coverflow/styles.css b/WebContent/VAADIN/themes/coverflow/styles.css
index b33cf5dfb7..b33cf5dfb7 100644
--- a/WebContent/ITMILL/themes/coverflow/styles.css
+++ b/WebContent/VAADIN/themes/coverflow/styles.css
diff --git a/WebContent/ITMILL/themes/default/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/default/absolutelayout/absolutelayout.css
index 9373b73db8..9373b73db8 100644
--- a/WebContent/ITMILL/themes/default/absolutelayout/absolutelayout.css
+++ b/WebContent/VAADIN/themes/default/absolutelayout/absolutelayout.css
diff --git a/WebContent/ITMILL/themes/default/accordion/accordion.css b/WebContent/VAADIN/themes/default/accordion/accordion.css
index b51b6e8b03..b51b6e8b03 100644
--- a/WebContent/ITMILL/themes/default/accordion/accordion.css
+++ b/WebContent/VAADIN/themes/default/accordion/accordion.css
diff --git a/WebContent/ITMILL/themes/default/accordion/img/collapsed-icon.png b/WebContent/VAADIN/themes/default/accordion/img/collapsed-icon.png
index 1443459eb4..1443459eb4 100755
--- a/WebContent/ITMILL/themes/default/accordion/img/collapsed-icon.png
+++ b/WebContent/VAADIN/themes/default/accordion/img/collapsed-icon.png
diff --git a/WebContent/ITMILL/themes/default/accordion/img/expanded-icon.png b/WebContent/VAADIN/themes/default/accordion/img/expanded-icon.png
index 8a28fb8811..8a28fb8811 100755
--- a/WebContent/ITMILL/themes/default/accordion/img/expanded-icon.png
+++ b/WebContent/VAADIN/themes/default/accordion/img/expanded-icon.png
diff --git a/WebContent/ITMILL/themes/default/accordion/img/selected-bg.png b/WebContent/VAADIN/themes/default/accordion/img/selected-bg.png
index 99dca1c2d9..99dca1c2d9 100755
--- a/WebContent/ITMILL/themes/default/accordion/img/selected-bg.png
+++ b/WebContent/VAADIN/themes/default/accordion/img/selected-bg.png
diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/VAADIN/themes/default/button/button.css
index 4b4cc14759..4b4cc14759 100644
--- a/WebContent/ITMILL/themes/default/button/button.css
+++ b/WebContent/VAADIN/themes/default/button/button.css
diff --git a/WebContent/ITMILL/themes/default/caption/caption.css b/WebContent/VAADIN/themes/default/caption/caption.css
index d5be467822..d5be467822 100644
--- a/WebContent/ITMILL/themes/default/caption/caption.css
+++ b/WebContent/VAADIN/themes/default/caption/caption.css
diff --git a/WebContent/ITMILL/themes/default/common/common.css b/WebContent/VAADIN/themes/default/common/common.css
index 5f564e3997..5f564e3997 100644
--- a/WebContent/ITMILL/themes/default/common/common.css
+++ b/WebContent/VAADIN/themes/default/common/common.css
diff --git a/WebContent/ITMILL/themes/default/common/img/ajax-loader-big.gif b/WebContent/VAADIN/themes/default/common/img/ajax-loader-big.gif
index 73dc88e31f..73dc88e31f 100644
--- a/WebContent/ITMILL/themes/default/common/img/ajax-loader-big.gif
+++ b/WebContent/VAADIN/themes/default/common/img/ajax-loader-big.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/ajax-loader-medium.gif b/WebContent/VAADIN/themes/default/common/img/ajax-loader-medium.gif
index 0a0c6aaef0..0a0c6aaef0 100644
--- a/WebContent/ITMILL/themes/default/common/img/ajax-loader-medium.gif
+++ b/WebContent/VAADIN/themes/default/common/img/ajax-loader-medium.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/ajax-loader.gif b/WebContent/VAADIN/themes/default/common/img/ajax-loader.gif
index 354dc4685c..354dc4685c 100755
--- a/WebContent/ITMILL/themes/default/common/img/ajax-loader.gif
+++ b/WebContent/VAADIN/themes/default/common/img/ajax-loader.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/blank.gif b/WebContent/VAADIN/themes/default/common/img/blank.gif
index 3776af0784..3776af0784 100644
--- a/WebContent/ITMILL/themes/default/common/img/blank.gif
+++ b/WebContent/VAADIN/themes/default/common/img/blank.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/loading-indicator-delay.gif b/WebContent/VAADIN/themes/default/common/img/loading-indicator-delay.gif
index 48810bb064..48810bb064 100755
--- a/WebContent/ITMILL/themes/default/common/img/loading-indicator-delay.gif
+++ b/WebContent/VAADIN/themes/default/common/img/loading-indicator-delay.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/loading-indicator-wait.gif b/WebContent/VAADIN/themes/default/common/img/loading-indicator-wait.gif
index 5f7aab9afd..5f7aab9afd 100755
--- a/WebContent/ITMILL/themes/default/common/img/loading-indicator-wait.gif
+++ b/WebContent/VAADIN/themes/default/common/img/loading-indicator-wait.gif
diff --git a/WebContent/ITMILL/themes/default/common/img/loading-indicator.gif b/WebContent/VAADIN/themes/default/common/img/loading-indicator.gif
index cedaa56b10..cedaa56b10 100755
--- a/WebContent/ITMILL/themes/default/common/img/loading-indicator.gif
+++ b/WebContent/VAADIN/themes/default/common/img/loading-indicator.gif
diff --git a/WebContent/ITMILL/themes/default/datefield/datefield.css b/WebContent/VAADIN/themes/default/datefield/datefield.css
index 010ce3aef9..010ce3aef9 100644
--- a/WebContent/ITMILL/themes/default/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/default/datefield/datefield.css
diff --git a/WebContent/ITMILL/themes/default/datefield/img/nextmonth.png b/WebContent/VAADIN/themes/default/datefield/img/nextmonth.png
index 3315125dd1..3315125dd1 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/nextmonth.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/nextmonth.png
diff --git a/WebContent/ITMILL/themes/default/datefield/img/nextyear.png b/WebContent/VAADIN/themes/default/datefield/img/nextyear.png
index 22633fd31a..22633fd31a 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/nextyear.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/nextyear.png
diff --git a/WebContent/ITMILL/themes/default/datefield/img/open-button.png b/WebContent/VAADIN/themes/default/datefield/img/open-button.png
index 548ca12f70..548ca12f70 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/open-button.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/open-button.png
diff --git a/WebContent/ITMILL/themes/default/datefield/img/prevmonth.png b/WebContent/VAADIN/themes/default/datefield/img/prevmonth.png
index d114632fef..d114632fef 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/prevmonth.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/prevmonth.png
diff --git a/WebContent/ITMILL/themes/default/datefield/img/prevyear.png b/WebContent/VAADIN/themes/default/datefield/img/prevyear.png
index f174713092..f174713092 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/prevyear.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/prevyear.png
diff --git a/WebContent/ITMILL/themes/default/datefield/img/selected-bg.png b/WebContent/VAADIN/themes/default/datefield/img/selected-bg.png
index 799915ab8f..799915ab8f 100644
--- a/WebContent/ITMILL/themes/default/datefield/img/selected-bg.png
+++ b/WebContent/VAADIN/themes/default/datefield/img/selected-bg.png
diff --git a/WebContent/ITMILL/themes/default/favicon.ico b/WebContent/VAADIN/themes/default/favicon.ico
index 2c731f8f85..2c731f8f85 100644
--- a/WebContent/ITMILL/themes/default/favicon.ico
+++ b/WebContent/VAADIN/themes/default/favicon.ico
diff --git a/WebContent/ITMILL/themes/default/formlayout/formlayout.css b/WebContent/VAADIN/themes/default/formlayout/formlayout.css
index 86e66a841d..86e66a841d 100644
--- a/WebContent/ITMILL/themes/default/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/default/formlayout/formlayout.css
diff --git a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/default/gridlayout/gridlayout.css
index a9c1fef15e..a9c1fef15e 100644
--- a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css
+++ b/WebContent/VAADIN/themes/default/gridlayout/gridlayout.css
diff --git a/WebContent/ITMILL/themes/default/icons/16/arrow-down.png b/WebContent/VAADIN/themes/default/icons/16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/WebContent/ITMILL/themes/default/icons/16/arrow-down.png
+++ b/WebContent/VAADIN/themes/default/icons/16/arrow-down.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/arrow-left.png b/WebContent/VAADIN/themes/default/icons/16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/WebContent/ITMILL/themes/default/icons/16/arrow-left.png
+++ b/WebContent/VAADIN/themes/default/icons/16/arrow-left.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/arrow-right.png b/WebContent/VAADIN/themes/default/icons/16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/WebContent/ITMILL/themes/default/icons/16/arrow-right.png
+++ b/WebContent/VAADIN/themes/default/icons/16/arrow-right.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/arrow-up.png b/WebContent/VAADIN/themes/default/icons/16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/WebContent/ITMILL/themes/default/icons/16/arrow-up.png
+++ b/WebContent/VAADIN/themes/default/icons/16/arrow-up.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/attention.png b/WebContent/VAADIN/themes/default/icons/16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/WebContent/ITMILL/themes/default/icons/16/attention.png
+++ b/WebContent/VAADIN/themes/default/icons/16/attention.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/calendar.png b/WebContent/VAADIN/themes/default/icons/16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/WebContent/ITMILL/themes/default/icons/16/calendar.png
+++ b/WebContent/VAADIN/themes/default/icons/16/calendar.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/cancel.png b/WebContent/VAADIN/themes/default/icons/16/cancel.png
index 19a0783733..19a0783733 100644
--- a/WebContent/ITMILL/themes/default/icons/16/cancel.png
+++ b/WebContent/VAADIN/themes/default/icons/16/cancel.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-add.png b/WebContent/VAADIN/themes/default/icons/16/document-add.png
index d84e349526..d84e349526 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-add.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-delete.png b/WebContent/VAADIN/themes/default/icons/16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-doc.png b/WebContent/VAADIN/themes/default/icons/16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-doc.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-doc.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-image.png b/WebContent/VAADIN/themes/default/icons/16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-image.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-image.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-pdf.png b/WebContent/VAADIN/themes/default/icons/16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-pdf.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-pdf.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-ppt.png b/WebContent/VAADIN/themes/default/icons/16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-ppt.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-ppt.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-txt.png b/WebContent/VAADIN/themes/default/icons/16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-txt.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-txt.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-web.png b/WebContent/VAADIN/themes/default/icons/16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-web.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-web.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document-xsl.png b/WebContent/VAADIN/themes/default/icons/16/document-xsl.png
index 571823847f..571823847f 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document-xsl.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document-xsl.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/document.png b/WebContent/VAADIN/themes/default/icons/16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/WebContent/ITMILL/themes/default/icons/16/document.png
+++ b/WebContent/VAADIN/themes/default/icons/16/document.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/email-reply.png b/WebContent/VAADIN/themes/default/icons/16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/WebContent/ITMILL/themes/default/icons/16/email-reply.png
+++ b/WebContent/VAADIN/themes/default/icons/16/email-reply.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/email-send.png b/WebContent/VAADIN/themes/default/icons/16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/WebContent/ITMILL/themes/default/icons/16/email-send.png
+++ b/WebContent/VAADIN/themes/default/icons/16/email-send.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/email.png b/WebContent/VAADIN/themes/default/icons/16/email.png
index 68d6c93465..68d6c93465 100644
--- a/WebContent/ITMILL/themes/default/icons/16/email.png
+++ b/WebContent/VAADIN/themes/default/icons/16/email.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/error.gif b/WebContent/VAADIN/themes/default/icons/16/error.gif
index c9582b2c28..c9582b2c28 100644
--- a/WebContent/ITMILL/themes/default/icons/16/error.gif
+++ b/WebContent/VAADIN/themes/default/icons/16/error.gif
diff --git a/WebContent/ITMILL/themes/default/icons/16/error.png b/WebContent/VAADIN/themes/default/icons/16/error.png
index 0141e4dfc3..0141e4dfc3 100755
--- a/WebContent/ITMILL/themes/default/icons/16/error.png
+++ b/WebContent/VAADIN/themes/default/icons/16/error.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/folder-add.png b/WebContent/VAADIN/themes/default/icons/16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/WebContent/ITMILL/themes/default/icons/16/folder-add.png
+++ b/WebContent/VAADIN/themes/default/icons/16/folder-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/folder-delete.png b/WebContent/VAADIN/themes/default/icons/16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/WebContent/ITMILL/themes/default/icons/16/folder-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/16/folder-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/folder.png b/WebContent/VAADIN/themes/default/icons/16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/WebContent/ITMILL/themes/default/icons/16/folder.png
+++ b/WebContent/VAADIN/themes/default/icons/16/folder.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/globe.png b/WebContent/VAADIN/themes/default/icons/16/globe.png
index ea4034c149..ea4034c149 100644
--- a/WebContent/ITMILL/themes/default/icons/16/globe.png
+++ b/WebContent/VAADIN/themes/default/icons/16/globe.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/help.png b/WebContent/VAADIN/themes/default/icons/16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/WebContent/ITMILL/themes/default/icons/16/help.png
+++ b/WebContent/VAADIN/themes/default/icons/16/help.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/lock.png b/WebContent/VAADIN/themes/default/icons/16/lock.png
index 29f1023613..29f1023613 100644
--- a/WebContent/ITMILL/themes/default/icons/16/lock.png
+++ b/WebContent/VAADIN/themes/default/icons/16/lock.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/note.png b/WebContent/VAADIN/themes/default/icons/16/note.png
index efafae5570..efafae5570 100644
--- a/WebContent/ITMILL/themes/default/icons/16/note.png
+++ b/WebContent/VAADIN/themes/default/icons/16/note.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/ok.png b/WebContent/VAADIN/themes/default/icons/16/ok.png
index 89591faef2..89591faef2 100644
--- a/WebContent/ITMILL/themes/default/icons/16/ok.png
+++ b/WebContent/VAADIN/themes/default/icons/16/ok.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/reload.png b/WebContent/VAADIN/themes/default/icons/16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/WebContent/ITMILL/themes/default/icons/16/reload.png
+++ b/WebContent/VAADIN/themes/default/icons/16/reload.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/settings.png b/WebContent/VAADIN/themes/default/icons/16/settings.png
index 019f0df663..019f0df663 100644
--- a/WebContent/ITMILL/themes/default/icons/16/settings.png
+++ b/WebContent/VAADIN/themes/default/icons/16/settings.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/trash-full.png b/WebContent/VAADIN/themes/default/icons/16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/WebContent/ITMILL/themes/default/icons/16/trash-full.png
+++ b/WebContent/VAADIN/themes/default/icons/16/trash-full.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/trash.png b/WebContent/VAADIN/themes/default/icons/16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/WebContent/ITMILL/themes/default/icons/16/trash.png
+++ b/WebContent/VAADIN/themes/default/icons/16/trash.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/user.png b/WebContent/VAADIN/themes/default/icons/16/user.png
index 522f864884..522f864884 100644
--- a/WebContent/ITMILL/themes/default/icons/16/user.png
+++ b/WebContent/VAADIN/themes/default/icons/16/user.png
diff --git a/WebContent/ITMILL/themes/default/icons/16/users.png b/WebContent/VAADIN/themes/default/icons/16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/WebContent/ITMILL/themes/default/icons/16/users.png
+++ b/WebContent/VAADIN/themes/default/icons/16/users.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/arrow-down.png b/WebContent/VAADIN/themes/default/icons/32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/WebContent/ITMILL/themes/default/icons/32/arrow-down.png
+++ b/WebContent/VAADIN/themes/default/icons/32/arrow-down.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/arrow-left.png b/WebContent/VAADIN/themes/default/icons/32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/WebContent/ITMILL/themes/default/icons/32/arrow-left.png
+++ b/WebContent/VAADIN/themes/default/icons/32/arrow-left.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/arrow-right.png b/WebContent/VAADIN/themes/default/icons/32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/WebContent/ITMILL/themes/default/icons/32/arrow-right.png
+++ b/WebContent/VAADIN/themes/default/icons/32/arrow-right.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/arrow-up.png b/WebContent/VAADIN/themes/default/icons/32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/WebContent/ITMILL/themes/default/icons/32/arrow-up.png
+++ b/WebContent/VAADIN/themes/default/icons/32/arrow-up.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/attention.png b/WebContent/VAADIN/themes/default/icons/32/attention.png
index 6b00733567..6b00733567 100644
--- a/WebContent/ITMILL/themes/default/icons/32/attention.png
+++ b/WebContent/VAADIN/themes/default/icons/32/attention.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/calendar.png b/WebContent/VAADIN/themes/default/icons/32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/WebContent/ITMILL/themes/default/icons/32/calendar.png
+++ b/WebContent/VAADIN/themes/default/icons/32/calendar.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/cancel.png b/WebContent/VAADIN/themes/default/icons/32/cancel.png
index 725240d558..725240d558 100644
--- a/WebContent/ITMILL/themes/default/icons/32/cancel.png
+++ b/WebContent/VAADIN/themes/default/icons/32/cancel.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-add.png b/WebContent/VAADIN/themes/default/icons/32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-add.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-delete.png b/WebContent/VAADIN/themes/default/icons/32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-doc.png b/WebContent/VAADIN/themes/default/icons/32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-doc.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-doc.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-edit.png b/WebContent/VAADIN/themes/default/icons/32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-edit.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-edit.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-image.png b/WebContent/VAADIN/themes/default/icons/32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-image.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-image.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-pdf.png b/WebContent/VAADIN/themes/default/icons/32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-pdf.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-pdf.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-ppt.png b/WebContent/VAADIN/themes/default/icons/32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-ppt.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-ppt.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-txt.png b/WebContent/VAADIN/themes/default/icons/32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-txt.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-txt.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-web.png b/WebContent/VAADIN/themes/default/icons/32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-web.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-web.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document-xsl.png b/WebContent/VAADIN/themes/default/icons/32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document-xsl.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document-xsl.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/document.png b/WebContent/VAADIN/themes/default/icons/32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/WebContent/ITMILL/themes/default/icons/32/document.png
+++ b/WebContent/VAADIN/themes/default/icons/32/document.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/email-reply.png b/WebContent/VAADIN/themes/default/icons/32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/WebContent/ITMILL/themes/default/icons/32/email-reply.png
+++ b/WebContent/VAADIN/themes/default/icons/32/email-reply.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/email-send.png b/WebContent/VAADIN/themes/default/icons/32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/WebContent/ITMILL/themes/default/icons/32/email-send.png
+++ b/WebContent/VAADIN/themes/default/icons/32/email-send.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/email.png b/WebContent/VAADIN/themes/default/icons/32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/WebContent/ITMILL/themes/default/icons/32/email.png
+++ b/WebContent/VAADIN/themes/default/icons/32/email.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/folder-add.png b/WebContent/VAADIN/themes/default/icons/32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/WebContent/ITMILL/themes/default/icons/32/folder-add.png
+++ b/WebContent/VAADIN/themes/default/icons/32/folder-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/folder-delete.png b/WebContent/VAADIN/themes/default/icons/32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/WebContent/ITMILL/themes/default/icons/32/folder-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/32/folder-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/folder.png b/WebContent/VAADIN/themes/default/icons/32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/WebContent/ITMILL/themes/default/icons/32/folder.png
+++ b/WebContent/VAADIN/themes/default/icons/32/folder.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/globe.png b/WebContent/VAADIN/themes/default/icons/32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/WebContent/ITMILL/themes/default/icons/32/globe.png
+++ b/WebContent/VAADIN/themes/default/icons/32/globe.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/help.png b/WebContent/VAADIN/themes/default/icons/32/help.png
index 218910c98d..218910c98d 100644
--- a/WebContent/ITMILL/themes/default/icons/32/help.png
+++ b/WebContent/VAADIN/themes/default/icons/32/help.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/lock.png b/WebContent/VAADIN/themes/default/icons/32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/WebContent/ITMILL/themes/default/icons/32/lock.png
+++ b/WebContent/VAADIN/themes/default/icons/32/lock.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/note.png b/WebContent/VAADIN/themes/default/icons/32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/WebContent/ITMILL/themes/default/icons/32/note.png
+++ b/WebContent/VAADIN/themes/default/icons/32/note.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/ok.png b/WebContent/VAADIN/themes/default/icons/32/ok.png
index ac0438828c..ac0438828c 100644
--- a/WebContent/ITMILL/themes/default/icons/32/ok.png
+++ b/WebContent/VAADIN/themes/default/icons/32/ok.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/reload.png b/WebContent/VAADIN/themes/default/icons/32/reload.png
index c3556ec890..c3556ec890 100644
--- a/WebContent/ITMILL/themes/default/icons/32/reload.png
+++ b/WebContent/VAADIN/themes/default/icons/32/reload.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/settings.png b/WebContent/VAADIN/themes/default/icons/32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/WebContent/ITMILL/themes/default/icons/32/settings.png
+++ b/WebContent/VAADIN/themes/default/icons/32/settings.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/trash-full.png b/WebContent/VAADIN/themes/default/icons/32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/WebContent/ITMILL/themes/default/icons/32/trash-full.png
+++ b/WebContent/VAADIN/themes/default/icons/32/trash-full.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/trash.png b/WebContent/VAADIN/themes/default/icons/32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/WebContent/ITMILL/themes/default/icons/32/trash.png
+++ b/WebContent/VAADIN/themes/default/icons/32/trash.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/user.png b/WebContent/VAADIN/themes/default/icons/32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/WebContent/ITMILL/themes/default/icons/32/user.png
+++ b/WebContent/VAADIN/themes/default/icons/32/user.png
diff --git a/WebContent/ITMILL/themes/default/icons/32/users.png b/WebContent/VAADIN/themes/default/icons/32/users.png
index af225a9e46..af225a9e46 100644
--- a/WebContent/ITMILL/themes/default/icons/32/users.png
+++ b/WebContent/VAADIN/themes/default/icons/32/users.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/arrow-down.png b/WebContent/VAADIN/themes/default/icons/64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/WebContent/ITMILL/themes/default/icons/64/arrow-down.png
+++ b/WebContent/VAADIN/themes/default/icons/64/arrow-down.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/arrow-left.png b/WebContent/VAADIN/themes/default/icons/64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/WebContent/ITMILL/themes/default/icons/64/arrow-left.png
+++ b/WebContent/VAADIN/themes/default/icons/64/arrow-left.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/arrow-right.png b/WebContent/VAADIN/themes/default/icons/64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/WebContent/ITMILL/themes/default/icons/64/arrow-right.png
+++ b/WebContent/VAADIN/themes/default/icons/64/arrow-right.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/arrow-up.png b/WebContent/VAADIN/themes/default/icons/64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/WebContent/ITMILL/themes/default/icons/64/arrow-up.png
+++ b/WebContent/VAADIN/themes/default/icons/64/arrow-up.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/attention.png b/WebContent/VAADIN/themes/default/icons/64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/WebContent/ITMILL/themes/default/icons/64/attention.png
+++ b/WebContent/VAADIN/themes/default/icons/64/attention.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/calendar.png b/WebContent/VAADIN/themes/default/icons/64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/WebContent/ITMILL/themes/default/icons/64/calendar.png
+++ b/WebContent/VAADIN/themes/default/icons/64/calendar.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/cancel.png b/WebContent/VAADIN/themes/default/icons/64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/WebContent/ITMILL/themes/default/icons/64/cancel.png
+++ b/WebContent/VAADIN/themes/default/icons/64/cancel.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-add.png b/WebContent/VAADIN/themes/default/icons/64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-add.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-delete.png b/WebContent/VAADIN/themes/default/icons/64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-doc.png b/WebContent/VAADIN/themes/default/icons/64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-doc.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-doc.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-edit.png b/WebContent/VAADIN/themes/default/icons/64/document-edit.png
index 6af96c9b77..6af96c9b77 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-edit.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-edit.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-image.png b/WebContent/VAADIN/themes/default/icons/64/document-image.png
index 079978e850..079978e850 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-image.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-image.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-pdf.png b/WebContent/VAADIN/themes/default/icons/64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-pdf.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-pdf.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-ppt.png b/WebContent/VAADIN/themes/default/icons/64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-ppt.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-ppt.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-txt.png b/WebContent/VAADIN/themes/default/icons/64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-txt.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-txt.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-web.png b/WebContent/VAADIN/themes/default/icons/64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-web.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-web.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document-xls.png b/WebContent/VAADIN/themes/default/icons/64/document-xls.png
index 6008085a34..6008085a34 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document-xls.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document-xls.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/document.png b/WebContent/VAADIN/themes/default/icons/64/document.png
index 224de0bc84..224de0bc84 100644
--- a/WebContent/ITMILL/themes/default/icons/64/document.png
+++ b/WebContent/VAADIN/themes/default/icons/64/document.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/email-reply.png b/WebContent/VAADIN/themes/default/icons/64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/WebContent/ITMILL/themes/default/icons/64/email-reply.png
+++ b/WebContent/VAADIN/themes/default/icons/64/email-reply.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/email-send.png b/WebContent/VAADIN/themes/default/icons/64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/WebContent/ITMILL/themes/default/icons/64/email-send.png
+++ b/WebContent/VAADIN/themes/default/icons/64/email-send.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/email.png b/WebContent/VAADIN/themes/default/icons/64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/WebContent/ITMILL/themes/default/icons/64/email.png
+++ b/WebContent/VAADIN/themes/default/icons/64/email.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/folder-add.png b/WebContent/VAADIN/themes/default/icons/64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/WebContent/ITMILL/themes/default/icons/64/folder-add.png
+++ b/WebContent/VAADIN/themes/default/icons/64/folder-add.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/folder-delete.png b/WebContent/VAADIN/themes/default/icons/64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/WebContent/ITMILL/themes/default/icons/64/folder-delete.png
+++ b/WebContent/VAADIN/themes/default/icons/64/folder-delete.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/folder.png b/WebContent/VAADIN/themes/default/icons/64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/WebContent/ITMILL/themes/default/icons/64/folder.png
+++ b/WebContent/VAADIN/themes/default/icons/64/folder.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/globe.png b/WebContent/VAADIN/themes/default/icons/64/globe.png
index 1786635b45..1786635b45 100644
--- a/WebContent/ITMILL/themes/default/icons/64/globe.png
+++ b/WebContent/VAADIN/themes/default/icons/64/globe.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/help.png b/WebContent/VAADIN/themes/default/icons/64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/WebContent/ITMILL/themes/default/icons/64/help.png
+++ b/WebContent/VAADIN/themes/default/icons/64/help.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/lock.png b/WebContent/VAADIN/themes/default/icons/64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/WebContent/ITMILL/themes/default/icons/64/lock.png
+++ b/WebContent/VAADIN/themes/default/icons/64/lock.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/note.png b/WebContent/VAADIN/themes/default/icons/64/note.png
index 1383847ed1..1383847ed1 100644
--- a/WebContent/ITMILL/themes/default/icons/64/note.png
+++ b/WebContent/VAADIN/themes/default/icons/64/note.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/ok.png b/WebContent/VAADIN/themes/default/icons/64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/WebContent/ITMILL/themes/default/icons/64/ok.png
+++ b/WebContent/VAADIN/themes/default/icons/64/ok.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/reload.png b/WebContent/VAADIN/themes/default/icons/64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/WebContent/ITMILL/themes/default/icons/64/reload.png
+++ b/WebContent/VAADIN/themes/default/icons/64/reload.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/settings.png b/WebContent/VAADIN/themes/default/icons/64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/WebContent/ITMILL/themes/default/icons/64/settings.png
+++ b/WebContent/VAADIN/themes/default/icons/64/settings.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/trash-full.png b/WebContent/VAADIN/themes/default/icons/64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/WebContent/ITMILL/themes/default/icons/64/trash-full.png
+++ b/WebContent/VAADIN/themes/default/icons/64/trash-full.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/trash.png b/WebContent/VAADIN/themes/default/icons/64/trash.png
index 41ef761061..41ef761061 100644
--- a/WebContent/ITMILL/themes/default/icons/64/trash.png
+++ b/WebContent/VAADIN/themes/default/icons/64/trash.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/user.png b/WebContent/VAADIN/themes/default/icons/64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/WebContent/ITMILL/themes/default/icons/64/user.png
+++ b/WebContent/VAADIN/themes/default/icons/64/user.png
diff --git a/WebContent/ITMILL/themes/default/icons/64/users.png b/WebContent/VAADIN/themes/default/icons/64/users.png
index 3a42c17790..3a42c17790 100644
--- a/WebContent/ITMILL/themes/default/icons/64/users.png
+++ b/WebContent/VAADIN/themes/default/icons/64/users.png
diff --git a/WebContent/ITMILL/themes/default/link/link.css b/WebContent/VAADIN/themes/default/link/link.css
index a123156cb6..a123156cb6 100644
--- a/WebContent/ITMILL/themes/default/link/link.css
+++ b/WebContent/VAADIN/themes/default/link/link.css
diff --git a/WebContent/ITMILL/themes/default/menubar/menubar.css b/WebContent/VAADIN/themes/default/menubar/menubar.css
index 650d00b1f2..650d00b1f2 100644
--- a/WebContent/ITMILL/themes/default/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/default/menubar/menubar.css
diff --git a/WebContent/ITMILL/themes/default/notification/img/close-error.png b/WebContent/VAADIN/themes/default/notification/img/close-error.png
index f52c922111..f52c922111 100644
--- a/WebContent/ITMILL/themes/default/notification/img/close-error.png
+++ b/WebContent/VAADIN/themes/default/notification/img/close-error.png
diff --git a/WebContent/ITMILL/themes/default/notification/notification.css b/WebContent/VAADIN/themes/default/notification/notification.css
index 387a7d1886..387a7d1886 100644
--- a/WebContent/ITMILL/themes/default/notification/notification.css
+++ b/WebContent/VAADIN/themes/default/notification/notification.css
diff --git a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/default/orderedlayout/orderedlayout.css
index e9c431ecdd..e9c431ecdd 100644
--- a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
+++ b/WebContent/VAADIN/themes/default/orderedlayout/orderedlayout.css
diff --git a/WebContent/ITMILL/themes/default/panel/img/bottom-left.png b/WebContent/VAADIN/themes/default/panel/img/bottom-left.png
index d5c950bc45..d5c950bc45 100644
--- a/WebContent/ITMILL/themes/default/panel/img/bottom-left.png
+++ b/WebContent/VAADIN/themes/default/panel/img/bottom-left.png
diff --git a/WebContent/ITMILL/themes/default/panel/img/bottom-right.png b/WebContent/VAADIN/themes/default/panel/img/bottom-right.png
index 3ad916f694..3ad916f694 100644
--- a/WebContent/ITMILL/themes/default/panel/img/bottom-right.png
+++ b/WebContent/VAADIN/themes/default/panel/img/bottom-right.png
diff --git a/WebContent/ITMILL/themes/default/panel/img/top-left.png b/WebContent/VAADIN/themes/default/panel/img/top-left.png
index 8108eab8e4..8108eab8e4 100644
--- a/WebContent/ITMILL/themes/default/panel/img/top-left.png
+++ b/WebContent/VAADIN/themes/default/panel/img/top-left.png
diff --git a/WebContent/ITMILL/themes/default/panel/img/top-right.png b/WebContent/VAADIN/themes/default/panel/img/top-right.png
index e981d430ce..e981d430ce 100644
--- a/WebContent/ITMILL/themes/default/panel/img/top-right.png
+++ b/WebContent/VAADIN/themes/default/panel/img/top-right.png
diff --git a/WebContent/ITMILL/themes/default/panel/panel.css b/WebContent/VAADIN/themes/default/panel/panel.css
index bfed4242f4..bfed4242f4 100644
--- a/WebContent/ITMILL/themes/default/panel/panel.css
+++ b/WebContent/VAADIN/themes/default/panel/panel.css
diff --git a/WebContent/ITMILL/themes/default/popupview/popupview.css b/WebContent/VAADIN/themes/default/popupview/popupview.css
index 73437c6bac..73437c6bac 100644
--- a/WebContent/ITMILL/themes/default/popupview/popupview.css
+++ b/WebContent/VAADIN/themes/default/popupview/popupview.css
diff --git a/WebContent/ITMILL/themes/default/progressindicator/img/base.gif b/WebContent/VAADIN/themes/default/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/WebContent/ITMILL/themes/default/progressindicator/img/base.gif
+++ b/WebContent/VAADIN/themes/default/progressindicator/img/base.gif
diff --git a/WebContent/ITMILL/themes/default/progressindicator/img/disabled.gif b/WebContent/VAADIN/themes/default/progressindicator/img/disabled.gif
index 7a64d034b2..7a64d034b2 100644
--- a/WebContent/ITMILL/themes/default/progressindicator/img/disabled.gif
+++ b/WebContent/VAADIN/themes/default/progressindicator/img/disabled.gif
diff --git a/WebContent/ITMILL/themes/default/progressindicator/img/progress.png b/WebContent/VAADIN/themes/default/progressindicator/img/progress.png
index c1aca57369..c1aca57369 100644
--- a/WebContent/ITMILL/themes/default/progressindicator/img/progress.png
+++ b/WebContent/VAADIN/themes/default/progressindicator/img/progress.png
diff --git a/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/default/progressindicator/progressindicator.css
index 41f797dc8b..41f797dc8b 100644
--- a/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
+++ b/WebContent/VAADIN/themes/default/progressindicator/progressindicator.css
diff --git a/WebContent/ITMILL/themes/default/select/img/arrow-down.png b/WebContent/VAADIN/themes/default/select/img/arrow-down.png
index ee795fd069..ee795fd069 100644
--- a/WebContent/ITMILL/themes/default/select/img/arrow-down.png
+++ b/WebContent/VAADIN/themes/default/select/img/arrow-down.png
diff --git a/WebContent/ITMILL/themes/default/select/img/arrow-up.png b/WebContent/VAADIN/themes/default/select/img/arrow-up.png
index 055ad61ef1..055ad61ef1 100644
--- a/WebContent/ITMILL/themes/default/select/img/arrow-up.png
+++ b/WebContent/VAADIN/themes/default/select/img/arrow-up.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-center-filter-error.png b/WebContent/VAADIN/themes/default/select/img/bg-center-filter-error.png
index 72f74f16ab..72f74f16ab 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-center-filter-error.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-center-filter-error.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-center-filter.png b/WebContent/VAADIN/themes/default/select/img/bg-center-filter.png
index 03e7384343..03e7384343 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-center-filter.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-center-filter.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-left-filter-error.png b/WebContent/VAADIN/themes/default/select/img/bg-left-filter-error.png
index da4a4e4cc9..da4a4e4cc9 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-left-filter-error.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-left-filter-error.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-left-filter.png b/WebContent/VAADIN/themes/default/select/img/bg-left-filter.png
index 4a1d2a2966..4a1d2a2966 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-left-filter.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-left-filter.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-right-filter-error.png b/WebContent/VAADIN/themes/default/select/img/bg-right-filter-error.png
index 72ed791760..72ed791760 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-right-filter-error.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-right-filter-error.png
diff --git a/WebContent/ITMILL/themes/default/select/img/bg-right-filter.png b/WebContent/VAADIN/themes/default/select/img/bg-right-filter.png
index 04cb8e4089..04cb8e4089 100644
--- a/WebContent/ITMILL/themes/default/select/img/bg-right-filter.png
+++ b/WebContent/VAADIN/themes/default/select/img/bg-right-filter.png
diff --git a/WebContent/ITMILL/themes/default/select/img/button-bg.png b/WebContent/VAADIN/themes/default/select/img/button-bg.png
index 9653ed949b..9653ed949b 100644
--- a/WebContent/ITMILL/themes/default/select/img/button-bg.png
+++ b/WebContent/VAADIN/themes/default/select/img/button-bg.png
diff --git a/WebContent/ITMILL/themes/default/select/select.css b/WebContent/VAADIN/themes/default/select/select.css
index 2ccb153ae7..2ccb153ae7 100644
--- a/WebContent/ITMILL/themes/default/select/select.css
+++ b/WebContent/VAADIN/themes/default/select/select.css
diff --git a/WebContent/ITMILL/themes/default/shadow/img/bottom-left.png b/WebContent/VAADIN/themes/default/shadow/img/bottom-left.png
index b119a13119..b119a13119 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/bottom-left.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/bottom-left.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/bottom-right.png b/WebContent/VAADIN/themes/default/shadow/img/bottom-right.png
index 50aaa3bedc..50aaa3bedc 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/bottom-right.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/bottom-right.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/bottom.png b/WebContent/VAADIN/themes/default/shadow/img/bottom.png
index 96af859986..96af859986 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/bottom.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/bottom.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/center.png b/WebContent/VAADIN/themes/default/shadow/img/center.png
index d6fb99a889..d6fb99a889 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/center.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/center.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/left.png b/WebContent/VAADIN/themes/default/shadow/img/left.png
index 4c3611c842..4c3611c842 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/left.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/left.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/right.png b/WebContent/VAADIN/themes/default/shadow/img/right.png
index 34a46e7b13..34a46e7b13 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/right.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/right.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/top-left.png b/WebContent/VAADIN/themes/default/shadow/img/top-left.png
index 27cf4d3f61..27cf4d3f61 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/top-left.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/top-left.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/top-right.png b/WebContent/VAADIN/themes/default/shadow/img/top-right.png
index 7f187ca556..7f187ca556 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/top-right.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/top-right.png
diff --git a/WebContent/ITMILL/themes/default/shadow/img/top.png b/WebContent/VAADIN/themes/default/shadow/img/top.png
index b654d78da9..b654d78da9 100644
--- a/WebContent/ITMILL/themes/default/shadow/img/top.png
+++ b/WebContent/VAADIN/themes/default/shadow/img/top.png
diff --git a/WebContent/ITMILL/themes/default/shadow/shadow.css b/WebContent/VAADIN/themes/default/shadow/shadow.css
index 2fc9a1c608..2fc9a1c608 100644
--- a/WebContent/ITMILL/themes/default/shadow/shadow.css
+++ b/WebContent/VAADIN/themes/default/shadow/shadow.css
diff --git a/WebContent/ITMILL/themes/default/slider/img/handle-horizontal.png b/WebContent/VAADIN/themes/default/slider/img/handle-horizontal.png
index 620b86f1da..620b86f1da 100755
--- a/WebContent/ITMILL/themes/default/slider/img/handle-horizontal.png
+++ b/WebContent/VAADIN/themes/default/slider/img/handle-horizontal.png
diff --git a/WebContent/ITMILL/themes/default/slider/img/handle-vertical.png b/WebContent/VAADIN/themes/default/slider/img/handle-vertical.png
index b7f63b91b7..b7f63b91b7 100755
--- a/WebContent/ITMILL/themes/default/slider/img/handle-vertical.png
+++ b/WebContent/VAADIN/themes/default/slider/img/handle-vertical.png
diff --git a/WebContent/ITMILL/themes/default/slider/slider.css b/WebContent/VAADIN/themes/default/slider/slider.css
index 5665a2aaee..5665a2aaee 100644
--- a/WebContent/ITMILL/themes/default/slider/slider.css
+++ b/WebContent/VAADIN/themes/default/slider/slider.css
diff --git a/WebContent/ITMILL/themes/default/splitpanel/img/bg_hor.png b/WebContent/VAADIN/themes/default/splitpanel/img/bg_hor.png
index 268cfaf18a..268cfaf18a 100644
--- a/WebContent/ITMILL/themes/default/splitpanel/img/bg_hor.png
+++ b/WebContent/VAADIN/themes/default/splitpanel/img/bg_hor.png
diff --git a/WebContent/ITMILL/themes/default/splitpanel/img/bg_ver.png b/WebContent/VAADIN/themes/default/splitpanel/img/bg_ver.png
index 9dfe06dafb..9dfe06dafb 100644
--- a/WebContent/ITMILL/themes/default/splitpanel/img/bg_ver.png
+++ b/WebContent/VAADIN/themes/default/splitpanel/img/bg_ver.png
diff --git a/WebContent/ITMILL/themes/default/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/default/splitpanel/splitpanel.css
index 39fdbcc029..39fdbcc029 100644
--- a/WebContent/ITMILL/themes/default/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/default/splitpanel/splitpanel.css
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css
index 3c0e4f2bdc..3c0e4f2bdc 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/VAADIN/themes/default/styles.css
diff --git a/WebContent/ITMILL/themes/default/table/img/check.gif b/WebContent/VAADIN/themes/default/table/img/check.gif
index 0a89195168..0a89195168 100644
--- a/WebContent/ITMILL/themes/default/table/img/check.gif
+++ b/WebContent/VAADIN/themes/default/table/img/check.gif
diff --git a/WebContent/ITMILL/themes/default/table/img/colsel.png b/WebContent/VAADIN/themes/default/table/img/colsel.png
index 7cf5abc8b2..7cf5abc8b2 100644
--- a/WebContent/ITMILL/themes/default/table/img/colsel.png
+++ b/WebContent/VAADIN/themes/default/table/img/colsel.png
diff --git a/WebContent/ITMILL/themes/default/table/img/header-bg-over.png b/WebContent/VAADIN/themes/default/table/img/header-bg-over.png
index 6c888676e9..6c888676e9 100644
--- a/WebContent/ITMILL/themes/default/table/img/header-bg-over.png
+++ b/WebContent/VAADIN/themes/default/table/img/header-bg-over.png
diff --git a/WebContent/ITMILL/themes/default/table/img/header-bg.png b/WebContent/VAADIN/themes/default/table/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/WebContent/ITMILL/themes/default/table/img/header-bg.png
+++ b/WebContent/VAADIN/themes/default/table/img/header-bg.png
diff --git a/WebContent/ITMILL/themes/default/table/img/resizer-bg.png b/WebContent/VAADIN/themes/default/table/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/WebContent/ITMILL/themes/default/table/img/resizer-bg.png
+++ b/WebContent/VAADIN/themes/default/table/img/resizer-bg.png
diff --git a/WebContent/ITMILL/themes/default/table/img/scroll-position-bg.png b/WebContent/VAADIN/themes/default/table/img/scroll-position-bg.png
index d5968fdf51..d5968fdf51 100644
--- a/WebContent/ITMILL/themes/default/table/img/scroll-position-bg.png
+++ b/WebContent/VAADIN/themes/default/table/img/scroll-position-bg.png
diff --git a/WebContent/ITMILL/themes/default/table/img/sort-asc.png b/WebContent/VAADIN/themes/default/table/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/WebContent/ITMILL/themes/default/table/img/sort-asc.png
+++ b/WebContent/VAADIN/themes/default/table/img/sort-asc.png
diff --git a/WebContent/ITMILL/themes/default/table/img/sort-desc.png b/WebContent/VAADIN/themes/default/table/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/WebContent/ITMILL/themes/default/table/img/sort-desc.png
+++ b/WebContent/VAADIN/themes/default/table/img/sort-desc.png
diff --git a/WebContent/ITMILL/themes/default/table/table.css b/WebContent/VAADIN/themes/default/table/table.css
index 61dc500c95..61dc500c95 100644
--- a/WebContent/ITMILL/themes/default/table/table.css
+++ b/WebContent/VAADIN/themes/default/table/table.css
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-bg.png b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-bg.png
index 18b7ea5d15..18b7ea5d15 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-bg.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-bg.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-left.png b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-left.png
index 43943a6cd8..43943a6cd8 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-left.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-left.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-right.png b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-right.png
index 1af4cde8ac..1af4cde8ac 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/inline-tab-right.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/inline-tab-right.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/next.png b/WebContent/VAADIN/themes/default/tabsheet/img/next.png
index f43dd1abf0..f43dd1abf0 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/next.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/next.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/prev.png b/WebContent/VAADIN/themes/default/tabsheet/img/prev.png
index 5e111b4aa0..5e111b4aa0 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/prev.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/prev.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/tab-bg.png b/WebContent/VAADIN/themes/default/tabsheet/img/tab-bg.png
index a4235e9a83..a4235e9a83 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/img/tab-bg.png
+++ b/WebContent/VAADIN/themes/default/tabsheet/img/tab-bg.png
diff --git a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/default/tabsheet/tabsheet.css
index fa99f6ae43..fa99f6ae43 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/default/tabsheet/tabsheet.css
diff --git a/WebContent/ITMILL/themes/default/textfield/img/bg.png b/WebContent/VAADIN/themes/default/textfield/img/bg.png
index 43c7ac7b47..43c7ac7b47 100644
--- a/WebContent/ITMILL/themes/default/textfield/img/bg.png
+++ b/WebContent/VAADIN/themes/default/textfield/img/bg.png
diff --git a/WebContent/ITMILL/themes/default/textfield/textfield.css b/WebContent/VAADIN/themes/default/textfield/textfield.css
index 2dfcc99d2e..2dfcc99d2e 100644
--- a/WebContent/ITMILL/themes/default/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/default/textfield/textfield.css
diff --git a/WebContent/ITMILL/themes/default/tree/img/collapsed.png b/WebContent/VAADIN/themes/default/tree/img/collapsed.png
index 8d4064de0a..8d4064de0a 100644
--- a/WebContent/ITMILL/themes/default/tree/img/collapsed.png
+++ b/WebContent/VAADIN/themes/default/tree/img/collapsed.png
diff --git a/WebContent/ITMILL/themes/default/tree/img/expanded.png b/WebContent/VAADIN/themes/default/tree/img/expanded.png
index 4ac2554eac..4ac2554eac 100644
--- a/WebContent/ITMILL/themes/default/tree/img/expanded.png
+++ b/WebContent/VAADIN/themes/default/tree/img/expanded.png
diff --git a/WebContent/ITMILL/themes/default/tree/tree.css b/WebContent/VAADIN/themes/default/tree/tree.css
index 9ac9957df1..9ac9957df1 100644
--- a/WebContent/ITMILL/themes/default/tree/tree.css
+++ b/WebContent/VAADIN/themes/default/tree/tree.css
diff --git a/WebContent/ITMILL/themes/default/window/img/bg-color.png b/WebContent/VAADIN/themes/default/window/img/bg-color.png
index 08cdb43bce..08cdb43bce 100644
--- a/WebContent/ITMILL/themes/default/window/img/bg-color.png
+++ b/WebContent/VAADIN/themes/default/window/img/bg-color.png
diff --git a/WebContent/ITMILL/themes/default/window/img/bottom-left.png b/WebContent/VAADIN/themes/default/window/img/bottom-left.png
index e7728b5172..e7728b5172 100644
--- a/WebContent/ITMILL/themes/default/window/img/bottom-left.png
+++ b/WebContent/VAADIN/themes/default/window/img/bottom-left.png
diff --git a/WebContent/ITMILL/themes/default/window/img/bottom-right.png b/WebContent/VAADIN/themes/default/window/img/bottom-right.png
index 56c654f41d..56c654f41d 100644
--- a/WebContent/ITMILL/themes/default/window/img/bottom-right.png
+++ b/WebContent/VAADIN/themes/default/window/img/bottom-right.png
diff --git a/WebContent/ITMILL/themes/default/window/img/close.png b/WebContent/VAADIN/themes/default/window/img/close.png
index 55f1a686dd..55f1a686dd 100644
--- a/WebContent/ITMILL/themes/default/window/img/close.png
+++ b/WebContent/VAADIN/themes/default/window/img/close.png
diff --git a/WebContent/ITMILL/themes/default/window/img/left-bg.png b/WebContent/VAADIN/themes/default/window/img/left-bg.png
index e9fd861993..e9fd861993 100644
--- a/WebContent/ITMILL/themes/default/window/img/left-bg.png
+++ b/WebContent/VAADIN/themes/default/window/img/left-bg.png
diff --git a/WebContent/ITMILL/themes/default/window/img/notification-error.png b/WebContent/VAADIN/themes/default/window/img/notification-error.png
index 32852d5907..32852d5907 100644
--- a/WebContent/ITMILL/themes/default/window/img/notification-error.png
+++ b/WebContent/VAADIN/themes/default/window/img/notification-error.png
diff --git a/WebContent/ITMILL/themes/default/window/img/resize.png b/WebContent/VAADIN/themes/default/window/img/resize.png
index e04087e525..e04087e525 100644
--- a/WebContent/ITMILL/themes/default/window/img/resize.png
+++ b/WebContent/VAADIN/themes/default/window/img/resize.png
diff --git a/WebContent/ITMILL/themes/default/window/img/right-bg.png b/WebContent/VAADIN/themes/default/window/img/right-bg.png
index 35d39c772f..35d39c772f 100644
--- a/WebContent/ITMILL/themes/default/window/img/right-bg.png
+++ b/WebContent/VAADIN/themes/default/window/img/right-bg.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/bottom-left.png b/WebContent/VAADIN/themes/default/window/img/shadow/bottom-left.png
index 1ffd763faf..1ffd763faf 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/bottom-left.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/bottom-left.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/bottom-right.png b/WebContent/VAADIN/themes/default/window/img/shadow/bottom-right.png
index af3552a4bc..af3552a4bc 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/bottom-right.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/bottom-right.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/bottom.png b/WebContent/VAADIN/themes/default/window/img/shadow/bottom.png
index ed24b66705..ed24b66705 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/bottom.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/bottom.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/center.png b/WebContent/VAADIN/themes/default/window/img/shadow/center.png
index f3825db0fb..f3825db0fb 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/center.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/center.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/left.png b/WebContent/VAADIN/themes/default/window/img/shadow/left.png
index 4c0b430f22..4c0b430f22 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/left.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/left.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/right.png b/WebContent/VAADIN/themes/default/window/img/shadow/right.png
index f81cfa0ce4..f81cfa0ce4 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/right.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/right.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/top-left.png b/WebContent/VAADIN/themes/default/window/img/shadow/top-left.png
index 7f79389398..7f79389398 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/top-left.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/top-left.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/top-right.png b/WebContent/VAADIN/themes/default/window/img/shadow/top-right.png
index feb490d565..feb490d565 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/top-right.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/top-right.png
diff --git a/WebContent/ITMILL/themes/default/window/img/shadow/top.png b/WebContent/VAADIN/themes/default/window/img/shadow/top.png
index 10bcc450ee..10bcc450ee 100644
--- a/WebContent/ITMILL/themes/default/window/img/shadow/top.png
+++ b/WebContent/VAADIN/themes/default/window/img/shadow/top.png
diff --git a/WebContent/ITMILL/themes/default/window/img/top-left.png b/WebContent/VAADIN/themes/default/window/img/top-left.png
index 0a57866ed6..0a57866ed6 100644
--- a/WebContent/ITMILL/themes/default/window/img/top-left.png
+++ b/WebContent/VAADIN/themes/default/window/img/top-left.png
diff --git a/WebContent/ITMILL/themes/default/window/img/top-right.png b/WebContent/VAADIN/themes/default/window/img/top-right.png
index e4e8080398..e4e8080398 100644
--- a/WebContent/ITMILL/themes/default/window/img/top-right.png
+++ b/WebContent/VAADIN/themes/default/window/img/top-right.png
diff --git a/WebContent/ITMILL/themes/default/window/window.css b/WebContent/VAADIN/themes/default/window/window.css
index 5cee309ae0..5cee309ae0 100644
--- a/WebContent/ITMILL/themes/default/window/window.css
+++ b/WebContent/VAADIN/themes/default/window/window.css
diff --git a/WebContent/ITMILL/themes/example/favicon.ico b/WebContent/VAADIN/themes/example/favicon.ico
index 2c731f8f85..2c731f8f85 100644
--- a/WebContent/ITMILL/themes/example/favicon.ico
+++ b/WebContent/VAADIN/themes/example/favicon.ico
diff --git a/WebContent/ITMILL/themes/example/icons/ok.png b/WebContent/VAADIN/themes/example/icons/ok.png
index 89591faef2..89591faef2 100644
--- a/WebContent/ITMILL/themes/example/icons/ok.png
+++ b/WebContent/VAADIN/themes/example/icons/ok.png
diff --git a/WebContent/ITMILL/themes/example/layouts/Contact.html b/WebContent/VAADIN/themes/example/layouts/Contact.html
index a37425078c..a37425078c 100644
--- a/WebContent/ITMILL/themes/example/layouts/Contact.html
+++ b/WebContent/VAADIN/themes/example/layouts/Contact.html
diff --git a/WebContent/ITMILL/themes/example/layouts/Developers.html b/WebContent/VAADIN/themes/example/layouts/Developers.html
index 50e054a4f4..50e054a4f4 100644
--- a/WebContent/ITMILL/themes/example/layouts/Developers.html
+++ b/WebContent/VAADIN/themes/example/layouts/Developers.html
diff --git a/WebContent/ITMILL/themes/example/layouts/News.html b/WebContent/VAADIN/themes/example/layouts/News.html
index f6ab7c7f7f..f6ab7c7f7f 100644
--- a/WebContent/ITMILL/themes/example/layouts/News.html
+++ b/WebContent/VAADIN/themes/example/layouts/News.html
diff --git a/WebContent/ITMILL/themes/example/layouts/Products.html b/WebContent/VAADIN/themes/example/layouts/Products.html
index 1b9b74c128..1b9b74c128 100644
--- a/WebContent/ITMILL/themes/example/layouts/Products.html
+++ b/WebContent/VAADIN/themes/example/layouts/Products.html
diff --git a/WebContent/ITMILL/themes/example/layouts/Support.html b/WebContent/VAADIN/themes/example/layouts/Support.html
index aca7e2a66d..aca7e2a66d 100644
--- a/WebContent/ITMILL/themes/example/layouts/Support.html
+++ b/WebContent/VAADIN/themes/example/layouts/Support.html
diff --git a/WebContent/ITMILL/themes/example/layouts/Welcome.html b/WebContent/VAADIN/themes/example/layouts/Welcome.html
index 964753da5b..964753da5b 100644
--- a/WebContent/ITMILL/themes/example/layouts/Welcome.html
+++ b/WebContent/VAADIN/themes/example/layouts/Welcome.html
diff --git a/WebContent/ITMILL/themes/example/layouts/icon_intro.png b/WebContent/VAADIN/themes/example/layouts/icon_intro.png
index 032712985c..032712985c 100644
--- a/WebContent/ITMILL/themes/example/layouts/icon_intro.png
+++ b/WebContent/VAADIN/themes/example/layouts/icon_intro.png
diff --git a/WebContent/ITMILL/themes/example/layouts/mainLayout.html b/WebContent/VAADIN/themes/example/layouts/mainLayout.html
index 5679ecbc62..5679ecbc62 100644
--- a/WebContent/ITMILL/themes/example/layouts/mainLayout.html
+++ b/WebContent/VAADIN/themes/example/layouts/mainLayout.html
diff --git a/WebContent/ITMILL/themes/example/styles.css b/WebContent/VAADIN/themes/example/styles.css
index 23ccd058f8..23ccd058f8 100644
--- a/WebContent/ITMILL/themes/example/styles.css
+++ b/WebContent/VAADIN/themes/example/styles.css
diff --git a/WebContent/ITMILL/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index aef1470a71..aef1470a71 100644
--- a/WebContent/ITMILL/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
diff --git a/WebContent/ITMILL/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
index a54d8d83fd..a54d8d83fd 100644
--- a/WebContent/ITMILL/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
+++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css
diff --git a/WebContent/ITMILL/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css
index bd12e4622c..bd12e4622c 100644
--- a/WebContent/ITMILL/themes/reindeer/button/button.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button.css
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
index 6ba8bc2864..6ba8bc2864 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/button-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
index c14b6864ae..c14b6864ae 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/button-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/left-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/left-focus.png
index 636cf840c3..636cf840c3 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/left-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/left-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/left-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/left-pressed.png
index e70f56b84b..e70f56b84b 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/left-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/left-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/left.png b/WebContent/VAADIN/themes/reindeer/button/img/left.png
index c4209e8119..c4209e8119 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/left.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/left.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-left-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-left-focus.png
index 7952ae5022..7952ae5022 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-left-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-left-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-left-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
index 7ff5296025..7ff5296025 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-left-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-left.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-left.png
index abb6bcc5af..abb6bcc5af 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-left.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-left.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-right-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png
index 5fef4143e6..5fef4143e6 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-right-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
index 3c11bb3814..3c11bb3814 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-right-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/primary-right.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png
index c304c9cfdf..c304c9cfdf 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/primary-right.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/right-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/right-focus.png
index dbb0677ac7..dbb0677ac7 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/right-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/right-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png
index 0a99111e60..0a99111e60 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/right-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/right.png b/WebContent/VAADIN/themes/reindeer/button/img/right.png
index e70a7be739..e70a7be739 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/right.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/right.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-left-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/small-left-focus.png
index 96408f225f..96408f225f 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-left-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-left-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-left-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/small-left-pressed.png
index 90f0d5cbef..90f0d5cbef 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-left-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-left-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-left.png b/WebContent/VAADIN/themes/reindeer/button/img/small-left.png
index 4efaa98ac2..4efaa98ac2 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-left.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-left.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-right-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/small-right-focus.png
index 8a0c5cac33..8a0c5cac33 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-right-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-right-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png
index 18e6c6ace1..18e6c6ace1 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-right-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/button/img/small-right.png b/WebContent/VAADIN/themes/reindeer/button/img/small-right.png
index a9abdc5cf1..a9abdc5cf1 100644
--- a/WebContent/ITMILL/themes/reindeer/button/img/small-right.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/small-right.png
diff --git a/WebContent/ITMILL/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css
index afd109c862..afd109c862 100644
--- a/WebContent/ITMILL/themes/reindeer/common/common.css
+++ b/WebContent/VAADIN/themes/reindeer/common/common.css
diff --git a/WebContent/ITMILL/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
index 7980a5aa18..7980a5aa18 100644
--- a/WebContent/ITMILL/themes/reindeer/common/img/horizontal-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
diff --git a/WebContent/ITMILL/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index 07fe1bdde0..07fe1bdde0 100644
--- a/WebContent/ITMILL/themes/reindeer/common/img/vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
diff --git a/WebContent/ITMILL/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
index a45238a693..a45238a693 100644
--- a/WebContent/ITMILL/themes/reindeer/common/img/vertical-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 0473ea8711..0473ea8711 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/header-bg-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
index 48a3bc8ff5..48a3bc8ff5 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/header-bg-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/header-bg.png b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg.png
index f033b5316d..f033b5316d 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/header-bg.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/month-next-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
index 22393c7973..22393c7973 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/month-next-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/month-next.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next.png
index 50732c44ad..50732c44ad 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/month-next.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/month-next.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/month-prev-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
index ad39a9ae22..ad39a9ae22 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/month-prev-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/month-prev.png b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev.png
index 19bb013151..19bb013151 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/month-prev.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/year-next-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
index 60b57c370b..60b57c370b 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/year-next-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/year-next.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next.png
index bb015ef73d..bb015ef73d 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/year-next.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/year-next.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/year-prev-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
index c760d022e8..c760d022e8 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/year-prev-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/datefield/img/year-prev.png b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev.png
index 3cd62e4e95..3cd62e4e95 100644
--- a/WebContent/ITMILL/themes/reindeer/datefield/img/year-prev.png
+++ b/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev.png
diff --git a/WebContent/ITMILL/themes/reindeer/label/label.css b/WebContent/VAADIN/themes/reindeer/label/label.css
index 7070bf04f4..7070bf04f4 100644
--- a/WebContent/ITMILL/themes/reindeer/label/label.css
+++ b/WebContent/VAADIN/themes/reindeer/label/label.css
diff --git a/WebContent/ITMILL/themes/reindeer/layouts/layouts.css b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
index a668e76433..a668e76433 100644
--- a/WebContent/ITMILL/themes/reindeer/layouts/layouts.css
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.css
diff --git a/WebContent/ITMILL/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css
index 6576c8233f..6576c8233f 100644
--- a/WebContent/ITMILL/themes/reindeer/panel/panel.css
+++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/arrow-down-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
index 2061e31bee..2061e31bee 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/arrow-down-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/arrow-down.png b/WebContent/VAADIN/themes/reindeer/select/img/arrow-down.png
index 6fba8ab906..6fba8ab906 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/arrow-down.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/arrow-down.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/arrow-up-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
index a2d3ea6706..a2d3ea6706 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/arrow-up-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/arrow-up.png b/WebContent/VAADIN/themes/reindeer/select/img/arrow-up.png
index 3c9b52c9fc..3c9b52c9fc 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/arrow-up.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/arrow-up.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/center-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/center-focus.png
index e236f2a24d..e236f2a24d 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/center-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/center-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/center.png b/WebContent/VAADIN/themes/reindeer/select/img/center.png
index fae6766cce..fae6766cce 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/center.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/center.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/left-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/left-focus.png
index 528d53203b..528d53203b 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/left-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/left-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/left.png b/WebContent/VAADIN/themes/reindeer/select/img/left.png
index e4179a0078..e4179a0078 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/left.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/left.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/page-down-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/page-down-hover.png
index 5479c21ee9..5479c21ee9 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/page-down-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/page-down-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/page-down-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/page-down-pressed.png
index 8d621bd96e..8d621bd96e 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/page-down-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/page-down-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/page-up-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/page-up-hover.png
index ba08d141fd..ba08d141fd 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/page-up-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/page-up-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/page-up-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/page-up-pressed.png
index 08c044abc6..08c044abc6 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/page-up-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/page-up-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right-focus-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/right-focus-hover.png
index 9b8ddc7676..9b8ddc7676 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right-focus-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right-focus-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right-focus-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
index 9c7b6dc0ac..9c7b6dc0ac 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right-focus-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right-focus.png b/WebContent/VAADIN/themes/reindeer/select/img/right-focus.png
index 127c3e03d2..127c3e03d2 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right-hover.png b/WebContent/VAADIN/themes/reindeer/select/img/right-hover.png
index 5d1c8f8153..5d1c8f8153 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right-hover.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right-hover.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right-pressed.png b/WebContent/VAADIN/themes/reindeer/select/img/right-pressed.png
index f9450d2d43..f9450d2d43 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right-pressed.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right-pressed.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/right.png b/WebContent/VAADIN/themes/reindeer/select/img/right.png
index d341745cce..d341745cce 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/right.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/right.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/sel-bg.png b/WebContent/VAADIN/themes/reindeer/select/img/sel-bg.png
index 6abfd1caf6..6abfd1caf6 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/sel-bg.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/sel-bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/img/status-bg.png b/WebContent/VAADIN/themes/reindeer/select/img/status-bg.png
index c93bfeb350..c93bfeb350 100644
--- a/WebContent/ITMILL/themes/reindeer/select/img/status-bg.png
+++ b/WebContent/VAADIN/themes/reindeer/select/img/status-bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css
index c9dc77bea4..c9dc77bea4 100644
--- a/WebContent/ITMILL/themes/reindeer/select/select.css
+++ b/WebContent/VAADIN/themes/reindeer/select/select.css
diff --git a/WebContent/ITMILL/themes/reindeer/splitpanel/img/hor-bg.png b/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
index 4ce1cabffc..4ce1cabffc 100644
--- a/WebContent/ITMILL/themes/reindeer/splitpanel/img/hor-bg.png
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/splitpanel/img/hor-handle.png b/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
index 50645f41f1..50645f41f1 100644
--- a/WebContent/ITMILL/themes/reindeer/splitpanel/img/hor-handle.png
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
diff --git a/WebContent/ITMILL/themes/reindeer/splitpanel/img/ver-bg.png b/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
index 1e6968dd1c..1e6968dd1c 100644
--- a/WebContent/ITMILL/themes/reindeer/splitpanel/img/ver-bg.png
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/splitpanel/img/ver-handle.png b/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
index bf5ca89ca5..bf5ca89ca5 100644
--- a/WebContent/ITMILL/themes/reindeer/splitpanel/img/ver-handle.png
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
diff --git a/WebContent/ITMILL/themes/reindeer/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css
index dbb7ae0aef..dbb7ae0aef 100644
--- a/WebContent/ITMILL/themes/reindeer/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css
diff --git a/WebContent/ITMILL/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 92b61d4cb7..92b61d4cb7 100644
--- a/WebContent/ITMILL/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
diff --git a/WebContent/ITMILL/themes/reindeer/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
index dcdbd30add..dcdbd30add 100644
--- a/WebContent/ITMILL/themes/reindeer/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
diff --git a/WebContent/ITMILL/themes/reindeer/textfield/img/bg-border-image-focus.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
index 673212b408..673212b408 100644
--- a/WebContent/ITMILL/themes/reindeer/textfield/img/bg-border-image-focus.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
diff --git a/WebContent/ITMILL/themes/reindeer/textfield/img/bg-border-image.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
index 38fe3e6d7b..38fe3e6d7b 100644
--- a/WebContent/ITMILL/themes/reindeer/textfield/img/bg-border-image.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
diff --git a/WebContent/ITMILL/themes/reindeer/textfield/img/bg.png b/WebContent/VAADIN/themes/reindeer/textfield/img/bg.png
index 4096e9d524..4096e9d524 100644
--- a/WebContent/ITMILL/themes/reindeer/textfield/img/bg.png
+++ b/WebContent/VAADIN/themes/reindeer/textfield/img/bg.png
diff --git a/WebContent/ITMILL/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index c04ca29398..c04ca29398 100644
--- a/WebContent/ITMILL/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
diff --git a/WebContent/ITMILL/themes/reservr/bmw.jpg b/WebContent/VAADIN/themes/reservr/bmw.jpg
index 5d91713a11..5d91713a11 100644
--- a/WebContent/ITMILL/themes/reservr/bmw.jpg
+++ b/WebContent/VAADIN/themes/reservr/bmw.jpg
diff --git a/WebContent/ITMILL/themes/reservr/reservr.jpg b/WebContent/VAADIN/themes/reservr/reservr.jpg
index 5fc956a372..5fc956a372 100644
--- a/WebContent/ITMILL/themes/reservr/reservr.jpg
+++ b/WebContent/VAADIN/themes/reservr/reservr.jpg
diff --git a/WebContent/ITMILL/themes/reservr/styles.css b/WebContent/VAADIN/themes/reservr/styles.css
index 305532abbd..305532abbd 100644
--- a/WebContent/ITMILL/themes/reservr/styles.css
+++ b/WebContent/VAADIN/themes/reservr/styles.css
diff --git a/WebContent/ITMILL/themes/sampler/dummy/styles.css b/WebContent/VAADIN/themes/sampler/dummy/styles.css
index 360b418135..360b418135 100644
--- a/WebContent/ITMILL/themes/sampler/dummy/styles.css
+++ b/WebContent/VAADIN/themes/sampler/dummy/styles.css
diff --git a/WebContent/ITMILL/themes/sampler/flags/ad.gif b/WebContent/VAADIN/themes/sampler/flags/ad.gif
index 57b499733f..57b499733f 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ad.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ad.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ae.gif b/WebContent/VAADIN/themes/sampler/flags/ae.gif
index 78d15b67dc..78d15b67dc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ae.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ae.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/af.gif b/WebContent/VAADIN/themes/sampler/flags/af.gif
index 9889408211..9889408211 100755
--- a/WebContent/ITMILL/themes/sampler/flags/af.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/af.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ag.gif b/WebContent/VAADIN/themes/sampler/flags/ag.gif
index 48f8e7bc72..48f8e7bc72 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ag.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ag.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ai.gif b/WebContent/VAADIN/themes/sampler/flags/ai.gif
index 1cbc57958b..1cbc57958b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ai.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ai.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/al.gif b/WebContent/VAADIN/themes/sampler/flags/al.gif
index c44fe0a0ae..c44fe0a0ae 100755
--- a/WebContent/ITMILL/themes/sampler/flags/al.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/al.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/am.gif b/WebContent/VAADIN/themes/sampler/flags/am.gif
index 2915e30cb2..2915e30cb2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/am.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/am.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/an.gif b/WebContent/VAADIN/themes/sampler/flags/an.gif
index cb570c6799..cb570c6799 100755
--- a/WebContent/ITMILL/themes/sampler/flags/an.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/an.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ao.gif b/WebContent/VAADIN/themes/sampler/flags/ao.gif
index 8c854fa108..8c854fa108 100644
--- a/WebContent/ITMILL/themes/sampler/flags/ao.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ao.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/aq.gif b/WebContent/VAADIN/themes/sampler/flags/aq.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/aq.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/aq.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ar.gif b/WebContent/VAADIN/themes/sampler/flags/ar.gif
index a9f71f7d6d..a9f71f7d6d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ar.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ar.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/as.gif b/WebContent/VAADIN/themes/sampler/flags/as.gif
index d776ec2711..d776ec2711 100755
--- a/WebContent/ITMILL/themes/sampler/flags/as.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/as.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/at.gif b/WebContent/VAADIN/themes/sampler/flags/at.gif
index 87e1217365..87e1217365 100755
--- a/WebContent/ITMILL/themes/sampler/flags/at.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/at.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/au.gif b/WebContent/VAADIN/themes/sampler/flags/au.gif
index 5269c6a0e0..5269c6a0e0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/au.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/au.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/aw.gif b/WebContent/VAADIN/themes/sampler/flags/aw.gif
index 27fdb4d139..27fdb4d139 100755
--- a/WebContent/ITMILL/themes/sampler/flags/aw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/aw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ax.gif b/WebContent/VAADIN/themes/sampler/flags/ax.gif
index 0ceb6849f4..0ceb6849f4 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ax.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ax.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/az.gif b/WebContent/VAADIN/themes/sampler/flags/az.gif
index d771618498..d771618498 100755
--- a/WebContent/ITMILL/themes/sampler/flags/az.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/az.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ba.gif b/WebContent/VAADIN/themes/sampler/flags/ba.gif
index 9bf5f0ac7e..9bf5f0ac7e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ba.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ba.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bb.gif b/WebContent/VAADIN/themes/sampler/flags/bb.gif
index b7d08e57e3..b7d08e57e3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bb.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bb.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bd.gif b/WebContent/VAADIN/themes/sampler/flags/bd.gif
index 0fd27ecabe..0fd27ecabe 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bd.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bd.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/be.gif b/WebContent/VAADIN/themes/sampler/flags/be.gif
index ae09bfbe14..ae09bfbe14 100755
--- a/WebContent/ITMILL/themes/sampler/flags/be.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/be.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bf.gif b/WebContent/VAADIN/themes/sampler/flags/bf.gif
index 9d6772cd0c..9d6772cd0c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bg.gif b/WebContent/VAADIN/themes/sampler/flags/bg.gif
index 11cf8ff3b3..11cf8ff3b3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bh.gif b/WebContent/VAADIN/themes/sampler/flags/bh.gif
index 56aa72b2b6..56aa72b2b6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bi.gif b/WebContent/VAADIN/themes/sampler/flags/bi.gif
index 6e2cbe1216..6e2cbe1216 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bi.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bi.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bj.gif b/WebContent/VAADIN/themes/sampler/flags/bj.gif
index e676116f8e..e676116f8e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bj.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bj.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bl.gif b/WebContent/VAADIN/themes/sampler/flags/bl.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/bl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bm.gif b/WebContent/VAADIN/themes/sampler/flags/bm.gif
index 9feb87bc9e..9feb87bc9e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bn.gif b/WebContent/VAADIN/themes/sampler/flags/bn.gif
index b7b6b0f919..b7b6b0f919 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bo.gif b/WebContent/VAADIN/themes/sampler/flags/bo.gif
index 4844f85692..4844f85692 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bo.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bo.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/br.gif b/WebContent/VAADIN/themes/sampler/flags/br.gif
index 8c8661626b..8c8661626b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/br.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/br.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bs.gif b/WebContent/VAADIN/themes/sampler/flags/bs.gif
index c0a741e5ca..c0a741e5ca 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bs.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bs.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bt.gif b/WebContent/VAADIN/themes/sampler/flags/bt.gif
index abe2f3ccb0..abe2f3ccb0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bv.gif b/WebContent/VAADIN/themes/sampler/flags/bv.gif
index 6202d1f3a2..6202d1f3a2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bw.gif b/WebContent/VAADIN/themes/sampler/flags/bw.gif
index 986ab63c27..986ab63c27 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/by.gif b/WebContent/VAADIN/themes/sampler/flags/by.gif
index 43ffcd4c71..43ffcd4c71 100755
--- a/WebContent/ITMILL/themes/sampler/flags/by.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/by.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/bz.gif b/WebContent/VAADIN/themes/sampler/flags/bz.gif
index 791737f0bd..791737f0bd 100755
--- a/WebContent/ITMILL/themes/sampler/flags/bz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/bz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ca.gif b/WebContent/VAADIN/themes/sampler/flags/ca.gif
index 457d9662d5..457d9662d5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ca.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ca.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/catalonia.gif b/WebContent/VAADIN/themes/sampler/flags/catalonia.gif
index 73df9a0498..73df9a0498 100644
--- a/WebContent/ITMILL/themes/sampler/flags/catalonia.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/catalonia.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cc.gif b/WebContent/VAADIN/themes/sampler/flags/cc.gif
index 3f7832702d..3f7832702d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cd.gif b/WebContent/VAADIN/themes/sampler/flags/cd.gif
index 1df717ae5c..1df717ae5c 100644
--- a/WebContent/ITMILL/themes/sampler/flags/cd.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cd.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cf.gif b/WebContent/VAADIN/themes/sampler/flags/cf.gif
index 35787ca489..35787ca489 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cg.gif b/WebContent/VAADIN/themes/sampler/flags/cg.gif
index e0a62a51ca..e0a62a51ca 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ch.gif b/WebContent/VAADIN/themes/sampler/flags/ch.gif
index d5c0e5b7fa..d5c0e5b7fa 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ch.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ch.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ci.gif b/WebContent/VAADIN/themes/sampler/flags/ci.gif
index 844120a52b..844120a52b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ci.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ci.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ck.gif b/WebContent/VAADIN/themes/sampler/flags/ck.gif
index 2edb73994c..2edb73994c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ck.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ck.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cl.gif b/WebContent/VAADIN/themes/sampler/flags/cl.gif
index cbc370e6ca..cbc370e6ca 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cm.gif b/WebContent/VAADIN/themes/sampler/flags/cm.gif
index 1fb102b295..1fb102b295 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cn.gif b/WebContent/VAADIN/themes/sampler/flags/cn.gif
index b052530978..b052530978 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/co.gif b/WebContent/VAADIN/themes/sampler/flags/co.gif
index d0e15cafea..d0e15cafea 100755
--- a/WebContent/ITMILL/themes/sampler/flags/co.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/co.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cr.gif b/WebContent/VAADIN/themes/sampler/flags/cr.gif
index 0728dd6a49..0728dd6a49 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cs.gif b/WebContent/VAADIN/themes/sampler/flags/cs.gif
index 101db64939..101db64939 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cs.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cs.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cu.gif b/WebContent/VAADIN/themes/sampler/flags/cu.gif
index 291255ca3f..291255ca3f 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cv.gif b/WebContent/VAADIN/themes/sampler/flags/cv.gif
index 43c6c6cb6e..43c6c6cb6e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cx.gif b/WebContent/VAADIN/themes/sampler/flags/cx.gif
index a5b43089b0..a5b43089b0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cx.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cx.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cy.gif b/WebContent/VAADIN/themes/sampler/flags/cy.gif
index 35c661e161..35c661e161 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cy.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cy.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/cz.gif b/WebContent/VAADIN/themes/sampler/flags/cz.gif
index 0a605e581d..0a605e581d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/cz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/cz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/de.gif b/WebContent/VAADIN/themes/sampler/flags/de.gif
index 75728ddf21..75728ddf21 100755
--- a/WebContent/ITMILL/themes/sampler/flags/de.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/de.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/dj.gif b/WebContent/VAADIN/themes/sampler/flags/dj.gif
index 212406d973..212406d973 100755
--- a/WebContent/ITMILL/themes/sampler/flags/dj.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/dj.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/dk.gif b/WebContent/VAADIN/themes/sampler/flags/dk.gif
index 03e75bd297..03e75bd297 100755
--- a/WebContent/ITMILL/themes/sampler/flags/dk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/dk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/dm.gif b/WebContent/VAADIN/themes/sampler/flags/dm.gif
index 2f87f3ca6a..2f87f3ca6a 100755
--- a/WebContent/ITMILL/themes/sampler/flags/dm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/dm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/do.gif b/WebContent/VAADIN/themes/sampler/flags/do.gif
index f7d0bad39e..f7d0bad39e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/do.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/do.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/dz.gif b/WebContent/VAADIN/themes/sampler/flags/dz.gif
index ed580a7cec..ed580a7cec 100755
--- a/WebContent/ITMILL/themes/sampler/flags/dz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/dz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ec.gif b/WebContent/VAADIN/themes/sampler/flags/ec.gif
index 9e41e0ec8c..9e41e0ec8c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ec.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ec.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ee.gif b/WebContent/VAADIN/themes/sampler/flags/ee.gif
index 9397a2d084..9397a2d084 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ee.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ee.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/eg.gif b/WebContent/VAADIN/themes/sampler/flags/eg.gif
index 6857c7dd57..6857c7dd57 100755
--- a/WebContent/ITMILL/themes/sampler/flags/eg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/eg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/eh.gif b/WebContent/VAADIN/themes/sampler/flags/eh.gif
index dd0391c280..dd0391c280 100755
--- a/WebContent/ITMILL/themes/sampler/flags/eh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/eh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/england.gif b/WebContent/VAADIN/themes/sampler/flags/england.gif
index 933a4f0b3d..933a4f0b3d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/england.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/england.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/er.gif b/WebContent/VAADIN/themes/sampler/flags/er.gif
index 3d4d612c77..3d4d612c77 100755
--- a/WebContent/ITMILL/themes/sampler/flags/er.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/er.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/es.gif b/WebContent/VAADIN/themes/sampler/flags/es.gif
index c27d65e5f1..c27d65e5f1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/es.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/es.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/et.gif b/WebContent/VAADIN/themes/sampler/flags/et.gif
index f77995d0ab..f77995d0ab 100755
--- a/WebContent/ITMILL/themes/sampler/flags/et.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/et.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/europeanunion.gif b/WebContent/VAADIN/themes/sampler/flags/europeanunion.gif
index 28a762a59c..28a762a59c 100644
--- a/WebContent/ITMILL/themes/sampler/flags/europeanunion.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/europeanunion.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fam.gif b/WebContent/VAADIN/themes/sampler/flags/fam.gif
index 7d528852dc..7d528852dc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fam.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fam.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fi.gif b/WebContent/VAADIN/themes/sampler/flags/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fi.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fi.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fj.gif b/WebContent/VAADIN/themes/sampler/flags/fj.gif
index 486151cb8d..486151cb8d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fj.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fj.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fk.gif b/WebContent/VAADIN/themes/sampler/flags/fk.gif
index 37b5ecf303..37b5ecf303 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fm.gif b/WebContent/VAADIN/themes/sampler/flags/fm.gif
index 7f8723b7da..7f8723b7da 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fo.gif b/WebContent/VAADIN/themes/sampler/flags/fo.gif
index 4a90fc043d..4a90fc043d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fo.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fo.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/fr.gif b/WebContent/VAADIN/themes/sampler/flags/fr.gif
index 43d0b80172..43d0b80172 100755
--- a/WebContent/ITMILL/themes/sampler/flags/fr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/fr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ga.gif b/WebContent/VAADIN/themes/sampler/flags/ga.gif
index 23fd5f0d2d..23fd5f0d2d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ga.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ga.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gb.gif b/WebContent/VAADIN/themes/sampler/flags/gb.gif
index 3c6bce15c4..3c6bce15c4 100644
--- a/WebContent/ITMILL/themes/sampler/flags/gb.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gb.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gd.gif b/WebContent/VAADIN/themes/sampler/flags/gd.gif
index 25ea312318..25ea312318 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gd.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gd.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ge.gif b/WebContent/VAADIN/themes/sampler/flags/ge.gif
index faa7f126a7..faa7f126a7 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ge.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ge.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gf.gif b/WebContent/VAADIN/themes/sampler/flags/gf.gif
index 43d0b80172..43d0b80172 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gg.gif b/WebContent/VAADIN/themes/sampler/flags/gg.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/gg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gh.gif b/WebContent/VAADIN/themes/sampler/flags/gh.gif
index 273fb7d1a9..273fb7d1a9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gi.gif b/WebContent/VAADIN/themes/sampler/flags/gi.gif
index 7b1984bc69..7b1984bc69 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gi.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gi.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gl.gif b/WebContent/VAADIN/themes/sampler/flags/gl.gif
index ef445be003..ef445be003 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gm.gif b/WebContent/VAADIN/themes/sampler/flags/gm.gif
index 6847c5a8c0..6847c5a8c0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gn.gif b/WebContent/VAADIN/themes/sampler/flags/gn.gif
index a982ac6f56..a982ac6f56 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gp.gif b/WebContent/VAADIN/themes/sampler/flags/gp.gif
index 31166db665..31166db665 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gp.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gp.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gq.gif b/WebContent/VAADIN/themes/sampler/flags/gq.gif
index 8b4e0cc41e..8b4e0cc41e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gq.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gq.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gr.gif b/WebContent/VAADIN/themes/sampler/flags/gr.gif
index b4c8c04e53..b4c8c04e53 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gs.gif b/WebContent/VAADIN/themes/sampler/flags/gs.gif
index ccc96ec009..ccc96ec009 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gs.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gs.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gt.gif b/WebContent/VAADIN/themes/sampler/flags/gt.gif
index 7e94d1dda0..7e94d1dda0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gu.gif b/WebContent/VAADIN/themes/sampler/flags/gu.gif
index eafef683d5..eafef683d5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gw.gif b/WebContent/VAADIN/themes/sampler/flags/gw.gif
index 55f7571150..55f7571150 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/gy.gif b/WebContent/VAADIN/themes/sampler/flags/gy.gif
index 1cb4cd71d6..1cb4cd71d6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/gy.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/gy.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/hk.gif b/WebContent/VAADIN/themes/sampler/flags/hk.gif
index 798af96da8..798af96da8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/hk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/hk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/hm.gif b/WebContent/VAADIN/themes/sampler/flags/hm.gif
index 5269c6a0e0..5269c6a0e0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/hm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/hm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/hn.gif b/WebContent/VAADIN/themes/sampler/flags/hn.gif
index 6c4ffe8e84..6c4ffe8e84 100755
--- a/WebContent/ITMILL/themes/sampler/flags/hn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/hn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/hr.gif b/WebContent/VAADIN/themes/sampler/flags/hr.gif
index 557c660202..557c660202 100755
--- a/WebContent/ITMILL/themes/sampler/flags/hr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/hr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ht.gif b/WebContent/VAADIN/themes/sampler/flags/ht.gif
index 059604ab20..059604ab20 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ht.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ht.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/hu.gif b/WebContent/VAADIN/themes/sampler/flags/hu.gif
index 6142d86817..6142d86817 100755
--- a/WebContent/ITMILL/themes/sampler/flags/hu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/hu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/id.gif b/WebContent/VAADIN/themes/sampler/flags/id.gif
index 865161b030..865161b030 100755
--- a/WebContent/ITMILL/themes/sampler/flags/id.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/id.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ie.gif b/WebContent/VAADIN/themes/sampler/flags/ie.gif
index 506ad28590..506ad28590 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ie.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ie.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/il.gif b/WebContent/VAADIN/themes/sampler/flags/il.gif
index c8483ae52f..c8483ae52f 100755
--- a/WebContent/ITMILL/themes/sampler/flags/il.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/il.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/im.gif b/WebContent/VAADIN/themes/sampler/flags/im.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/im.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/im.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/in.gif b/WebContent/VAADIN/themes/sampler/flags/in.gif
index 1cd80272e8..1cd80272e8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/in.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/in.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/io.gif b/WebContent/VAADIN/themes/sampler/flags/io.gif
index de7e7ab385..de7e7ab385 100755
--- a/WebContent/ITMILL/themes/sampler/flags/io.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/io.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/iq.gif b/WebContent/VAADIN/themes/sampler/flags/iq.gif
index c34fe3c44a..c34fe3c44a 100755
--- a/WebContent/ITMILL/themes/sampler/flags/iq.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/iq.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ir.gif b/WebContent/VAADIN/themes/sampler/flags/ir.gif
index 156040fc57..156040fc57 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ir.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ir.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/is.gif b/WebContent/VAADIN/themes/sampler/flags/is.gif
index b42502de4b..b42502de4b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/is.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/is.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/it.gif b/WebContent/VAADIN/themes/sampler/flags/it.gif
index d79e90e99e..d79e90e99e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/it.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/it.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/je.gif b/WebContent/VAADIN/themes/sampler/flags/je.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/je.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/je.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/jm.gif b/WebContent/VAADIN/themes/sampler/flags/jm.gif
index 0bed67c239..0bed67c239 100755
--- a/WebContent/ITMILL/themes/sampler/flags/jm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/jm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/jo.gif b/WebContent/VAADIN/themes/sampler/flags/jo.gif
index 03daf8af67..03daf8af67 100755
--- a/WebContent/ITMILL/themes/sampler/flags/jo.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/jo.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/jp.gif b/WebContent/VAADIN/themes/sampler/flags/jp.gif
index 444c1d05c5..444c1d05c5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/jp.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/jp.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ke.gif b/WebContent/VAADIN/themes/sampler/flags/ke.gif
index c2b5d45c43..c2b5d45c43 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ke.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ke.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kg.gif b/WebContent/VAADIN/themes/sampler/flags/kg.gif
index 72a4d412c8..72a4d412c8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kh.gif b/WebContent/VAADIN/themes/sampler/flags/kh.gif
index 30a183158d..30a183158d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ki.gif b/WebContent/VAADIN/themes/sampler/flags/ki.gif
index 4a0751a221..4a0751a221 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ki.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ki.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/km.gif b/WebContent/VAADIN/themes/sampler/flags/km.gif
index 5859595e80..5859595e80 100755
--- a/WebContent/ITMILL/themes/sampler/flags/km.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/km.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kn.gif b/WebContent/VAADIN/themes/sampler/flags/kn.gif
index bb9cc34a92..bb9cc34a92 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kp.gif b/WebContent/VAADIN/themes/sampler/flags/kp.gif
index 6e0ca09e0b..6e0ca09e0b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kp.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kp.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kr.gif b/WebContent/VAADIN/themes/sampler/flags/kr.gif
index 1cddbe75b3..1cddbe75b3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kw.gif b/WebContent/VAADIN/themes/sampler/flags/kw.gif
index 1efc7347ec..1efc7347ec 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ky.gif b/WebContent/VAADIN/themes/sampler/flags/ky.gif
index d3d02ee4d3..d3d02ee4d3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ky.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ky.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/kz.gif b/WebContent/VAADIN/themes/sampler/flags/kz.gif
index 24baebe05c..24baebe05c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/kz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/kz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/la.gif b/WebContent/VAADIN/themes/sampler/flags/la.gif
index d14cf4d82c..d14cf4d82c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/la.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/la.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lb.gif b/WebContent/VAADIN/themes/sampler/flags/lb.gif
index 003d83af5e..003d83af5e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lb.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lb.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lc.gif b/WebContent/VAADIN/themes/sampler/flags/lc.gif
index f5fe5bffd2..f5fe5bffd2 100644
--- a/WebContent/ITMILL/themes/sampler/flags/lc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/li.gif b/WebContent/VAADIN/themes/sampler/flags/li.gif
index 713c58e1df..713c58e1df 100755
--- a/WebContent/ITMILL/themes/sampler/flags/li.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/li.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lk.gif b/WebContent/VAADIN/themes/sampler/flags/lk.gif
index 1b3ee7f572..1b3ee7f572 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lr.gif b/WebContent/VAADIN/themes/sampler/flags/lr.gif
index 435af9e506..435af9e506 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ls.gif b/WebContent/VAADIN/themes/sampler/flags/ls.gif
index 427ae957e5..427ae957e5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ls.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ls.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lt.gif b/WebContent/VAADIN/themes/sampler/flags/lt.gif
index dee9c601ad..dee9c601ad 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lu.gif b/WebContent/VAADIN/themes/sampler/flags/lu.gif
index 7d7293edd6..7d7293edd6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/lv.gif b/WebContent/VAADIN/themes/sampler/flags/lv.gif
index 17e71b7eb6..17e71b7eb6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/lv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/lv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ly.gif b/WebContent/VAADIN/themes/sampler/flags/ly.gif
index a654c30afa..a654c30afa 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ly.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ly.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ma.gif b/WebContent/VAADIN/themes/sampler/flags/ma.gif
index fc784119d3..fc784119d3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ma.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ma.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mc.gif b/WebContent/VAADIN/themes/sampler/flags/mc.gif
index 02a7c8e1bd..02a7c8e1bd 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/md.gif b/WebContent/VAADIN/themes/sampler/flags/md.gif
index e4b8a7e3f6..e4b8a7e3f6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/md.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/md.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/me.gif b/WebContent/VAADIN/themes/sampler/flags/me.gif
index a260453c2f..a260453c2f 100644
--- a/WebContent/ITMILL/themes/sampler/flags/me.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/me.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mf.gif b/WebContent/VAADIN/themes/sampler/flags/mf.gif
index 587a1f6844..587a1f6844 100644
--- a/WebContent/ITMILL/themes/sampler/flags/mf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mg.gif b/WebContent/VAADIN/themes/sampler/flags/mg.gif
index a91b577d13..a91b577d13 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mh.gif b/WebContent/VAADIN/themes/sampler/flags/mh.gif
index 92f5f485c3..92f5f485c3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mk.gif b/WebContent/VAADIN/themes/sampler/flags/mk.gif
index 7aeb8311b2..7aeb8311b2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ml.gif b/WebContent/VAADIN/themes/sampler/flags/ml.gif
index 53d6f490c1..53d6f490c1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ml.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ml.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mm.gif b/WebContent/VAADIN/themes/sampler/flags/mm.gif
index 9e0a2756d2..9e0a2756d2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mn.gif b/WebContent/VAADIN/themes/sampler/flags/mn.gif
index dff8ea5a63..dff8ea5a63 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mo.gif b/WebContent/VAADIN/themes/sampler/flags/mo.gif
index 66cf5b4f05..66cf5b4f05 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mo.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mo.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mp.gif b/WebContent/VAADIN/themes/sampler/flags/mp.gif
index 73b7147e9c..73b7147e9c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mp.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mp.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mq.gif b/WebContent/VAADIN/themes/sampler/flags/mq.gif
index 570bc5dd18..570bc5dd18 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mq.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mq.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mr.gif b/WebContent/VAADIN/themes/sampler/flags/mr.gif
index f52fcf0933..f52fcf0933 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ms.gif b/WebContent/VAADIN/themes/sampler/flags/ms.gif
index 5e5a67aa88..5e5a67aa88 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ms.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ms.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mt.gif b/WebContent/VAADIN/themes/sampler/flags/mt.gif
index 45c709f2bc..45c709f2bc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mu.gif b/WebContent/VAADIN/themes/sampler/flags/mu.gif
index 081ab45336..081ab45336 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mv.gif b/WebContent/VAADIN/themes/sampler/flags/mv.gif
index 46b63875b1..46b63875b1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mw.gif b/WebContent/VAADIN/themes/sampler/flags/mw.gif
index ad045a09c1..ad045a09c1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mx.gif b/WebContent/VAADIN/themes/sampler/flags/mx.gif
index ddc75d04d8..ddc75d04d8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mx.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mx.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/my.gif b/WebContent/VAADIN/themes/sampler/flags/my.gif
index fc7d523614..fc7d523614 100755
--- a/WebContent/ITMILL/themes/sampler/flags/my.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/my.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/mz.gif b/WebContent/VAADIN/themes/sampler/flags/mz.gif
index 7d635082a6..7d635082a6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/mz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/mz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/na.gif b/WebContent/VAADIN/themes/sampler/flags/na.gif
index c0babe7231..c0babe7231 100755
--- a/WebContent/ITMILL/themes/sampler/flags/na.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/na.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nc.gif b/WebContent/VAADIN/themes/sampler/flags/nc.gif
index b1e91b9a80..b1e91b9a80 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ne.gif b/WebContent/VAADIN/themes/sampler/flags/ne.gif
index ff4eaf074e..ff4eaf074e 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ne.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ne.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nf.gif b/WebContent/VAADIN/themes/sampler/flags/nf.gif
index c83424c2c3..c83424c2c3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ng.gif b/WebContent/VAADIN/themes/sampler/flags/ng.gif
index bdde7cb3bf..bdde7cb3bf 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ng.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ng.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ni.gif b/WebContent/VAADIN/themes/sampler/flags/ni.gif
index d05894d0cb..d05894d0cb 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ni.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ni.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nl.gif b/WebContent/VAADIN/themes/sampler/flags/nl.gif
index c1c8f46d0c..c1c8f46d0c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/no.gif b/WebContent/VAADIN/themes/sampler/flags/no.gif
index 6202d1f3a2..6202d1f3a2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/no.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/no.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/np.gif b/WebContent/VAADIN/themes/sampler/flags/np.gif
index 1096893a70..1096893a70 100755
--- a/WebContent/ITMILL/themes/sampler/flags/np.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/np.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nr.gif b/WebContent/VAADIN/themes/sampler/flags/nr.gif
index 2e4c0c5cad..2e4c0c5cad 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nu.gif b/WebContent/VAADIN/themes/sampler/flags/nu.gif
index 618210a755..618210a755 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/nz.gif b/WebContent/VAADIN/themes/sampler/flags/nz.gif
index 028a5dc6e4..028a5dc6e4 100755
--- a/WebContent/ITMILL/themes/sampler/flags/nz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/nz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/om.gif b/WebContent/VAADIN/themes/sampler/flags/om.gif
index 2b8c77501d..2b8c77501d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/om.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/om.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pa.gif b/WebContent/VAADIN/themes/sampler/flags/pa.gif
index d518b2f978..d518b2f978 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pa.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pa.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pe.gif b/WebContent/VAADIN/themes/sampler/flags/pe.gif
index 3bc7639057..3bc7639057 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pe.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pe.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pf.gif b/WebContent/VAADIN/themes/sampler/flags/pf.gif
index 849297a570..849297a570 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pg.gif b/WebContent/VAADIN/themes/sampler/flags/pg.gif
index 2d20b07856..2d20b07856 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ph.gif b/WebContent/VAADIN/themes/sampler/flags/ph.gif
index 12b380acd3..12b380acd3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ph.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ph.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pk.gif b/WebContent/VAADIN/themes/sampler/flags/pk.gif
index f3f62c2ebc..f3f62c2ebc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pl.gif b/WebContent/VAADIN/themes/sampler/flags/pl.gif
index bf10646366..bf10646366 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pm.gif b/WebContent/VAADIN/themes/sampler/flags/pm.gif
index 99bf6fdb60..99bf6fdb60 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pn.gif b/WebContent/VAADIN/themes/sampler/flags/pn.gif
index 4bc86a1d86..4bc86a1d86 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pr.gif b/WebContent/VAADIN/themes/sampler/flags/pr.gif
index 6d5d589670..6d5d589670 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ps.gif b/WebContent/VAADIN/themes/sampler/flags/ps.gif
index 6afa3b718c..6afa3b718c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ps.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ps.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pt.gif b/WebContent/VAADIN/themes/sampler/flags/pt.gif
index e735f740e1..e735f740e1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/pw.gif b/WebContent/VAADIN/themes/sampler/flags/pw.gif
index 5854510fa9..5854510fa9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/pw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/pw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/py.gif b/WebContent/VAADIN/themes/sampler/flags/py.gif
index f2e66af75d..f2e66af75d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/py.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/py.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/qa.gif b/WebContent/VAADIN/themes/sampler/flags/qa.gif
index 2e843ff9eb..2e843ff9eb 100755
--- a/WebContent/ITMILL/themes/sampler/flags/qa.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/qa.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/re.gif b/WebContent/VAADIN/themes/sampler/flags/re.gif
index 43d0b80172..43d0b80172 100755
--- a/WebContent/ITMILL/themes/sampler/flags/re.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/re.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/readme.txt b/WebContent/VAADIN/themes/sampler/flags/readme.txt
index 1028eec3b4..1028eec3b4 100755
--- a/WebContent/ITMILL/themes/sampler/flags/readme.txt
+++ b/WebContent/VAADIN/themes/sampler/flags/readme.txt
diff --git a/WebContent/ITMILL/themes/sampler/flags/ro.gif b/WebContent/VAADIN/themes/sampler/flags/ro.gif
index f5d5f125b8..f5d5f125b8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ro.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ro.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/rs.gif b/WebContent/VAADIN/themes/sampler/flags/rs.gif
index 3bd1fb2fd8..3bd1fb2fd8 100644
--- a/WebContent/ITMILL/themes/sampler/flags/rs.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/rs.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ru.gif b/WebContent/VAADIN/themes/sampler/flags/ru.gif
index b525c46233..b525c46233 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ru.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ru.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/rw.gif b/WebContent/VAADIN/themes/sampler/flags/rw.gif
index 0d095f7aed..0d095f7aed 100755
--- a/WebContent/ITMILL/themes/sampler/flags/rw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/rw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sa.gif b/WebContent/VAADIN/themes/sampler/flags/sa.gif
index 179961b692..179961b692 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sa.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sa.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sb.gif b/WebContent/VAADIN/themes/sampler/flags/sb.gif
index 8f5ff837fe..8f5ff837fe 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sb.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sb.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sc.gif b/WebContent/VAADIN/themes/sampler/flags/sc.gif
index 31b47677e0..31b47677e0 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/scotland.gif b/WebContent/VAADIN/themes/sampler/flags/scotland.gif
index 03f3f1de2c..03f3f1de2c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/scotland.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/scotland.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sd.gif b/WebContent/VAADIN/themes/sampler/flags/sd.gif
index 53ae214fa1..53ae214fa1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sd.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sd.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/se.gif b/WebContent/VAADIN/themes/sampler/flags/se.gif
index 80f6285228..80f6285228 100755
--- a/WebContent/ITMILL/themes/sampler/flags/se.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/se.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sg.gif b/WebContent/VAADIN/themes/sampler/flags/sg.gif
index 5663d39f86..5663d39f86 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sh.gif b/WebContent/VAADIN/themes/sampler/flags/sh.gif
index dcc7f3bcff..dcc7f3bcff 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sh.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sh.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/si.gif b/WebContent/VAADIN/themes/sampler/flags/si.gif
index 23852b50e3..23852b50e3 100755
--- a/WebContent/ITMILL/themes/sampler/flags/si.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/si.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sj.gif b/WebContent/VAADIN/themes/sampler/flags/sj.gif
index 6202d1f3a2..6202d1f3a2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sj.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sj.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sk.gif b/WebContent/VAADIN/themes/sampler/flags/sk.gif
index 1b3f22baf9..1b3f22baf9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sl.gif b/WebContent/VAADIN/themes/sampler/flags/sl.gif
index f0f34923dc..f0f34923dc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sm.gif b/WebContent/VAADIN/themes/sampler/flags/sm.gif
index 04d98de5a5..04d98de5a5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sn.gif b/WebContent/VAADIN/themes/sampler/flags/sn.gif
index 6dac8709d4..6dac8709d4 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/so.gif b/WebContent/VAADIN/themes/sampler/flags/so.gif
index f1961694ab..f1961694ab 100755
--- a/WebContent/ITMILL/themes/sampler/flags/so.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/so.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sr.gif b/WebContent/VAADIN/themes/sampler/flags/sr.gif
index 0f7499ad95..0f7499ad95 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/st.gif b/WebContent/VAADIN/themes/sampler/flags/st.gif
index 4f1e6e092b..4f1e6e092b 100755
--- a/WebContent/ITMILL/themes/sampler/flags/st.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/st.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sv.gif b/WebContent/VAADIN/themes/sampler/flags/sv.gif
index 2d7b159a12..2d7b159a12 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sy.gif b/WebContent/VAADIN/themes/sampler/flags/sy.gif
index dc8bd50948..dc8bd50948 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sy.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sy.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/sz.gif b/WebContent/VAADIN/themes/sampler/flags/sz.gif
index f37aaf8011..f37aaf8011 100755
--- a/WebContent/ITMILL/themes/sampler/flags/sz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/sz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tc.gif b/WebContent/VAADIN/themes/sampler/flags/tc.gif
index 11a8c232fc..11a8c232fc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/td.gif b/WebContent/VAADIN/themes/sampler/flags/td.gif
index 7aa8a10dfc..7aa8a10dfc 100755
--- a/WebContent/ITMILL/themes/sampler/flags/td.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/td.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tf.gif b/WebContent/VAADIN/themes/sampler/flags/tf.gif
index 51a4325096..51a4325096 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tg.gif b/WebContent/VAADIN/themes/sampler/flags/tg.gif
index ca6b4e7744..ca6b4e7744 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/th.gif b/WebContent/VAADIN/themes/sampler/flags/th.gif
index 0130792409..0130792409 100755
--- a/WebContent/ITMILL/themes/sampler/flags/th.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/th.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tj.gif b/WebContent/VAADIN/themes/sampler/flags/tj.gif
index 2fe38d4ab9..2fe38d4ab9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tj.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tj.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tk.gif b/WebContent/VAADIN/themes/sampler/flags/tk.gif
index 3d3a727fde..3d3a727fde 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tk.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tk.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tl.gif b/WebContent/VAADIN/themes/sampler/flags/tl.gif
index df22d58239..df22d58239 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tl.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tl.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tm.gif b/WebContent/VAADIN/themes/sampler/flags/tm.gif
index 36d0994fb9..36d0994fb9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tn.gif b/WebContent/VAADIN/themes/sampler/flags/tn.gif
index 917d4288c9..917d4288c9 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/to.gif b/WebContent/VAADIN/themes/sampler/flags/to.gif
index d7ed4d1164..d7ed4d1164 100755
--- a/WebContent/ITMILL/themes/sampler/flags/to.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/to.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tr.gif b/WebContent/VAADIN/themes/sampler/flags/tr.gif
index e407d553d2..e407d553d2 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tr.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tr.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tt.gif b/WebContent/VAADIN/themes/sampler/flags/tt.gif
index 47d3b806b5..47d3b806b5 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tv.gif b/WebContent/VAADIN/themes/sampler/flags/tv.gif
index 3c33827789..3c33827789 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tv.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tv.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tw.gif b/WebContent/VAADIN/themes/sampler/flags/tw.gif
index cacfd9b7aa..cacfd9b7aa 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tw.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/tz.gif b/WebContent/VAADIN/themes/sampler/flags/tz.gif
index 82b52ca298..82b52ca298 100755
--- a/WebContent/ITMILL/themes/sampler/flags/tz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/tz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ua.gif b/WebContent/VAADIN/themes/sampler/flags/ua.gif
index 5d6cd83f59..5d6cd83f59 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ua.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ua.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ug.gif b/WebContent/VAADIN/themes/sampler/flags/ug.gif
index 58b731ad5c..58b731ad5c 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ug.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ug.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/um.gif b/WebContent/VAADIN/themes/sampler/flags/um.gif
index 3b4c848393..3b4c848393 100755
--- a/WebContent/ITMILL/themes/sampler/flags/um.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/um.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/us.gif b/WebContent/VAADIN/themes/sampler/flags/us.gif
index 8f198f73a7..8f198f73a7 100755
--- a/WebContent/ITMILL/themes/sampler/flags/us.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/us.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/uy.gif b/WebContent/VAADIN/themes/sampler/flags/uy.gif
index 12848c7413..12848c7413 100755
--- a/WebContent/ITMILL/themes/sampler/flags/uy.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/uy.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/uz.gif b/WebContent/VAADIN/themes/sampler/flags/uz.gif
index dc9daecaa8..dc9daecaa8 100755
--- a/WebContent/ITMILL/themes/sampler/flags/uz.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/uz.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/va.gif b/WebContent/VAADIN/themes/sampler/flags/va.gif
index 2bd74468d6..2bd74468d6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/va.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/va.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/vc.gif b/WebContent/VAADIN/themes/sampler/flags/vc.gif
index 48213816af..48213816af 100755
--- a/WebContent/ITMILL/themes/sampler/flags/vc.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/vc.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ve.gif b/WebContent/VAADIN/themes/sampler/flags/ve.gif
index 19ce6c1466..19ce6c1466 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ve.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ve.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/vg.gif b/WebContent/VAADIN/themes/sampler/flags/vg.gif
index 1fc0f96eed..1fc0f96eed 100755
--- a/WebContent/ITMILL/themes/sampler/flags/vg.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/vg.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/vi.gif b/WebContent/VAADIN/themes/sampler/flags/vi.gif
index 66f9e746b6..66f9e746b6 100755
--- a/WebContent/ITMILL/themes/sampler/flags/vi.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/vi.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/vn.gif b/WebContent/VAADIN/themes/sampler/flags/vn.gif
index f1e20c9412..f1e20c9412 100755
--- a/WebContent/ITMILL/themes/sampler/flags/vn.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/vn.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/vu.gif b/WebContent/VAADIN/themes/sampler/flags/vu.gif
index 8a8b2b065f..8a8b2b065f 100755
--- a/WebContent/ITMILL/themes/sampler/flags/vu.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/vu.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/wales.gif b/WebContent/VAADIN/themes/sampler/flags/wales.gif
index 901d17507d..901d17507d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/wales.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/wales.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/wf.gif b/WebContent/VAADIN/themes/sampler/flags/wf.gif
index eaa954b136..eaa954b136 100755
--- a/WebContent/ITMILL/themes/sampler/flags/wf.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/wf.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ws.gif b/WebContent/VAADIN/themes/sampler/flags/ws.gif
index a51f939ede..a51f939ede 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ws.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ws.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/ye.gif b/WebContent/VAADIN/themes/sampler/flags/ye.gif
index 7b0183d0e1..7b0183d0e1 100755
--- a/WebContent/ITMILL/themes/sampler/flags/ye.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/ye.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/yt.gif b/WebContent/VAADIN/themes/sampler/flags/yt.gif
index a2267c0546..a2267c0546 100755
--- a/WebContent/ITMILL/themes/sampler/flags/yt.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/yt.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/za.gif b/WebContent/VAADIN/themes/sampler/flags/za.gif
index ede5258919..ede5258919 100755
--- a/WebContent/ITMILL/themes/sampler/flags/za.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/za.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/zm.gif b/WebContent/VAADIN/themes/sampler/flags/zm.gif
index b2851d2b40..b2851d2b40 100755
--- a/WebContent/ITMILL/themes/sampler/flags/zm.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/zm.gif
diff --git a/WebContent/ITMILL/themes/sampler/flags/zw.gif b/WebContent/VAADIN/themes/sampler/flags/zw.gif
index 02901f627d..02901f627d 100755
--- a/WebContent/ITMILL/themes/sampler/flags/zw.gif
+++ b/WebContent/VAADIN/themes/sampler/flags/zw.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/action_save.gif b/WebContent/VAADIN/themes/sampler/icons/action_save.gif
index 6e6f7deccd..6e6f7deccd 100644
--- a/WebContent/ITMILL/themes/sampler/icons/action_save.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/action_save.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/category.gif b/WebContent/VAADIN/themes/sampler/icons/category.gif
index 15a5ad3787..15a5ad3787 100644
--- a/WebContent/ITMILL/themes/sampler/icons/category.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/category.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/comment_yellow.gif b/WebContent/VAADIN/themes/sampler/icons/comment_yellow.gif
index df7158a477..df7158a477 100644
--- a/WebContent/ITMILL/themes/sampler/icons/comment_yellow.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/comment_yellow.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/icon_get_world.gif b/WebContent/VAADIN/themes/sampler/icons/icon_get_world.gif
index f99a5383b2..f99a5383b2 100644
--- a/WebContent/ITMILL/themes/sampler/icons/icon_get_world.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/icon_get_world.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/icon_info.gif b/WebContent/VAADIN/themes/sampler/icons/icon_info.gif
index 9dfa0e196a..9dfa0e196a 100644
--- a/WebContent/ITMILL/themes/sampler/icons/icon_info.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/icon_info.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/icon_world.gif b/WebContent/VAADIN/themes/sampler/icons/icon_world.gif
index 355c1a9505..355c1a9505 100644
--- a/WebContent/ITMILL/themes/sampler/icons/icon_world.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/icon_world.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/page_code.gif b/WebContent/VAADIN/themes/sampler/icons/page_code.gif
index 912517b833..912517b833 100644
--- a/WebContent/ITMILL/themes/sampler/icons/page_code.gif
+++ b/WebContent/VAADIN/themes/sampler/icons/page_code.gif
diff --git a/WebContent/ITMILL/themes/sampler/icons/sample.png b/WebContent/VAADIN/themes/sampler/icons/sample.png
index c1ff888aae..c1ff888aae 100644
--- a/WebContent/ITMILL/themes/sampler/icons/sample.png
+++ b/WebContent/VAADIN/themes/sampler/icons/sample.png
diff --git a/WebContent/ITMILL/themes/sampler/layouts/examplecustomlayout.html b/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html
index 1e139a6c9c..1e139a6c9c 100644
--- a/WebContent/ITMILL/themes/sampler/layouts/examplecustomlayout.html
+++ b/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html
diff --git a/WebContent/ITMILL/themes/sampler/layouts/gridexample.css b/WebContent/VAADIN/themes/sampler/layouts/gridexample.css
index 1575b51347..1575b51347 100644
--- a/WebContent/ITMILL/themes/sampler/layouts/gridexample.css
+++ b/WebContent/VAADIN/themes/sampler/layouts/gridexample.css
diff --git a/WebContent/ITMILL/themes/sampler/layouts/marginexample.css b/WebContent/VAADIN/themes/sampler/layouts/marginexample.css
index 8ae07be269..8ae07be269 100644
--- a/WebContent/ITMILL/themes/sampler/layouts/marginexample.css
+++ b/WebContent/VAADIN/themes/sampler/layouts/marginexample.css
diff --git a/WebContent/ITMILL/themes/sampler/layouts/spacingexample.css b/WebContent/VAADIN/themes/sampler/layouts/spacingexample.css
index e0680dc01e..e0680dc01e 100644
--- a/WebContent/ITMILL/themes/sampler/layouts/spacingexample.css
+++ b/WebContent/VAADIN/themes/sampler/layouts/spacingexample.css
diff --git a/WebContent/ITMILL/themes/sampler/prominentprimaryaction/prominentbg.png b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/prominentbg.png
index cef6bec5cd..cef6bec5cd 100644
--- a/WebContent/ITMILL/themes/sampler/prominentprimaryaction/prominentbg.png
+++ b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/prominentbg.png
diff --git a/WebContent/ITMILL/themes/sampler/prominentprimaryaction/styles.css b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css
index ff096097bb..ff096097bb 100644
--- a/WebContent/ITMILL/themes/sampler/prominentprimaryaction/styles.css
+++ b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css
diff --git a/WebContent/ITMILL/themes/sampler/sampler/breadcrumb-current-left.png b/WebContent/VAADIN/themes/sampler/sampler/breadcrumb-current-left.png
index 2a0cbc87c4..2a0cbc87c4 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/breadcrumb-current-left.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/breadcrumb-current-left.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/breadcrumb-current-right.png b/WebContent/VAADIN/themes/sampler/sampler/breadcrumb-current-right.png
index df814beb63..df814beb63 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/breadcrumb-current-right.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/breadcrumb-current-right.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/desc-arrow.png b/WebContent/VAADIN/themes/sampler/sampler/desc-arrow.png
index a272a11150..a272a11150 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/desc-arrow.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/desc-arrow.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/finfofade.png b/WebContent/VAADIN/themes/sampler/sampler/finfofade.png
index be8f4b46d6..be8f4b46d6 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/finfofade.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/finfofade.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/flow.gif b/WebContent/VAADIN/themes/sampler/sampler/flow.gif
index d6a90f7087..d6a90f7087 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/flow.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/flow.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/grayfade.png b/WebContent/VAADIN/themes/sampler/sampler/grayfade.png
index 330a062646..330a062646 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/grayfade.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/grayfade.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/grid.gif b/WebContent/VAADIN/themes/sampler/sampler/grid.gif
index bbc0565fce..bbc0565fce 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/grid.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/grid.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/grid.png b/WebContent/VAADIN/themes/sampler/sampler/grid.png
index 5a24c8f188..5a24c8f188 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/grid.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/grid.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/hidetree.gif b/WebContent/VAADIN/themes/sampler/sampler/hidetree.gif
index b3fe017b9b..b3fe017b9b 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/hidetree.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/hidetree.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/icons.xcf b/WebContent/VAADIN/themes/sampler/sampler/icons.xcf
index 3800aa41ce..3800aa41ce 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/icons.xcf
+++ b/WebContent/VAADIN/themes/sampler/sampler/icons.xcf
diff --git a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-bg.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bg.png
index ef8a116e38..ef8a116e38 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-bg.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-bottom.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bottom.png
index f15888ec0e..f15888ec0e 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-bottom.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bottom.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-separator.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-separator.png
index 4b3aa1751c..4b3aa1751c 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-separator.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-separator.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-top.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-top.png
index bf6ab842a9..bf6ab842a9 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/info-bubble-top.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-top.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/left-on.gif b/WebContent/VAADIN/themes/sampler/sampler/left-on.gif
index 83348dfb5b..83348dfb5b 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/left-on.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/left-on.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/left.gif b/WebContent/VAADIN/themes/sampler/sampler/left.gif
index 9e48b7b21d..9e48b7b21d 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/left.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/left.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/list.gif b/WebContent/VAADIN/themes/sampler/sampler/list.gif
index f0b610f700..f0b610f700 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/list.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/list.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/list.png b/WebContent/VAADIN/themes/sampler/sampler/list.png
index 97bcdeb2f6..97bcdeb2f6 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/list.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/list.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/logo.png b/WebContent/VAADIN/themes/sampler/sampler/logo.png
index afe7f778c7..afe7f778c7 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/logo.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/logo.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/magnifier.png b/WebContent/VAADIN/themes/sampler/sampler/magnifier.png
index 396eed7275..396eed7275 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/magnifier.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/magnifier.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/main-bg.png b/WebContent/VAADIN/themes/sampler/sampler/main-bg.png
index a535ed01cb..a535ed01cb 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/main-bg.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/main-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/mid-on.gif b/WebContent/VAADIN/themes/sampler/sampler/mid-on.gif
index ceb6645f16..ceb6645f16 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/mid-on.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/mid-on.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/mid.gif b/WebContent/VAADIN/themes/sampler/sampler/mid.gif
index eca0884b2d..eca0884b2d 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/mid.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/mid.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/next.png b/WebContent/VAADIN/themes/sampler/sampler/next.png
index 4a3b867ad0..4a3b867ad0 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/next.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/next.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/prev.png b/WebContent/VAADIN/themes/sampler/sampler/prev.png
index b6d9d455c1..b6d9d455c1 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/prev.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/prev.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/quickjump.png b/WebContent/VAADIN/themes/sampler/sampler/quickjump.png
index ad7ff01f63..ad7ff01f63 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/quickjump.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/quickjump.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/right-on.gif b/WebContent/VAADIN/themes/sampler/sampler/right-on.gif
index cd9ffba5f8..cd9ffba5f8 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/right-on.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/right-on.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/right.gif b/WebContent/VAADIN/themes/sampler/sampler/right.gif
index 3a2e73b902..3a2e73b902 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/right.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/right.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/sample-desc-arrow.png b/WebContent/VAADIN/themes/sampler/sampler/sample-desc-arrow.png
index e08ebc25d3..e08ebc25d3 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/sample-desc-arrow.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/sample-desc-arrow.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/sample-desc-bg.png b/WebContent/VAADIN/themes/sampler/sampler/sample-desc-bg.png
index 9b9eee81f9..9b9eee81f9 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/sample-desc-bg.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/sample-desc-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/sampler.png b/WebContent/VAADIN/themes/sampler/sampler/sampler.png
index d18883211d..d18883211d 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/sampler.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/sampler.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/segment.png b/WebContent/VAADIN/themes/sampler/sampler/segment.png
index a2f5049589..a2f5049589 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/segment.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/segment.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/showtree.gif b/WebContent/VAADIN/themes/sampler/sampler/showtree.gif
index 258ffe36b4..258ffe36b4 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/showtree.gif
+++ b/WebContent/VAADIN/themes/sampler/sampler/showtree.gif
diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index 8782e2d068..8782e2d068 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css
diff --git a/WebContent/ITMILL/themes/sampler/sampler/top-bg.png b/WebContent/VAADIN/themes/sampler/sampler/top-bg.png
index b28bbbb1dc..b28bbbb1dc 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/top-bg.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/top-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png b/WebContent/VAADIN/themes/sampler/sampler/tree-bg.png
index ebca8ef5f6..ebca8ef5f6 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/tree-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree.png b/WebContent/VAADIN/themes/sampler/sampler/tree.png
index f82f1fadbd..f82f1fadbd 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/tree.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/tree.png
diff --git a/WebContent/ITMILL/themes/sampler/styles.css b/WebContent/VAADIN/themes/sampler/styles.css
index 2707893d3d..2707893d3d 100644
--- a/WebContent/ITMILL/themes/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/styles.css
diff --git a/WebContent/ITMILL/themes/sampler/table/styles.css b/WebContent/VAADIN/themes/sampler/table/styles.css
index 457dc4515d..457dc4515d 100644
--- a/WebContent/ITMILL/themes/sampler/table/styles.css
+++ b/WebContent/VAADIN/themes/sampler/table/styles.css
diff --git a/WebContent/ITMILL/themes/tests-book/img/richtextarea-toolbar-fi.png b/WebContent/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png
index 4bb791c856..4bb791c856 100644
--- a/WebContent/ITMILL/themes/tests-book/img/richtextarea-toolbar-fi.png
+++ b/WebContent/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png
diff --git a/WebContent/ITMILL/themes/tests-book/img/smiley.jpg b/WebContent/VAADIN/themes/tests-book/img/smiley.jpg
index dc1a399c76..dc1a399c76 100644
--- a/WebContent/ITMILL/themes/tests-book/img/smiley.jpg
+++ b/WebContent/VAADIN/themes/tests-book/img/smiley.jpg
diff --git a/WebContent/ITMILL/themes/tests-book/layouts/layoutname.html b/WebContent/VAADIN/themes/tests-book/layouts/layoutname.html
index 6b75910783..6b75910783 100644
--- a/WebContent/ITMILL/themes/tests-book/layouts/layoutname.html
+++ b/WebContent/VAADIN/themes/tests-book/layouts/layoutname.html
diff --git a/WebContent/ITMILL/themes/tests-book/layouts/printpage.html b/WebContent/VAADIN/themes/tests-book/layouts/printpage.html
index 2e65addcd8..2e65addcd8 100644
--- a/WebContent/ITMILL/themes/tests-book/layouts/printpage.html
+++ b/WebContent/VAADIN/themes/tests-book/layouts/printpage.html
diff --git a/WebContent/ITMILL/themes/tests-book/styles.css b/WebContent/VAADIN/themes/tests-book/styles.css
index d3af11c089..d3af11c089 100644
--- a/WebContent/ITMILL/themes/tests-book/styles.css
+++ b/WebContent/VAADIN/themes/tests-book/styles.css
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html
index 52eec9f64f..52eec9f64f 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/header.png
index bf64ac4e17..bf64ac4e17 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/header.png
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/hide_properties.png
index 0069db75d9..0069db75d9 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/hide_properties.png
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/m_bg.png
index 2d37f7ffae..2d37f7ffae 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/m_bg.png
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/show_properties.png
index 6427452419..6427452419 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/show_properties.png
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/tab_handle.png
index ed0c34cabb..ed0c34cabb 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/layouts/img/tab_handle.png
diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/styles.css b/WebContent/VAADIN/themes/tests-featurebrowser/styles.css
index 088e6608c0..088e6608c0 100644
--- a/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
+++ b/WebContent/VAADIN/themes/tests-featurebrowser/styles.css
diff --git a/WebContent/ITMILL/themes/tests-tickets/icons/640ok.png b/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png
index cfafb13881..cfafb13881 100644
--- a/WebContent/ITMILL/themes/tests-tickets/icons/640ok.png
+++ b/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png
diff --git a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket1975.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
index 26b6548dd0..26b6548dd0 100644
--- a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket1975.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
diff --git a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2022.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
index 430548173d..430548173d 100644
--- a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2022.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
diff --git a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2296.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2296.html
index 9baf164d06..9baf164d06 100644
--- a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2296.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2296.html
diff --git a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2347.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2347.html
index a9bf8d0f9f..a9bf8d0f9f 100644
--- a/WebContent/ITMILL/themes/tests-tickets/layouts/Ticket2347.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2347.html
diff --git a/WebContent/ITMILL/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css
index 91355e5185..91355e5185 100644
--- a/WebContent/ITMILL/themes/tests-tickets/styles.css
+++ b/WebContent/VAADIN/themes/tests-tickets/styles.css
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/album-cover.jpg b/WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg
index 677e4f2cb1..677e4f2cb1 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/album-cover.jpg
+++ b/WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/coverflow-view.png b/WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png
index 5e15b84cd3..5e15b84cd3 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/coverflow-view.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/grid-view.png b/WebContent/VAADIN/themes/toolkittunes/images/grid-view.png
index 21f4205fdc..21f4205fdc 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/grid-view.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/grid-view.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/icon-music.png b/WebContent/VAADIN/themes/toolkittunes/images/icon-music.png
index 1e97148ecf..1e97148ecf 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/icon-music.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/icon-music.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/jump-to.png b/WebContent/VAADIN/themes/toolkittunes/images/jump-to.png
index 55d4632245..55d4632245 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/jump-to.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/jump-to.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/max.png b/WebContent/VAADIN/themes/toolkittunes/images/max.png
index 28e93b8116..28e93b8116 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/max.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/max.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/mute.png b/WebContent/VAADIN/themes/toolkittunes/images/mute.png
index 9788008cb8..9788008cb8 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/mute.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/mute.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/next.png b/WebContent/VAADIN/themes/toolkittunes/images/next.png
index 98a5e6cbbe..98a5e6cbbe 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/next.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/next.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/play.png b/WebContent/VAADIN/themes/toolkittunes/images/play.png
index 66b2160a25..66b2160a25 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/play.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/play.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/prev.png b/WebContent/VAADIN/themes/toolkittunes/images/prev.png
index 425f4c4e7f..425f4c4e7f 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/prev.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/prev.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/progress-knob.png b/WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png
index 23934226ea..23934226ea 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/progress-knob.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/selected-bg.png b/WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png
index 8785f279f9..8785f279f9 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/selected-bg.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/status-bg.png b/WebContent/VAADIN/themes/toolkittunes/images/status-bg.png
index 7af0c88380..7af0c88380 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/status-bg.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/status-bg.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/table-header-bg.png b/WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png
index 2d43b2fe10..2d43b2fe10 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/table-header-bg.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/table-view.png b/WebContent/VAADIN/themes/toolkittunes/images/table-view.png
index 083fb581bb..083fb581bb 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/table-view.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/table-view.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/toggle-visualization.png b/WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png
index 41effd5bd2..41effd5bd2 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/toggle-visualization.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/top-bg.png b/WebContent/VAADIN/themes/toolkittunes/images/top-bg.png
index 4b01255bd5..4b01255bd5 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/top-bg.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/top-bg.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/volume-bar.png b/WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png
index eb4365fe9a..eb4365fe9a 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/volume-bar.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/images/volume-knob.png b/WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png
index 6341060e04..6341060e04 100644
--- a/WebContent/ITMILL/themes/toolkittunes/images/volume-knob.png
+++ b/WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png
diff --git a/WebContent/ITMILL/themes/toolkittunes/styles.css b/WebContent/VAADIN/themes/toolkittunes/styles.css
index ad321d4903..ad321d4903 100644
--- a/WebContent/ITMILL/themes/toolkittunes/styles.css
+++ b/WebContent/VAADIN/themes/toolkittunes/styles.css
diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index 97d1484a5c..3a3a205aa5 100644
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -8,27 +8,27 @@
 			'fb' :{
 				appUri:'/FeatureBrowser', 
 				pathInfo: '/', 
-				themeUri: '/ITMILL/themes/example', 
+				themeUri: '/VAADIN/themes/example', 
 				versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
 			},
 			'calc' :{
 				appUri:'/Calc', 
 				pathInfo: '/', 
-				themeUri: '/ITMILL/themes/example', 
+				themeUri: '/VAADIN/themes/example', 
 				versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
 			},
 			'hello' :{
 				appUri:'/HelloWorld', 
 				pathInfo: '/', 
-				themeUri: '/ITMILL/themes/example', 
+				themeUri: '/VAADIN/themes/example', 
 				versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
 			}
 
 			
 		}};
 </script>
-<script language='javascript' src='/ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
-<link REL="stylesheet" TYPE="text/css" HREF="/ITMILL/themes/example/styles.css">
+<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
+<link REL="stylesheet" TYPE="text/css" HREF="/VAADIN/themes/example/styles.css">
 </head>
 <body>
 	<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0;overflow:hidden" src="javascript:false"></iframe>
diff --git a/build/build.xml b/build/build.xml
index 6782d56bb9..602b1c0232 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -25,7 +25,7 @@
 	See build.properties to define path where your gwt installation is located.
 	You must unpack platform specific binaries under linux, windows and mac directories.
 	${gwt-dir}/${platform} (linux|windows|mac) are used for
-  	a) compile WebContent/ITMILL/widgetsets
+  	a) compile WebContent/VAADIN/widgetsets
 	b) creating platform specific release ZIP/TGZ packages.
 	
 	NOTE FOR USING OOPHM:
@@ -190,7 +190,7 @@
 		<!-- Create result dir unless already exists -->
 		<mkdir dir="${result-path}" />
 
-		<!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
+		<!-- required when compiling WebContent/VAADIN/widgetsets (and also Java server-side classes) -->
 		<property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
 
 		<echo>We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev} (${gwt-version}).</echo>
@@ -659,19 +659,19 @@
 		<java2html srcdir="${output-dir}/WebContent/WEB-INF/src/${toolkit-package}/demo" destdir="${output-dir}/WebContent/doc/example-source/${toolkit-package}/demo" includes="**/*.java" style="eclipse" showLineNumbers="false" showFileName="true" showTableBorder="false" />
 
 		<!-- Add WebContent -->
-		<echo>Adding ITMILL/themes, demo and hsqldb.jar files.</echo>
+		<echo>Adding VAADIN/themes, demo and hsqldb.jar files.</echo>
 		<copy todir="${output-dir}/WebContent">
 			<fileset dir="WebContent">
 				<exclude name="**/.svn" />
 				<!-- TODO check what is neccessary -->
-				<exclude name="ITMILL/themes/tests*" />
-				<exclude name="ITMILL/themes/tests-magi/**/*" />
-				<exclude name="ITMILL/themes/tests-featurebrowser/**/*" />
-				<exclude name="ITMILL/themes/tests*/**/*" />
-				<exclude name="ITMILL/themes/sampler/**" if="build.sampler.disabled" />
+				<exclude name="VAADIN/themes/tests*" />
+				<exclude name="VAADIN/themes/tests-magi/**/*" />
+				<exclude name="VAADIN/themes/tests-featurebrowser/**/*" />
+				<exclude name="VAADIN/themes/tests*/**/*" />
+				<exclude name="VAADIN/themes/sampler/**" if="build.sampler.disabled" />
 				<include name="demo/**/*" />
 				<include name="WEB-INF/lib/hsqldb.jar" />
-				<include name="ITMILL/themes/**/*" />
+				<include name="VAADIN/themes/**/*" />
 				<include name="META-INF/**/*" />
 			</fileset>
 		</copy>
@@ -734,7 +734,7 @@
 
 	<target name="remove-widgetset-gwt-tmp">
 		<echo>Removing widgetset temp files</echo>
-		<delete dir="${output-dir}/WebContent/ITMILL/widgetsets/.gwt-tmp" includeemptydirs="true"/>
+		<delete dir="${output-dir}/WebContent/VAADIN/widgetsets/.gwt-tmp" includeemptydirs="true"/>
 	</target>
 
 	<target name="compile-widgetset-default">
@@ -742,7 +742,7 @@
 		<echo>com.vaadin.terminal.gwt.DefaultWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
-			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
 			<arg value="com.vaadin.terminal.gwt.DefaultWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
@@ -768,7 +768,7 @@
 		<echo>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
-			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
 			<arg value="com.vaadin.demo.reservation.gwt.ReservationWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
@@ -793,7 +793,7 @@
 		<echo>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
-			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
 			<arg value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
@@ -815,7 +815,7 @@
 		<echo>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
-			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
 			<arg value="com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
@@ -837,7 +837,7 @@
 		<echo>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
-			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
 			<arg value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
@@ -875,7 +875,7 @@
 		<!-- Path to GWT directory. TODO: This should be read from build.properties file. -->
 		<property name="gwt-dir" value="build/gwt" />
 
-		<!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
+		<!-- required when compiling WebContent/VAADIN/widgetsets (and also Java server-side classes) -->
 		<property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
 
 		<echo>We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
@@ -940,8 +940,8 @@
 			</fileset>
 			<fileset dir="${output-dir}/WebContent">
 				<patternset>
-					<include name="ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
-					<include name="ITMILL/themes/default/**/*" />
+					<include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
+					<include name="VAADIN/themes/default/**/*" />
 				</patternset>
 			</fileset>
 		</jar>
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 79e7512658..8f64ce735f 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -3,7 +3,7 @@
 <!-- 
 
 Client-side code is compiled by using GWTCompiler which compiles client-side Java code into
-JavaScript. Generated files are located under WebContent/ITMILL/widgetsets/*.
+JavaScript. Generated files are located under WebContent/VAADIN/widgetsets/*.
 
 Client-side compilation is required if you create new or modify existing widgets.
 You may use either this script or IT Mill Toolkit Hosted Mode.launch (in Eclipse)
@@ -43,7 +43,7 @@ See configure target to adjust this buildfile.
 		<property name="client-side-src-location" value="${base}WebContent/WEB-INF/src" />
 			
 		<!-- where to generate compiled javascript and theme files -->
-		<property name="client-side-destination" value="${base}WebContent/ITMILL/widgetsets" />
+		<property name="client-side-destination" value="${base}WebContent/VAADIN/widgetsets" />
 	</target>
 		
 	<target name="init" depends="configure">
diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt
index 151af52774..ef39576ae1 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/linux-readme.txt
@@ -61,7 +61,7 @@ IT Mill Toolkit Web Mode.launch
 WebContent/doc/example-source/build-widgetset.xml

 - example on how to build GWT widget sets for IT Mill Toolkit application

 

-WebContent/ITMILL

+WebContent/VAADIN

 - widget sets and themes

 

 gwt

diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt
index 881c076072..32981865ee 100644
--- a/build/package/mac-readme.txt
+++ b/build/package/mac-readme.txt
@@ -62,7 +62,7 @@ IT Mill Toolkit Web Mode.launch
 WebContent/doc/example-source/build-widgetset.xml

 - example on how to build GWT widget sets for IT Mill Toolkit application

 

-WebContent/ITMILL

+WebContent/VAADIN

 - widget sets and themes

 

 gwt

diff --git a/build/package/oophm-readme.txt b/build/package/oophm-readme.txt
index 6ebc58da28..a8cdef9a08 100644
--- a/build/package/oophm-readme.txt
+++ b/build/package/oophm-readme.txt
@@ -70,7 +70,7 @@ IT Mill Toolkit Web Mode.launch
 WebContent/doc/example-source/build-widgetset.xml
 - example on how to build GWT widget sets for IT Mill Toolkit application
 
-WebContent/ITMILL
+WebContent/VAADIN
 - widget sets and themes
 
 gwt
diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt
index f7d72eecdc..33f51a3500 100644
--- a/build/package/windows-readme.txt
+++ b/build/package/windows-readme.txt
@@ -61,7 +61,7 @@ IT Mill Toolkit Web Mode.launch
 WebContent/doc/example-source/build-widgetset.xml

 - example on how to build GWT widget sets for IT Mill Toolkit application

 

-WebContent/ITMILL

+WebContent/VAADIN

 - widget sets and themes

 

 gwt

diff --git a/src/com/vaadin/demo/sampler/APIResource.java b/src/com/vaadin/demo/sampler/APIResource.java
index f7138aac12..11024a5ebf 100644
--- a/src/com/vaadin/demo/sampler/APIResource.java
+++ b/src/com/vaadin/demo/sampler/APIResource.java
@@ -8,7 +8,7 @@ package com.vaadin.demo.sampler;
  */
 public class APIResource extends NamedExternalResource {
 
-    private static final String ITMILL_BASE = "http://toolkit.itmill.com/demo/doc/api/";
+    private static final String VAADIN_BASE = "http://toolkit.itmill.com/demo/doc/api/";
     private static final String JAVA_BASE = "http://java.sun.com/javase/6/docs/api/";
     private static final String SERVLET_BASE = "http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2";
     private static final String PORTLET_BASE = "http://developers.sun.com/docs/jscreator/apis/portlet";
@@ -46,7 +46,7 @@ public class APIResource extends NamedExternalResource {
         } else if (name.startsWith("java.") || name.startsWith("javax.")) {
             return JAVA_BASE;
         }
-        return ITMILL_BASE;
+        return VAADIN_BASE;
     }
 
     private static String resolveName(Class clazz) {
diff --git a/src/com/vaadin/demo/sampler/SamplerApplication.java b/src/com/vaadin/demo/sampler/SamplerApplication.java
index bab73cd6a9..cf06d929e6 100644
--- a/src/com/vaadin/demo/sampler/SamplerApplication.java
+++ b/src/com/vaadin/demo/sampler/SamplerApplication.java
@@ -71,12 +71,12 @@ public class SamplerApplication extends Application {
      */
     public static String getThemeBase() {
         try {
-            URI uri = new URI(APP_URL + "../ITMILL/themes/" + THEME_NAME + "/");
+            URI uri = new URI(APP_URL + "../VAADIN/themes/" + THEME_NAME + "/");
             return uri.normalize().toString();
         } catch (Exception e) {
             System.err.println("Theme location could not be resolved:" + e);
         }
-        return "/ITMILL/themes/" + THEME_NAME + "/";
+        return "/VAADIN/themes/" + THEME_NAME + "/";
     }
 
     // Supports multiple browser windows
diff --git a/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java b/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java
index 932286df76..35c7613707 100644
--- a/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java
+++ b/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java
@@ -25,7 +25,7 @@ public class TooltipsExample extends VerticalLayout {
         rich.setStyleName(Button.STYLE_LINK);
         // add the tooltip:
         rich
-                .setDescription("<h2><img src=\"../ITMILL/themes/sampler/icons/comment_yellow.gif\"/>A richtext tooltip</h2>"
+                .setDescription("<h2><img src=\"../VAADIN/themes/sampler/icons/comment_yellow.gif\"/>A richtext tooltip</h2>"
                         + "<ul>"
                         + "<li>HTML formatting</li><li>Images<br/>"
                         + "</li><li>etc...</li></ul>");
diff --git a/src/com/vaadin/launcher/WidgetsetCompiler.java b/src/com/vaadin/launcher/WidgetsetCompiler.java
index ecbd270d66..9496fe0640 100644
--- a/src/com/vaadin/launcher/WidgetsetCompiler.java
+++ b/src/com/vaadin/launcher/WidgetsetCompiler.java
@@ -14,7 +14,7 @@ import com.google.gwt.dev.GWTCompiler;
  * 

  * A typical invocation would use e.g. the following arguments

  * 

- * "-out WebContent/ITMILL/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"

+ * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"

  * 

  * In addition, larger memory usage settings for the VM should be used, e.g.

  * 

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 029d28bf0f..52ac148e76 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -129,7 +129,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     private static final String SERVLET_PARAMETER_PRODUCTION_MODE = "productionMode";
 
     // Configurable parameter names
-    private static final String PARAMETER_ITMILL_RESOURCES = "Resources";
+    private static final String PARAMETER_VAADIN_RESOURCES = "Resources";
 
     private static final int DEFAULT_BUFFER_SIZE = 32 * 1024;
 
@@ -139,11 +139,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     private static final String AJAX_UIDL_URI = "/UIDL";
 
-    static final String THEME_DIRECTORY_PATH = "ITMILL/themes/";
+    static final String THEME_DIRECTORY_PATH = "VAADIN/themes/";
 
     private static final int DEFAULT_THEME_CACHETIME = 1000 * 60 * 60 * 24;
 
-    static final String WIDGETSET_DIRECTORY_PATH = "ITMILL/widgetsets/";
+    static final String WIDGETSET_DIRECTORY_PATH = "VAADIN/widgetsets/";
 
     // Name of the default widget set, used if not specified in web.xml
     private static final String DEFAULT_WIDGETSET = "com.vaadin.terminal.gwt.DefaultWidgetSet";
@@ -559,8 +559,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
         } else if (requestType == RequestType.OTHER) {
             /*
-             * TODO Should *any* request really create a new application
-             * instance if none was found?
+             * TODO Shouldany request really create a new application instance
+             * if none was found?
              */
             return createApplication(request);
 
@@ -889,12 +889,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         }
 
         if ((request.getContextPath() != null)
-                && (request.getRequestURI().startsWith("/ITMILL/"))) {
-            serveStaticResourcesInITMILL(request.getRequestURI(), response);
+                && (request.getRequestURI().startsWith("/VAADIN/"))) {
+            serveStaticResourcesInVAADIN(request.getRequestURI(), response);
             return true;
         } else if (request.getRequestURI().startsWith(
-                request.getContextPath() + "/ITMILL/")) {
-            serveStaticResourcesInITMILL(request.getRequestURI().substring(
+                request.getContextPath() + "/VAADIN/")) {
+            serveStaticResourcesInVAADIN(request.getRequestURI().substring(
                     request.getContextPath().length()), response);
             return true;
         }
@@ -903,14 +903,14 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     }
 
     /**
-     * Serve resources from ITMILL directory.
+     * Serve resources from VAADIN directory.
      * 
      * @param request
      * @param response
      * @throws IOException
      * @throws ServletException
      */
-    private void serveStaticResourcesInITMILL(String filename,
+    private void serveStaticResourcesInVAADIN(String filename,
             HttpServletResponse response) throws IOException, ServletException {
 
         final ServletContext sc = getServletContext();
@@ -928,7 +928,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
                         .println("Requested resource ["
                                 + filename
                                 + "] not found from filesystem or through class loader."
-                                + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/ITMILL folder.");
+                                + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/VAADIN folder.");
                 response.setStatus(404);
                 return;
             }
@@ -1121,7 +1121,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         final String widgetsetPath = getWidgetsetLocation(request);
 
         final String staticFilePath = getApplicationOrSystemProperty(
-                PARAMETER_ITMILL_RESOURCES, widgetsetPath);
+                PARAMETER_VAADIN_RESOURCES, widgetsetPath);
 
         // Default theme does not use theme URI
         String themeUri = null;
diff --git a/src/com/vaadin/tests/TestForMultipleStyleNames.java b/src/com/vaadin/tests/TestForMultipleStyleNames.java
index a936da4218..a0facecd56 100644
--- a/src/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/src/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.OrderedLayout;
 import com.vaadin.ui.TwinColSelect;
 
 /**
- * TODO: Note you need to add Theme under WebContent/ITMILL/Themes/mytheme in
+ * TODO: Note you need to add Theme under WebContent/VAADIN/Themes/mytheme in
  * order to see actual visible results on the browser. Currently changes are
  * visible only by inspecting DOM.
  * 
@@ -44,7 +44,7 @@ public class TestForMultipleStyleNames extends CustomComponent implements
         main.addComponent(new Label(
                 "TK5 supports multiple stylenames for components."));
         main.addComponent(new Label("Note you need to add Theme under"
-                + " WebContent/ITMILL/Themes/mytheme"
+                + " WebContent/VAADIN/Themes/mytheme"
                 + " in order to see actual visible results"
                 + " on the browser. Currently changes are"
                 + " visible only by inspecting DOM."));
diff --git a/src/com/vaadin/tests/tickets/Ticket1975.java b/src/com/vaadin/tests/tickets/Ticket1975.java
index 1d35046475..9adc67f529 100644
--- a/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -47,7 +47,7 @@ public class Ticket1975 extends Application {
 

                     }));

             File f = new File(wc.getBaseDirectory().getAbsoluteFile()

-                    + "/ITMILL/themes/" + getTheme()

+                    + "/VAADIN/themes/" + getTheme()

                     + "/layouts/Ticket1975.html");

 

             cl2 = new CustomLayout(new FileInputStream(f));

diff --git a/src/com/vaadin/tests/tickets/Ticket2022.java b/src/com/vaadin/tests/tickets/Ticket2022.java
index f88896a5f8..9dfcabc208 100644
--- a/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/src/com/vaadin/tests/tickets/Ticket2022.java
@@ -15,7 +15,7 @@ public class Ticket2022 extends Application {
 

         // WebApplicationContext wac = ((WebApplicationContext) getContext());

         // File f = new File(wac.getBaseDirectory().getAbsoluteFile()

-        // + "/ITMILL/themes/" + getTheme() + "/layouts/Ticket2022.html");

+        // + "/VAADIN/themes/" + getTheme() + "/layouts/Ticket2022.html");

 

         l = new CustomLayout("Ticket2022");

         // try {

diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index 6ec7986a29..3b923e5d08 100644
--- a/src/com/vaadin/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -269,7 +269,7 @@ public class CustomLayout extends AbstractLayout {
      * Set the name of the template used to draw custom layout.
      * 
      * With GWT-adapter, the template with name 'templatename' is loaded from
-     * ITMILL/themes/themename/layouts/templatename.html. If the theme has not
+     * VAADIN/themes/themename/layouts/templatename.html. If the theme has not
      * been set (with Application.setTheme()), themename is 'default'.
      * 
      * @param templateName
diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java
index 6474ff032e..a9f94bbf54 100644
--- a/src/com/vaadin/ui/LoginForm.java
+++ b/src/com/vaadin/ui/LoginForm.java
@@ -126,10 +126,10 @@ public class LoginForm extends CustomComponent {
     protected byte[] getLoginHTML() {
 
         String theme = getApplication().getMainWindow().getTheme();
-        String guessedThemeUri = getApplication().getURL() + "ITMILL/themes/"
+        String guessedThemeUri = getApplication().getURL() + "VAADIN/themes/"
                 + (theme == null ? "default" : theme) + "/styles.css";
         String guessedThemeUri2 = getApplication().getURL()
-                + "../ITMILL/themes/" + (theme == null ? "default" : theme)
+                + "../VAADIN/themes/" + (theme == null ? "default" : theme)
                 + "/styles.css";
 
         String appUri = getApplication().getURL().toString();