Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 8378)
+++ /controller/wpsg_ShopController.class.php	(revision 8379)
@@ -1206,5 +1206,6 @@
 			if ($fixView) $this->view = $view;
 			
-			 \do_action('wpsg_'.$func_name.'_after', $arParam);
+			// Konflikt mit _after!
+			\do_action('wpsg_'.$func_name.'_afterAction', $arParam);
 			
 			return true;
@@ -1732,5 +1733,5 @@
 
 			$this->callMods('renderProdukt_templateSelect', array(&$this->view['data'], &$template_file));
-
+ 
 			$wpsg_ignoreuserview = $this->get_option('wpsg_ignoreuserview');
 
@@ -1740,8 +1741,8 @@
             $template_file_uv_old = 	 str_replace(WPSG_PATH_PRODUKTTEMPLATES, WPSG_PATH_PRODUKTTEMPLATES_UV_OLD, $template_file);
 
-				 if (file_exists($template_file_theme) 	&& $wpsg_ignoreuserview != '1') $template_file = $template_file_theme;
+			if (file_exists($template_file_theme) 	&& $wpsg_ignoreuserview != '1') $template_file = $template_file_theme;
 			else if (file_exists($template_file_uv) 	&& $wpsg_ignoreuserview != '1') $template_file = $template_file_uv;
 			else if (file_exists($template_file_uv_old) && $wpsg_ignoreuserview != '1') $template_file = $template_file_uv_old;
-			else if ($wpsg_ignoreuserview != '1') {
+			else if ($wpsg_ignoreuserview != '1' && !file_exists($template_file)) {
 				
 				$arTemplate = $this->loadProduktTemplates(false, true);
@@ -1779,5 +1780,5 @@
 			$html  = '';
 			$html .= '<form class="wpsg_productform" id="wpsg_produktform_'.$GLOBALS['wpsg_produkt_index'].'" method="post" action="'.$myReferer.'">';
-
+ 
 			// do_shortcode, sonst werden die Shortcodes nicht interpretiert wenn das Produkt selbst ÃŒber einen Shortcode eingebunden wird.
 			$html .= do_shortcode($this->render($template_file, false));
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 8378)
+++ /lib/wpsg_calculation.class.php	(revision 8379)
@@ -901,5 +901,5 @@
          */
         public function toDB($id = false, $db_data = [], $finish_order = false) {
-							
+					
 			$id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($id)."' ");
         	if (!wpsg_isSizedInt($id)) $id = false;
@@ -1138,9 +1138,9 @@
 					
 				}
-
+ 
                 $arOrderProductID[] = $p['order_product_id'];
 
                 if (!is_admin()) {
-
+ 
                     $this->shop->callMods('calculation_saveProduct_after', [&$this, $p, &$db_data, $finish_order]);
 
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css	(revision 8378)
+++ /views/css/frontend.css	(revision 8379)
@@ -255,5 +255,5 @@
 .wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; } 
 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:48%; float:left; box-sizing:border-box; padding:0.7em; line-height:1.5em; font-size:1rem; }
-.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; cursor:pointer; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; }
 .wpsg_productform .wpsg_product_layer { position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); padding:0.75em; margin:-0.75em; box-sizing:content-box; }
 .wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; }
@@ -456,5 +456,5 @@
 .wpsg_progress span.step { width:25%; display:block; float:left; list-style:none; position:relative; }
 .wpsg_progress span.step > .text { margin-top:30px; text-align:center; width:100%; display:block; }
-.wpsg_progress span.step > .dot { position:absolute; z-index:2; background-color:#C5C5C5; width:20px; height:20px; left:50%; top:0%; margin-left:-15px; margin-top:-5px; border-radius:10px; } 
+.wpsg_progress span.step > .dot { position:absolute; z-index:2; background-color:#C5C5C5; width:20px; height:20px; left:50%; top:0%; margin-left:-14px; margin-top:-4px; border-radius:10px; }
 .wpsg_progress span.step:before { border:1px solid #C5C5C5; position:absolute; z-index:2; left:50%; margin-left:-20px; text-align:center; line-height:40px; background-color:#F2F2F2; content:" "; display:block; width:30px; height:30px; border-radius:25px; margin-top:-10px; } 
 .wpsg_progress span.step1:before { content:""; }
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 8378)
+++ /views/warenkorb/basket.phtml	(revision 8379)
@@ -7,4 +7,5 @@
 	//wpsg_debug($this->view['basket']);
 	//wpsg_debug($this->view['basket']['arCalculation']);
+	
     //wpsg_debug($_SESSION['wpsg']);
 	//wpsg_debug($this->arShipping);