REF #4244: move themes to css folder
Merge remote-tracking branch 'origin/master'