Updated default theme and output functions