almost complete the first theme
merge with logging