Re-wrote from default theme base for neatness and originality.