Small fixes for themes & more screenshots