Follow system theme added and bug fixes
