Internalized skia and cleaned up manifest formatting