Added theme variables doc and some restructuring