Working on a Theme

Working on Theme 3 (doing these out of order). Some of these files will
be deleted later.