Updating utils and theme