diff --git a/README.md b/README.md
index 8310da8..048dcd8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 grocy is a web-based self-hosted groceries & household management solution for your home.
 
-**Shipped version:** 3.2.0~ynh1
+**Shipped version:** 3.3.0~ynh1
 
 **Demo:** https://en.demo.grocy.info/stockoverview
 
diff --git a/README_fr.md b/README_fr.md
index dd0855e..98f530f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 grocy is a web-based self-hosted groceries & household management solution for your home.
 
-**Version incluse :** 3.2.0~ynh1
+**Version incluse :** 3.3.0~ynh1
 
 **Démo :** https://en.demo.grocy.info/stockoverview
 
diff --git a/check_process b/check_process
index 9252357..8bfb781 100644
--- a/check_process
+++ b/check_process
@@ -13,7 +13,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1  from_commit=cbbb845cc8d7324b6e23ab6d7739233523283542
+		#3.2.0~ynh1
+		upgrade=1  from_commit=b9c2675f31ec8a8dfbc38d2cbf0a2dbda2d54df7
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -21,6 +22,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=cbbb845cc8d7324b6e23ab6d7739233523283542
-		name=Testing (#8)
+	; commit=b9c2675f31ec8a8dfbc38d2cbf0a2dbda2d54df7
+		name=Testing (#33)
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
diff --git a/conf/app.src b/conf/app.src
index df03346..3a06008 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/grocy/grocy/releases/download/v3.2.0/grocy_3.2.0.zip
-SOURCE_SUM=50f6b0bad9b932594f61daeef91a64f1461f1c335cacd61aab8a8c6d992ca2e2
+SOURCE_URL=https://github.com/grocy/grocy/releases/download/v3.3.0/grocy_3.3.0.zip
+SOURCE_SUM=cb497457e71321f658b7257c97a91d156f54cc959bede40c12871a3e8ed32db8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/config-dist.php b/conf/config-dist.php
index 00a321a..3a99aa0 100644
--- a/conf/config-dist.php
+++ b/conf/config-dist.php
@@ -1,16 +1,16 @@
 <?php
 
-// Settings can also be overwritten in two ways
+// Settings can also be overwritten in two ways:
 //
-// First priority
+// First priority:
 // A .txt file with the same name as the setting in /data/settingoverrides
 // the content of the file is used as the setting value
 //
-// Second priority
+// Second priority:
 // An environment variable with the same name as the setting and prefix "GROCY_"
 // so for example "GROCY_BASE_URL"
 //
-// Third priority
+// Third priority:
 // The settings defined here below
 
 // Either "production", "dev", "demo" or "prerelease"
@@ -18,11 +18,11 @@
 // demo data will be populated during database migrations
 Setting('MODE', 'production');
 
-// Either "en" or "de" or the directory name of
-// one of the other available localization folders in the "/localization" directory
+// The directory name of one of the available localization folders
+// in the "/localization" directory (e.g. "en" or "de")
 Setting('DEFAULT_LOCALE', '__LANGUAGE__');
 
-// This is used to define the first day of a week for calendar views in the frontend,
+// This is used to define the first day of a week for calendar views,
 // leave empty to use the locale default
 // Needs to be a number where Sunday = 0, Monday = 1 and so forth
 Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
@@ -30,14 +30,19 @@ Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
 // If calendars should show week numbers
 Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
 
+// Set this if you want to have a different start day for the weekly meal plan view,
+// leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
+// Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
+
 // To keep it simple: grocy does not handle any currency conversions,
 // this here is used to format all money values,
-// so doesn't really matter, but should be the
+// so doesn't really matter, but needs to be the
 // ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'EUR');
 
 // When running grocy in a subdirectory, this should be set to the relative path, otherwise empty
-// It needs to be set to the part (of the URL) after the document root,
+// It needs to be set to the part (of the URL) AFTER the document root,
 // if URL rewriting is disabled, including index.php
 // Example with URL Rewriting support:
 //  Root URL = https://example.com/grocy
@@ -53,15 +58,15 @@ Setting('BASE_PATH', '');
 Setting('BASE_URL', '/');
 
 // The plugin to use for external barcode lookups,
-// must be the filename without .php extension and must be located in /data/plugins,
+// must be the filename (folder /data/plugins) without the .php extension,
 // see /data/plugins/DemoBarcodeLookupPlugin.php for an example implementation
 Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 
 // If, however, your webserver does not support URL rewriting, set this to true
 Setting('DISABLE_URL_REWRITING', false);
 
-// Specify an custom homepage if desired - by default the homepage will be set to the stock overview page,
-// this needs to be one of the following values:
+// Specify an custom homepage if desired, by default the homepage will be set to the stock overview page
+// This needs to be one of the following values:
 // stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar, mealplan
 Setting('ENTRY_PAGE', 'stock');
 
@@ -73,11 +78,11 @@ Setting('DISABLE_AUTH', false);
 // or any class that implements Grocy\Middleware\AuthMiddleware
 Setting('AUTH_CLASS', 'Grocy\Middleware\DefaultAuthMiddleware');
 
-// When using ReverseProxyAuthMiddleware,
-// the name of the HTTP header which your reverse proxy uses to pass the username (on successful authentication)
-Setting('REVERSE_PROXY_AUTH_HEADER', 'REMOTE_USER');
+// Options when using ReverseProxyAuthMiddleware
+Setting('REVERSE_PROXY_AUTH_HEADER', 'REMOTE_USER'); // The name of the HTTP header which your reverse proxy uses to pass the username (on successful authentication)
+Setting('REVERSE_PROXY_AUTH_USE_ENV', false); // Set to true if the username is passed as environment variable
 
-// LDAP options when using LdapAuthMiddleware
+// Options when using LdapAuthMiddleware
 Setting('LDAP_ADDRESS', 'ldap://127.0.0.1:389'); // Example value "ldap://vm-dc2019.local.berrnd.net"
 Setting('LDAP_BASE_DN', 'ou=users,dc=yunohost,dc=org'); // Example value "DC=local,DC=berrnd,DC=net"
 Setting('LDAP_BIND_DN', ''); // Example value "CN=grocy_bind_account,OU=service_accounts,DC=local,DC=berrnd,DC=net"
@@ -85,116 +90,37 @@ Setting('LDAP_BIND_PW', ''); // Password for the above account
 Setting('LDAP_USER_FILTER', ''); // Example value "(OU=grocy_users)"
 Setting('LDAP_UID_ATTR', ''); // Windows AD: "sAMAccountName", OpenLDAP: "uid", GLAuth: "cn"
 
-// Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
-Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
-
-// Set this if you want to have a different start day for the weekly meal plan view,
-// leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
-// Needs to be a number where Sunday = 0, Monday = 1 and so forth
-Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
-
 // Default permissions for new users
 // the array needs to contain the technical/constant names
-// see the file controllers/Users/User.php for possible values
+// See the file controllers/Users/User.php for possible values
 Setting('DEFAULT_PERMISSIONS', ['ADMIN']);
 
-// 1D (=> Code128) or 2D (=> DataMatrix)
+// "1D" (=> Code128) or "2D" (=> DataMatrix)
 Setting('GROCYCODE_TYPE', '1D');
 
+
 // Label printer settings
-// This is the URI that grocy will POST to when asked to print a label
-Setting('LABEL_PRINTER_WEBHOOK', '');
-// This setting decides whether the webhook will be called server- or clientside
-// If the machine grocy runs on has a network connection to the host the webhook receiver is on, this is probably a good idea
-// If, for example, grocy runs in the cloud and your printer daemon runs locally to you, set this to false to let your browser call the webhook instead
-Setting('LABEL_PRINTER_RUN_SERVER', true);
-// Additional parameters supplied to the webhook
-Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']);
-// TRUE to use JSON or FALSE to use normal POST request variables
-Setting('LABEL_PRINTER_HOOK_JSON', false);
+Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that grocy will POST to when asked to print a label
+Setting('LABEL_PRINTER_RUN_SERVER', true); // Whether the webhook will be called server- or client-side
+Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']); // Additional parameters supplied to the webhook
+Setting('LABEL_PRINTER_HOOK_JSON', false); // TRUE to use JSON or FALSE to use normal POST request variables
+
 
 // Thermal printer options
 // Thermal printers are receipt printers, not regular printers,
 // the printer must support the ESC/POS protocol, see https://github.com/mike42/escpos-php
-Setting('TPRINTER_IS_NETWORK_PRINTER', false); // Set to true if it's' a network printer
+Setting('TPRINTER_IS_NETWORK_PRINTER', false); // Set to true if it's a network printer
 Setting('TPRINTER_PRINT_QUANTITY_NAME', true); // Set to false if you do not want to print the quantity names (related to the shopping list)
 Setting('TPRINTER_PRINT_NOTES', true); // Set to false if you do not want to print notes (related to the shopping list)
 Setting('TPRINTER_IP', '127.0.0.1'); // IP of the network printer (does only matter if it's a network printer)
-Setting('TPRINTER_PORT', 9100); // Port of the network printer
+Setting('TPRINTER_PORT', 9100); // Port of the network printer (does only matter if it's a network printer)
 Setting('TPRINTER_CONNECTOR', '/dev/usb/lp0'); // Printer device (does only matter if you use a locally attached printer)
 // For USB on Linux this is often '/dev/usb/lp0', for serial printers it could be similar to '/dev/ttyS0'
 // Make sure that the user that runs the webserver has permissions to write to the printer - on Linux add your webserver user to the LP group with usermod -a -G lp www-data
 
 
-// Default user settings
-// These settings can be changed per user, here the defaults
-// are defined which are used when the user has not changed the setting so far
-
-// Night mode related
-DefaultUserSetting('night_mode_enabled', false); // If night mode is enabled always
-DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
-DefaultUserSetting('auto_night_mode_time_range_from', '20:00'); // Format HH:mm
-DefaultUserSetting('auto_night_mode_time_range_to', '07:00'); // Format HH:mm
-DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
-DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
-
-// Keep screen on settings
-DefaultUserSetting('keep_screen_on', false); // Keep the screen always on
-DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the screen on when a "fullscreen-card" is displayed
-
-// Stock settings
-DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
-DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
-DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
-DefaultUserSetting('stock_decimal_places_amounts', 4); // Default decimal places allowed for amounts
-DefaultUserSetting('stock_decimal_places_prices', 2); // Default decimal places allowed for prices
-DefaultUserSetting('stock_auto_decimal_separator_prices', false);
-DefaultUserSetting('stock_due_soon_days', 5);
-DefaultUserSetting('stock_default_purchase_amount', 0);
-DefaultUserSetting('stock_default_consume_amount', 1);
-DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', false);
-DefaultUserSetting('scan_mode_consume_enabled', false);
-DefaultUserSetting('scan_mode_purchase_enabled', false);
-DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true);
-DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise)
-DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock
-
-// Shopping list settings
-DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default due days" set
-DefaultUserSetting('shopping_list_show_calendar', false);
-
-// Recipe settings
-DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
-
-// Chores settings
-DefaultUserSetting('chores_due_soon_days', 5);
-
-// Batteries settings
-DefaultUserSetting('batteries_due_soon_days', 5);
-
-// Tasks settings
-DefaultUserSetting('tasks_due_soon_days', 5);
-
-// If the page should be automatically reloaded when there was an external change
-DefaultUserSetting('auto_reload_on_db_change', false);
-
-// Show a clock in the header next to the logo or not
-DefaultUserSetting('show_clock_in_header', false);
-
-// Component configuration for Quagga2 - read https://github.com/ericblade/quagga2#configobject for details
-// Below is a generic good configuration,
-// for an iPhone 7 Plus, halfsample = true, patchsize = small, frequency = 5 yields very good results
-DefaultUserSetting('quagga2_numofworkers', 4);
-DefaultUserSetting('quagga2_halfsample', false);
-DefaultUserSetting('quagga2_patchsize', 'medium');
-DefaultUserSetting('quagga2_frequency', 10);
-DefaultUserSetting('quagga2_debug', true);
-
-
 // Feature flags
