Updated files to match stable version instead of specific one -> Less rewriting..