Theme-and-fixes-2d86e79
Theme and fixes