-// grocy was initially about "stock management for your household", many other things
-// came and still come by, because they are useful - here you can disable the parts
-// which you don't need to have a less cluttered UI
+// Here you can disable the parts which you don't need to have a less cluttered UI
 // (set the setting to "false" to disable the corresponding part, which should be self explanatory)
 Setting('FEATURE_FLAG_STOCK', true);
 Setting('FEATURE_FLAG_SHOPPINGLIST', true);
@@ -218,5 +144,72 @@ Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
 Setting('FEATURE_FLAG_THERMAL_PRINTER', false);
 
 // Feature settings
-Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to true, opened items will be counted as missing for calculating if a product is below its minimum stock amount
+Setting('FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false); // Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
 Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automatically (if the device has one)
+
+
+// Default user settings
+// These settings can be changed per user and via the UI,
+// below are the defaults which are used when the user has not changed the setting so far
+
+// Night mode related
+DefaultUserSetting('night_mode', 'follow-system'); // "on" = Night mode is always on ; "off" = Night mode is always off / "follow-system" = System preferred color schema is used
+DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
+DefaultUserSetting('auto_night_mode_time_range_from', '20:00'); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_to', '07:00'); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
+DefaultUserSetting('night_mode_enabled_internal', false); // Internal setting if night mode is actually enabled (based on the other settings)
+
+// Generic settings
+DefaultUserSetting('auto_reload_on_db_change', false); // If the page should be automatically reloaded when there was an external change
+DefaultUserSetting('show_clock_in_header', false); // Show a clock in the header next to the logo or not
+DefaultUserSetting('keep_screen_on', false); // If the screen should always be kept on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // If the screen should be kept on when a "fullscreen-card" is displayed
+
+// Stock settings
+DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
+DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
+DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
+DefaultUserSetting('product_presets_default_due_days', 0); // Default due days for new products (-1 means that the product will be never overdue)
+DefaultUserSetting('product_presets_treat_opened_as_out_of_stock', true); // Default "Treat opened as out of stock" option for new products
+DefaultUserSetting('stock_decimal_places_amounts', 4); // Default decimal places allowed for amounts
+DefaultUserSetting('stock_decimal_places_prices', 2); // Default decimal places allowed for prices
+DefaultUserSetting('stock_auto_decimal_separator_prices', false);  // If the decimal separator should be set automatically for amount inputs
+DefaultUserSetting('stock_due_soon_days', 5); // The "expiring soon" days
+DefaultUserSetting('stock_default_purchase_amount', 0); // The default amount prefilled on the purchase page
+DefaultUserSetting('stock_default_consume_amount', 1); // The default amount prefilled on the consume page
+DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', false); // If the products quick consume amount should be prefilled on the consume page
+DefaultUserSetting('scan_mode_consume_enabled', false); // If scan mode on the consume page is enabled
+DefaultUserSetting('scan_mode_purchase_enabled', false); // If scan mode on the purchase page is enabled
+DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); // When enabled, an icon is shown on the stock overview page (next to the product name) when the prodcut is currently on a shopping list
+DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise)
+DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock
+
+// Shopping list settings
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default due days" set
+DefaultUserSetting('shopping_list_show_calendar', false); // When enabled, a small (month view) calendar will be shown on the shopping list page
+DefaultUserSetting('shopping_list_auto_add_below_min_stock_amount', false); // If products should be automatically added to the shopping list when they are below their min. stock amount
+DefaultUserSetting('shopping_list_auto_add_below_min_stock_amount_list_id', 1); // When the above setting is enabled, the id of the shopping list to which the products will be added
+
+// Recipe settings
+DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
+DefaultUserSetting('recipes_show_list_side_by_side', true); // If the recipe should be displayed next to recipe list on the recipes page
+DefaultUserSetting('recipes_show_ingredient_checkbox', false); // When enabled, a little checkbox will be shown next to each ingredient to mark it as done
+
+// Chores settings
+DefaultUserSetting('chores_due_soon_days', 5); // The "due soon" days
+
+// Batteries settings
+DefaultUserSetting('batteries_due_soon_days', 5); // The "due soon" days
+
+// Tasks settings
+DefaultUserSetting('tasks_due_soon_days', 5); // The "due soon" days
+
+// Component configuration for Quagga2 - read https://github.com/ericblade/quagga2#configobject for details
+// Below is a generic good configuration,
+// for an iPhone 7 Plus, halfsample = true, patchsize = small, frequency = 5 yields very good results
+DefaultUserSetting('quagga2_numofworkers', 4);
+DefaultUserSetting('quagga2_halfsample', false);
+DefaultUserSetting('quagga2_patchsize', 'medium');
+DefaultUserSetting('quagga2_frequency', 10);
+DefaultUserSetting('quagga2_debug', true);
diff --git a/manifest.json b/manifest.json
index 5536a66..64c3255 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based groceries & household management solution for your home",
         "fr": "Solution Web de gestion d'épicerie et de gestion de la maison"
     },
-    "version": "3.2.0~ynh1",
+    "version": "3.3.0~ynh1",
     "url": "https://grocy.info",
     "upstream": {
         "license": "MIT",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f058cd3..e0fc39e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl"
+pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/upgrade b/scripts/upgrade
index 34b040b..3a6c0db 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,7 +109,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================