Are you still working on the theme? If you would like I could contribute some smaller fixes in order the clean up the otherwise great work. BR wucherpfennig