Version 5.0.0 beta 2

system/Application/Application.php

@@ -25,6 +25,7 @@ use IPS\core\FrontNavigation;
 use IPS\Data\Cache;
 use IPS\Data\Store;
 use IPS\Db\Exception;
+use Exception as PHPException;
 use IPS\Helpers\Form;
 use IPS\Helpers\Form\Text;
 use IPS\Helpers\Form\YesNo;
@@ -2607,7 +2608,7 @@ EOF;
 						Db::i()->update( 'core_theme_editor_categories', $category, [ 'cat_key=?', $key ] );
 					}
 
-					Lang::saveCustom( 'core', 'themeeditor_cat_' . $categoryId, $name );
+					Lang::saveCustom( 'core', 'themeeditor_cat_' . $key, $name, false, $name );
 
 					$category['cat_id'] = $categoryId;
 					$currentCategories[ $key ] = $category;
@@ -2678,10 +2679,10 @@ EOF;
 						], [ 'setting_key=?', $key ] );
 					}
 
-					Lang::saveCustom( 'core', 'themeeditor_var_' . $settingId, $setting['name'] );
+					Lang::saveCustom( 'core', 'themeeditor_var_' . $key, $setting['name'], false, $setting['name'] );
 					if( isset( $setting['desc'] ) )
 					{
-						Lang::saveCustom( 'core', 'themeeditor_var_' . $settingId . '_desc', $setting['desc'] );
+						Lang::saveCustom( 'core', 'themeeditor_var_' . $key . '_desc', $setting['desc'], false, $setting['desc'] );
 					}
 				}
 			}
@@ -5277,7 +5278,7 @@ EOF;
 				$block->layouts = $block->getSupportedLayouts();
 				$blocks[ $widget['key'] ] = $block;
 			}
-			catch( Exception $e )
+			catch( PHPException $e )
 			{
 				continue;
 			}