diff --git a/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected.pdf.0.png
index 64f62a2..551ddbe 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected_mac.pdf.0.png
index 75ba4bd..83f8fa1 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_AuthEvent_EFOpen_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected.pdf.0.png
index 2c79c7d..8afff15 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected_mac.pdf.0.png
index c065c86..28e5664 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CFM_AESV2__EncryptMetadata_F_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected.pdf.0.png
index 7535808..38ed20e 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected_mac.pdf.0.png
index 2104d6f..c1db376 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CF_EFF_StdCF_Strf_Stmf_Identity_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected.pdf.0.png
index 8a12187..f19f137 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected_mac.pdf.0.png
index 1910ccb..d616ce0 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_CF_Strf_stmf_StdCF_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected.pdf.0.png
index 751f4ad..dc27856 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected_mac.pdf.0.png
index 427d616..40b1173 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_EncryptMetadata_None_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected.pdf.0.png
index 5497db1..8e19f7f 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected_mac.pdf.0.png
index 90a4d9d..9fc956b 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_V_4_CFM_V2__expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected.pdf.0.png
index 1d91dde..d37165a 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected_mac.pdf.0.png b/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected_mac.pdf.0.png
index 83320e5..45baef2 100644
--- a/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected_mac.pdf.0.png
+++ b/fx/FRC_3.5_part1/FRC_3.5_v_2_length_128_AuthEvent_DocOpen__expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected.pdf.0.png
index ddddf49..c4fdb68 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected_mac.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected_mac.pdf.0.png
index afa3f42..c1109af 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected_mac.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_different_values_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected.pdf.0.png
index 073981c..a028fe5 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected_mac.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected_mac.pdf.0.png
index e9430e8..3fcfffc 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected_mac.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_I_remove_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected.pdf.0.png
index 94a6dbb..961ac62 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected_mac.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected_mac.pdf.0.png
index ecbf1c9..3bf7bad 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected_mac.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_different_values_BE__expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected.pdf.0.png
index 84cdd8a..0ece65f 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected_mac.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected_mac.pdf.0.png
index 83cdbd3..9cbc142 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected_mac.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_S_not_exist_BS__expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected.pdf.0.png
index 85a601e..5b131c1 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected.pdf.0.png
Binary files differ
diff --git a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected_mac.pdf.0.png b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected_mac.pdf.0.png
index 08c76f2..b087187 100644
--- a/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected_mac.pdf.0.png
+++ b/fx/FRC_8.4_part2/FRC_8.4.3_Border_Stypes_W_different_values_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/action/9_shapes_expected.pdf.0.png b/fx/action/9_shapes_expected.pdf.0.png
index 2e0d162..ad0647d 100644
--- a/fx/action/9_shapes_expected.pdf.0.png
+++ b/fx/action/9_shapes_expected.pdf.0.png
Binary files differ
diff --git a/fx/action/9_shapes_expected_mac.pdf.0.png b/fx/action/9_shapes_expected_mac.pdf.0.png
new file mode 100644
index 0000000..ad0647d
--- /dev/null
+++ b/fx/action/9_shapes_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/js/widget_javascript_expected.pdf.0.png b/fx/js/widget_javascript_expected.pdf.0.png
index aa2ca06..86e2e69 100644
--- a/fx/js/widget_javascript_expected.pdf.0.png
+++ b/fx/js/widget_javascript_expected.pdf.0.png
Binary files differ
diff --git a/fx/mulobj/2/2_3_pencil_expected.pdf.0.png b/fx/mulobj/2/2_3_pencil_expected.pdf.0.png
index e645df1..8058675 100644
--- a/fx/mulobj/2/2_3_pencil_expected.pdf.0.png
+++ b/fx/mulobj/2/2_3_pencil_expected.pdf.0.png
Binary files differ
diff --git a/fx/mulobj/2/2_3_pencil_expected_mac.pdf.0.png b/fx/mulobj/2/2_3_pencil_expected_mac.pdf.0.png
new file mode 100644
index 0000000..8058675
--- /dev/null
+++ b/fx/mulobj/2/2_3_pencil_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/mulobj/3/3_0_cloud_expected.pdf.0.png b/fx/mulobj/3/3_0_cloud_expected.pdf.0.png
index d48ee09..eddb5ed 100644
--- a/fx/mulobj/3/3_0_cloud_expected.pdf.0.png
+++ b/fx/mulobj/3/3_0_cloud_expected.pdf.0.png
Binary files differ
diff --git a/fx/path/11_expected.pdf.0.png b/fx/path/11_expected.pdf.0.png
index 37e319e..4592a3f 100644
--- a/fx/path/11_expected.pdf.0.png
+++ b/fx/path/11_expected.pdf.0.png
Binary files differ
diff --git a/fx/path/path_3_expected.pdf.0.png b/fx/path/path_3_expected.pdf.0.png
index d55529b..9952511 100644
--- a/fx/path/path_3_expected.pdf.0.png
+++ b/fx/path/path_3_expected.pdf.0.png
Binary files differ
diff --git a/fx/path/path_3_expected.pdf.1.png b/fx/path/path_3_expected.pdf.1.png
index 6c56dcf..ddf4c6c 100644
--- a/fx/path/path_3_expected.pdf.1.png
+++ b/fx/path/path_3_expected.pdf.1.png
Binary files differ
diff --git a/fx/path/path_3_expected_mac.pdf.0.png b/fx/path/path_3_expected_mac.pdf.0.png
new file mode 100644
index 0000000..9952511
--- /dev/null
+++ b/fx/path/path_3_expected_mac.pdf.0.png
Binary files differ
diff --git a/fx/path/path_3_expected_mac.pdf.1.png b/fx/path/path_3_expected_mac.pdf.1.png
new file mode 100644
index 0000000..ddf4c6c
--- /dev/null
+++ b/fx/path/path_3_expected_mac.pdf.1.png
Binary files differ
diff --git a/fx/path/pentagon_expected.pdf.0.png b/fx/path/pentagon_expected.pdf.0.png
index afe34bd..dadfce1 100644
--- a/fx/path/pentagon_expected.pdf.0.png
+++ b/fx/path/pentagon_expected.pdf.0.png
Binary files differ
diff --git a/fx/path/pentagon_expected_mac.pdf.0.png b/fx/path/pentagon_expected_mac.pdf.0.png
new file mode 100644
index 0000000..dadfce1
--- /dev/null
+++ b/fx/path/pentagon_expected_mac.pdf.0.png
Binary files differ