Some installation theme fixes