second commit with theme almost done