2. theme added and some minor fixes