fixed resources
book popup colors
fixed SDK compatibility
fixed merge