fix, because too much code was added to this version, shouldn't have
variables for the theme function in it