#99, add theme properties