Updated files for customization & tweaking