merged brownell code into the theme