Synced up versions across files. Used package variables when available.