diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/Kopie von incoming.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/Kopie von incoming.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/Kopie von incoming.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/Kopie von incoming.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/hincoming.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/hincoming.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/hincoming.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/hincoming.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/houtgoing.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/houtgoing.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/houtgoing.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/images.sh b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/images.sh
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/Thumbs.db b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/Thumbs.db
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/Thumbs.db
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/Thumbs.db
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_BR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_BR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_CR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_CR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_TR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_TR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick-left.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick-left.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick-left.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick-left.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick-right.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick-right.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick-right.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick-right.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-blue/bubble_tick.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-blue/bubble_tick.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_BR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_BR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_CR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_CR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_TR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_TR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick-left.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick-left.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick-left.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick-left.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick-right.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick-right.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick-right.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick-right.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-green/bubble_tick.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-green/bubble_tick.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_BR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_BR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_CR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_CR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_TR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_TR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick-left.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick-left.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick-left.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick-left.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick-right.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick-right.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick-right.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick-right.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-grey/bubble_tick.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-grey/bubble_tick.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_BR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_BR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_CR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_CR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_TR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_TR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick-left.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick-left.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick-left.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick-left.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick-right.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick-right.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick-right.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick-right.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-orange/bubble_tick.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-orange/bubble_tick.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_BR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_BR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_CR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_CR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TC.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TC.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TC.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TC.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TL.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TL.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TL.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TL.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TR.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TR.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_TR.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_TR.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick-left.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick-left.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick-left.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick-left.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick-right.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick-right.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick-right.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick-right.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick.png b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick.png
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/img/bubble-red/bubble_tick.png
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/img/bubble-red/bubble_tick.png
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/incoming.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/incoming.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/incoming.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/incoming.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/info.xml b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/info.xml
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/info.xml
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/info.xml
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/main.css b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/main.css
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/main.css
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/main.css
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/ooutgoing.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/ooutgoing.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/ooutgoing.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/ooutgoing.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/outgoing.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/outgoing.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/outgoing.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/outgoing.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/system.htm b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/system.htm
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/system.htm
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/system.htm
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/variants/color.css b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/variants/color.css
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/variants/color.css
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/variants/color.css
diff --git a/retroshare-gui/src/gui/qss/chat/Bubble Compact/private/variants/standard.css b/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/variants/standard.css
similarity index 100%
rename from retroshare-gui/src/gui/qss/chat/Bubble Compact/private/variants/standard.css
rename to retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/variants/standard.css
diff --git a/retroshare-gui/src/retroshare.in b/retroshare-gui/src/retroshare.in
index e3587f2de..2ec5d9770 100644
--- a/retroshare-gui/src/retroshare.in
+++ b/retroshare-gui/src/retroshare.in
@@ -338,6 +338,7 @@ Section $(sec_main) sec_main
   File /r "${QTBASE}\qt\bin\libgcc_s_dw2-1.dll"
   File /r "${QTBASE}\qt\plugins\imageformats"
   File /r  ${QTBASE}\qt\qt_*.qm
+  File /r  translations\qt_*.qm
   File /r "release\pthreadGC2d.dll"
   File /r "H:\Development\lib\libminiupnpc-1.3\miniupnpc.dll"
   File /r "changelog.txt"
@@ -353,11 +354,7 @@ Section  $(sec_data) sec_data
 
   ; Set Section Files and Shortcuts
   SetOutPath "$APPDATA\RetroShare\"
-  ;File /r "data\*"
-  
-  ; Set Section Plugins
-  SetOutPath "$APPDATA\RetroShare\plugins\"
-  ;File /r "plugins\"
+  ;File /r "data\*" 
   
   ; Set Section qss and exclude svn
   SetOutPath "$INSTDIR\qss\"
@@ -377,7 +374,8 @@ Section  $(sec_data) sec_data
 	
   ; Add Chat Style
   SetOutPath "$APPDATA\RetroShare\stylesheets\"
-  File /r gui\qss\chat\bubble
+  File /r gui\qss\chat\Bubble
+  File /r gui\qss\chat\Bubble_Compact
      
 	
 SectionEnd
diff --git a/retroshare-gui/src/retroshare.nsi b/retroshare-gui/src/retroshare.nsi
index ccf70236d..ddfe67e2d 100644
--- a/retroshare-gui/src/retroshare.nsi
+++ b/retroshare-gui/src/retroshare.nsi
@@ -143,13 +143,13 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
     LangString sec_main ${LANG_GERMAN} "Programme"
     LangString sec_data ${LANG_GERMAN} "Programm Skins"
     LangString sec_plugins ${LANG_GERMAN} "Plug-ins"
-    LangString sec_shortcuts ${LANG_GERMAN} "Verknuepfungen"
-    LangString sec_link ${LANG_GERMAN} "Dateiverknuepfungen"
+    LangString sec_shortcuts ${LANG_GERMAN} "Verknüpfungen"
+    LangString sec_link ${LANG_GERMAN} "Dateiverknüpfungen"
     LangString sec_autostart ${LANG_GERMAN} "Autostart"
     LangString DESC_sec_main ${LANG_GERMAN} "Installiert die RetroShare Programmdateien."
     LangString DESC_sec_data ${LANG_GERMAN} "Installiert RetroShare Skins"
     LangString DESC_sec_plugins ${LANG_GERMAN} "Installiert die RetroShare Erweiterungen."
-    LangString DESC_sec_shortcuts ${LANG_GERMAN} "RetroShare Verknuepfung im Startmenue, Desktop oder im Schnellstarter erstellen."
+    LangString DESC_sec_shortcuts ${LANG_GERMAN} "RetroShare Verknüpfung im Startmenü, Desktop oder im Schnellstarter erstellen."
     LangString DESC_sec_link ${LANG_GERMAN} "RetroShare mit .rsc Dateiendung verknuepfen"
     LangString LANGUAGEID ${LANG_GERMAN} "1031"
             
@@ -341,7 +341,10 @@ Section $(sec_main) sec_main
   File /r "release\pthreadGC2d.dll"
   File /r "d:\Development\lib\libminiupnpc-1.3\miniupnpc.dll"
   File /r "changelog.txt"
-  File /r /x Data "release\bdboot.txt" 
+  File /r /x Data "release\bdboot.txt"
+  
+  SetOutPath "$INSTDIR\translations\"
+  File /r translations\qt_*.qm 
 
 
 SectionEnd
@@ -355,10 +358,6 @@ Section  $(sec_data) sec_data
   SetOutPath "$APPDATA\RetroShare\"
   ;File /r "data\*"
   
-  ; Set Section Plugins
-  SetOutPath "$APPDATA\RetroShare\plugins\"
-  ;File /r "plugins\"
-  
   ; Set Section qss and exclude svn
   SetOutPath "$INSTDIR\qss\"
   File /r /x .svn qss\*.*
@@ -377,7 +376,8 @@ Section  $(sec_data) sec_data
 	
   ; Add Chat Style
   SetOutPath "$APPDATA\RetroShare\stylesheets\"
-  File /r gui\qss\chat\bubble
+  File /r gui\qss\chat\Bubble
+  File /r gui\qss\chat\Bubble_Compact
      
 	
 SectionEnd