using specific themes error layout
code cleanup