Some optimizations, bug fixes and Screen theme