You can't add the discrete Samsung codes into the preprogrammed Sony macro. Sorry, but it is either one or the other. But you should be able to find discrete codes for everything else. See this thread for discrete codes.
[Link: hifi-remote.com] That is the only way to get all the discrete codes you need into your macro's. You need to click on Setup codes to find the advanced code for your equipment, and then click on the Advanced Code List to find the discrete codes.