Modularizing some of the default theme (for easier updating)