Update #2

@todo
-themes
-pictures