major update to both themes