Final tweaks to the first version of the theme