SLY is totally right, learn the basic major and minor scales. Learn the relative major minor keys. Seriously the basic pentatonics are based off of these and only add a couple more notes to memorize the positions on. Modes is a whole other musical theory thing to concern yourself with but it's worht it to know. If you want to get unboxed experiment with keys and stuff. Learn new things. Play off the top fo your head. or think some new stuff up. All it takes is effort to break your old habbits.
Hope that helps any.