Theme and some fixes