added all suggestions by maniac103, that should be it
bug fixes, no attributes for theme attribute