Added support for theme inheritance
Added comments and removed to do list item
Removed automatic  loading from apply theme function