Updates to the theme with bug fixes and modifications