Tidying up of theme