Started merging mobile detect with the template/theme