Added Themes and finished Chapter 2