Change colours to states and s/URL/URI/