FIx #18
some bugs
update theme