added todos
cleaned up theme stubs