More options to customize the Shape Style panel ?

Hi everyone, 

I was playing with the Shape Style options and Color Themes, and I realized that it can be quite troublesome. Since they are linked together, the prestyles are based with parts of the Color Themes like on the picture (light 1 outline, Colored Fill - Accent 1). My problem is that the general "light 1 Outline" is also touching the background (if you put some). 

My question is: Is there an easy way to setup the border of each "style" so it changes with each color theme? Because right now, if I am in this actual setup and changes the color theme, the result asks me to redo changes again for each shape.

Theme 1

Theme 2

Maybe I'm missing an important parameter..