Work on theme support and install