Jb ras mr1

I fixed the merge conflicts previously was because my frameworks has theme support but it should work fine now for rasbeanjelly after the png images.  You could probably just backup the png images and then copy them over after the merge and re-push with new png images.  Cheers.