Theme modification (colors), and fixed a bug with Favorites