Update and cleanup base theme