diff --git a/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia.pdf.0.png
index 9b3523e..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia_mac.pdf.0.png
new file mode 100644
index 0000000..a3192e2
--- /dev/null
+++ b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skiapaths.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..9b3523e
--- /dev/null
+++ b/fx/FRC_8.2.4_part1/FRC_11_8.2.4_View_edit_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_12_8.2.4_View_remove_all_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_13_8.2.4_View_remove_value_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_14_8.2.4_Sort_remove_all_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_15_8.2.4_Sort_remove_value_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_1_8.2.4_Type_8.6__expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_2_8.2.4_Type_8.6__remove_value_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_3_8.2.4_Type_8.6__edit__expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_4_8.2.4_Schema_8.6__remove_all_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_5_8.2.4_Schema_8.6__remove_value_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_6_8.2.4_Schema_8.6__remove_obj_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_6_8.2.4_Schema_8.6__remove_obj_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_6_8.2.4_Schema_8.6__remove_obj_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_6_8.2.4_Schema_8.6__remove_obj_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_7_8.2.4_View_H_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_7_8.2.4_View_H_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_7_8.2.4_View_H_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_7_8.2.4_View_H_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_8_8.2.4_View_D_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_8_8.2.4_View_D_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_8_8.2.4_View_D_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_8_8.2.4_View_D_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia.pdf.0.png
index 2343d1c..9c89b26 100644
--- a/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia_mac.pdf.0.png b/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia_mac.pdf.0.png
index 7ac39aa..a3192e2 100644
--- a/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia_mac.pdf.0.png
+++ b/fx/FRC_8.2.4_part1/FRC_9_8.2.4_View_T_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia.pdf.0.png b/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia.pdf.0.png
new file mode 100644
index 0000000..2568775
--- /dev/null
+++ b/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia_mac.pdf.0.png b/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia_mac.pdf.0.png
new file mode 100644
index 0000000..3516d68
--- /dev/null
+++ b/fx/FRC_8.5_part1/FRC_8.5_Screen_Img_D_Launch_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.5_part2/FRC_8.5_URI_IsMap_expected_skia.pdf.0.png b/fx/FRC_8.5_part2/FRC_8.5_URI_IsMap_expected_skia.pdf.0.png
new file mode 100644
index 0000000..bbc6958
--- /dev/null
+++ b/fx/FRC_8.5_part2/FRC_8.5_URI_IsMap_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/image/bi_expected_skia.pdf.0.png b/fx/image/bi_expected_skia.pdf.0.png
index 0ae34dd..e30feda 100644
--- a/fx/image/bi_expected_skia.pdf.0.png
+++ b/fx/image/bi_expected_skia.pdf.0.png
Binary files differ
diff --git a/fx/image/bi_expected_skia_mac.pdf.0.png b/fx/image/bi_expected_skia_mac.pdf.0.png
new file mode 100644
index 0000000..6318074
--- /dev/null
+++ b/fx/image/bi_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/fx/image/bi_expected_skiapaths.pdf.0.png b/fx/image/bi_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..0ae34dd
--- /dev/null
+++ b/fx/image/bi_expected_skiapaths.pdf.0.png
Binary files differ