resolved many bugs
updated test file
updated theme