Completed updating of Categories to new Android methods.