Little update to themes functionality