#336: Improved Implementation, removed OR concatenation, CSS for all themes