Edit Area Design/Edit Layout Design Custom Classes in Nested Layouts

Developing with Concrete
1

Hi all. I have a client that likes to have a lot of flexibility on page layouts and as a result the site has very limited structure. Instead she leverages the bootstrap layout feature and pre-created custom classes to make them do what she wants. The problem I am running into is when a layout is nested within a layout the drop downs for custom classes under ‘Edit Area Design’ and ‘Edit Layout Design’ no longer list the options available in the nested layouts or areas. I know you can type them in manually but that requires knowing them from memory and isn’t very user friendly.
This is the code I am using in page_theme.php

public function getThemeBlockClasses() {
      return array(
            '*' => array( 'custom-class', 'custom-class-2' ),
            'core_area_layout' => array( 'custom-class', 'custom-class-2' )
            /* Is the 'core_area_layout' redundant since the wildcard is listed? */
      );		
}
public function getThemeAreaClasses()
	{
		$areas = \Concrete\Core\Area\Area::getHandleList();
		$classes = array();
		foreach ($areas as $area) {
			$classes[$area] = array(
				'custom-class',
				'custom-class-2'
			);
		}
		return $classes;
	}

Any ideas how to make the classes show in the nested layouts?
Thanks in advance.
C