Added TODO's + test Theme.