diff --git a/editor/editor.handler.php b/editor/editor.handler.php
index 208579c6..2ad44db7 100644
--- a/editor/editor.handler.php
+++ b/editor/editor.handler.php
@@ -121,6 +121,7 @@ function json_blob(){
 							, menus: '<?php echo admin_url( "nav-menus.php" );?>'
 							, widgets: '<?php echo $this->edit_post_link();?>'
 							, StyleSheetURL: '<?php echo get_stylesheet_directory_uri(); ?>'
+							, ParentStyleSheetURL: '<?php echo get_template_directory_uri(); ?>'
 						}
 					}
 
diff --git a/editor/editor.settings.config.php b/editor/editor.settings.config.php
index ce6d30cd..ea5cffea 100644
--- a/editor/editor.settings.config.php
+++ b/editor/editor.settings.config.php
@@ -204,7 +204,7 @@ function basic(){
 				'imgsize' 			=> 	'16',
 				'title' 		=> 	__( 'Favicon Image', 'pagelines' ),
 				'help' 			=> 	__( 'Enter the full URL location of your custom <strong>favicon</strong> which is visible in browser favorites and tabs.<br/> <strong>Must be .png or .ico file - 32px by 32px</strong>.', 'pagelines' ),
-				'default'		=> PL_EDITOR_URL . '/images/default-favicon.png'
+				'default'		=>  '[pl_parent_url]/images/default-favicon.png'
 			),
 
 
@@ -215,7 +215,7 @@ function basic(){
 				'imgsize' 			=> 	'80',
 				'sizemode'		=> 'height',
 				'title' 		=> __( 'Login Page Image', 'pagelines' ),
-				'default'		=> PL_EDITOR_URL . '/images/default-login-image.png',
+				'default'		=> '[pl_parent_url]/images/default-login-image.png',
 				'help'			=> __( 'This image will be used on the login page to your admin. Use an image that is approximately <strong>80px</strong> in height.', 'pagelines' )
 			),
 
@@ -225,7 +225,7 @@ function basic(){
 				'type' 			=> 	'image_upload',
 				'imgsize' 			=> 	'72',
 				'title' 		=> __( 'Mobile Touch Image', 'pagelines' ),
-				'default'		=> PL_EDITOR_URL . '/images/default-touch-icon.png',
+				'default'		=> '[pl_parent_url]/images/default-touch-icon.png',
 				'help'			=> __( 'Enter the full URL location of your Apple Touch Icon which is visible when your users set your site as a <strong>webclip</strong> in Apple Iphone and Touch Products. It is an image approximately 144px by 144px in either .jpg, .gif or .png format.', 'pagelines' )
 			),
 
diff --git a/editor/js/pl.library.js b/editor/js/pl.library.js
index 60557648..14f5e641 100644
--- a/editor/js/pl.library.js
+++ b/editor/js/pl.library.js
@@ -82,6 +82,8 @@ function pl_do_shortcode(opt) {
 	switch(shortcode) {
 		case 'pl_child_url':
 			opt = opt.replace(/\[pl_child_url\]/g, jQuery.pl.config.urls.StyleSheetURL)
+		case 'pl_parent_url':
+			opt = opt.replace(/\[pl_parent_url\]/g, jQuery.pl.config.urls.ParentStyleSheetURL)
 	}
 	return opt
 }
diff --git a/editor/images/default-favicon.png b/images/default-favicon.png
similarity index 100%
rename from editor/images/default-favicon.png
rename to images/default-favicon.png
diff --git a/editor/images/default-login-image.png b/images/default-login-image.png
similarity index 100%
rename from editor/images/default-login-image.png
rename to images/default-login-image.png
diff --git a/editor/images/default-touch-icon.png b/images/default-touch-icon.png
similarity index 100%
rename from editor/images/default-touch-icon.png
rename to images/default-touch-icon.png
diff --git a/includes/class.shortcodes.php b/includes/class.shortcodes.php
index ce49c490..852b6ddc 100644
--- a/includes/class.shortcodes.php
+++ b/includes/class.shortcodes.php
@@ -93,7 +93,7 @@ private function shortcodes_core() {
 			'pl_blockquote'				=>	array( 'function' => 'pl_blockquote_shortcode' ),
 			'pl_alertbox'				=>	array( 'function' => 'pl_alertbox_shortcode' ),
 			'show_authors'				=>	array( 'function' => 'show_multiple_authors' ),
-			'pl_codebox'			    =>	array( 'function' =>	'pl_codebox_shortcode' ),
+			'pl_codebox'			    =>	array( 'function' => 'pl_codebox_shortcode' ),
 			'pl_label'				    =>	array( 'function' => 'pl_label_shortcode' ),
 			'pl_badge'			        =>	array( 'function' => 'pl_badge_shortcode' ),
 			'googleplus'				=>	array( 'function' => 'pl_googleplus_button' ),
@@ -120,7 +120,8 @@ private function shortcodes_core() {
 			'bookmark'					=>	array( 'function' => 'bookmark_link' ),
 			'pl_raw'					=>	array( 'function' => 'do_raw' ),
 			'pl_video'					=>	array( 'function' => 'pl_video_shortcode' ),
-			'pl_child_url'				=>	array( 'function' => 'pl_child_url' )
+			'pl_child_url'				=>	array( 'function' => 'pl_child_url' ),
+			'pl_parent_url'				=>	array( 'function' => 'get_themeurl' )
 			);
 
 		return $core;
@@ -184,7 +185,9 @@ function create_pagelink( $atts ) {
 
 	// 3. Function for getting template path
 	// USAGE: [themeurl]
-	function get_themeurl( $atts ){ return get_template_directory_uri();	 }
+	function get_themeurl( $atts ) {
+		return get_template_directory_uri();
+	}
 
 	// 4. GOOGLE MAPS //////////////////////////////////////////////////