diff --git a/demos/arcade/last_day_of_summer_NamcoC15.fur b/demos/arcade/last_day_of_summer_NamcoC15.fur
index bf794a44b..16707b5af 100644
Binary files a/demos/arcade/last_day_of_summer_NamcoC15.fur and b/demos/arcade/last_day_of_summer_NamcoC15.fur differ
diff --git a/demos/esfm/esfm_ins.fur b/demos/esfm/esfm_ins.fur
deleted file mode 100644
index 48af457e8..000000000
Binary files a/demos/esfm/esfm_ins.fur and /dev/null differ
diff --git a/demos/genesis/inside_the_computer.fur b/demos/genesis/inside_the_computer.fur
deleted file mode 100644
index b3bd29c0f..000000000
Binary files a/demos/genesis/inside_the_computer.fur and /dev/null differ
diff --git a/demos/misc/teddy_bear_midnight_jam_ted.fur b/demos/misc/teddy_bear_midnight_jam_ted.fur
index 7ee9d067c..df0fde495 100644
Binary files a/demos/misc/teddy_bear_midnight_jam_ted.fur and b/demos/misc/teddy_bear_midnight_jam_ted.fur differ
diff --git a/demos/msx/attack_the_barbarian.fur b/demos/msx/attack_the_barbarian.fur
deleted file mode 100644
index b5d77ad29..000000000
Binary files a/demos/msx/attack_the_barbarian.fur and /dev/null differ
diff --git a/demos/multichip/second_dimension_demo.fur b/demos/multichip/second_dimension_demo.fur
index bbbbda54b..e84d0dd2b 100644
Binary files a/demos/multichip/second_dimension_demo.fur and b/demos/multichip/second_dimension_demo.fur differ
diff --git a/demos/virtualboy/honeydippedkiwis.fur b/demos/virtualboy/honeydippedkiwis.fur
index 5897ed677..a2fc355f3 100644
Binary files a/demos/virtualboy/honeydippedkiwis.fur and b/demos/virtualboy/honeydippedkiwis.fur differ
diff --git a/instruments/ESFM/deep_bass.fui b/instruments/ESFM/deep_bass.fui
new file mode 100644
index 000000000..33b586469
Binary files /dev/null and b/instruments/ESFM/deep_bass.fui differ
diff --git a/instruments/ESFM/delayed.fui b/instruments/ESFM/delayed.fui
new file mode 100644
index 000000000..e15414a91
Binary files /dev/null and b/instruments/ESFM/delayed.fui differ
diff --git a/instruments/ESFM/fakebits.fui b/instruments/ESFM/fakebits.fui
new file mode 100644
index 000000000..eefdcb3d3
Binary files /dev/null and b/instruments/ESFM/fakebits.fui differ
diff --git a/instruments/ESFM/maj_chord.fui b/instruments/ESFM/maj_chord.fui
new file mode 100644
index 000000000..6b3406a0b
Binary files /dev/null and b/instruments/ESFM/maj_chord.fui differ
diff --git a/instruments/ESFM/min_chord.fui b/instruments/ESFM/min_chord.fui
new file mode 100644
index 000000000..b37292c1b
Binary files /dev/null and b/instruments/ESFM/min_chord.fui differ
diff --git a/instruments/ESFM/obligatory_supersaw.fui b/instruments/ESFM/obligatory_supersaw.fui
new file mode 100644
index 000000000..e2c2c64db
Binary files /dev/null and b/instruments/ESFM/obligatory_supersaw.fui differ
diff --git a/instruments/ESFM/phat_square.fui b/instruments/ESFM/phat_square.fui
new file mode 100644
index 000000000..ac5a1f6b3
Binary files /dev/null and b/instruments/ESFM/phat_square.fui differ
diff --git a/instruments/ESFM/sine_w_reverb.fui b/instruments/ESFM/sine_w_reverb.fui
new file mode 100644
index 000000000..e971dd220
Binary files /dev/null and b/instruments/ESFM/sine_w_reverb.fui differ
diff --git a/instruments/ESFM/squishsine_organ.fui b/instruments/ESFM/squishsine_organ.fui
new file mode 100644
index 000000000..dee30a4ed
Binary files /dev/null and b/instruments/ESFM/squishsine_organ.fui differ
diff --git a/instruments/ESFM/stereo_brass_or_strings.fui b/instruments/ESFM/stereo_brass_or_strings.fui
new file mode 100644
index 000000000..f88d188b7
Binary files /dev/null and b/instruments/ESFM/stereo_brass_or_strings.fui differ
diff --git a/instruments/ESFM/sytnth_stringfui b/instruments/ESFM/sytnth_stringfui
new file mode 100644
index 000000000..5ecbc719e
Binary files /dev/null and b/instruments/ESFM/sytnth_stringfui differ
diff --git a/instruments/ESFM/weird_bass.fui b/instruments/ESFM/weird_bass.fui
new file mode 100644
index 000000000..081d2040c
Binary files /dev/null and b/instruments/ESFM/weird_bass.fui differ
diff --git a/instruments/ESFM/wood_block.fui b/instruments/ESFM/wood_block.fui
new file mode 100644
index 000000000..c255fb553
Binary files /dev/null and b/instruments/ESFM/wood_block.fui differ