cleanup + work with proper theme