fixing issues with theme-manager
fixing minor bugs considering integration in theme-manager