diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3c8dba6..c26cea4c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,13 +8,15 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         java: [17]
+        os: ['ubuntu-latest']
+    name: Build on ${{ matrix.os }} with Java ${{ matrix.java }}
+    runs-on: ${{ matrix.os }}
     env:
       DEFAULT_JAVA: 17
+      DEFAULT_OS: 'ubuntu-latest'
 
     steps:
 
@@ -51,14 +53,14 @@ jobs:
         ./gradlew build --warning-mode=summary -PskipFlakyTests=true
 
     - name: Sonar analysis
-      if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }}
+      if: ${{ env.DEFAULT_JAVA == matrix.java && env.DEFAULT_OS == matrix.os && env.SONAR_TOKEN != null }}
       run: |
         ./gradlew sonarqube -Dsonar.login=$SONAR_TOKEN --warning-mode=summary
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
-    - name: Publish Test Report for Java ${{ matrix.java }}
+    - name: Publish Test Report for Java ${{ matrix.java }} on ${{ matrix.os }}
       uses: scacap/action-surefire-report@v1
       if:  ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
       with:
@@ -67,7 +69,26 @@ jobs:
 
     - name: Archive jfxui binary
       uses: actions/upload-artifact@v2
-      if: ${{ env.DEFAULT_JAVA == matrix.java }}
+      if: ${{ env.DEFAULT_JAVA == matrix.java && env.DEFAULT_OS == matrix.os }}
       with:
         name: jfxui
         path: jfxui/build/libs/white-rabbit-fx-*.jar
+
+    - name: Build native package for ${{ matrix.os }}
+      if: ${{ env.DEFAULT_JAVA == matrix.java }}
+      run: |
+        ./gradlew jpackage createChecksums --warning-mode=summary
+    
+    - name: Archive native package
+      uses: actions/upload-artifact@v2
+      if: ${{ env.DEFAULT_JAVA == matrix.java }}
+      with:
+        name: native-package-${{ matrix.java }}
+        path: jfxui/build/jpackage-dist/*
+
+    - name: Archive checksums
+      uses: actions/upload-artifact@v2
+      if: ${{ env.DEFAULT_JAVA == matrix.java }}
+      with:
+        name: checksums
+        path: jfxui/build/generatedChecksums/*
diff --git a/api/.settings/org.eclipse.jdt.ui.prefs b/api/.settings/org.eclipse.jdt.ui.prefs
index 68af97d5..7f9d0bb7 100644
--- a/api/.settings/org.eclipse.jdt.ui.prefs
+++ b/api/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 sp_cleanup.add_all=false
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
@@ -16,27 +16,35 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
 sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
 sp_cleanup.double_negation=false
 sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
 sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
@@ -46,6 +54,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.no_string_creation=false
@@ -53,10 +62,17 @@ sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -64,6 +80,8 @@ sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -81,14 +99,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
 sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
 sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -96,6 +130,7 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
@@ -104,3 +139,4 @@ sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/api/build.gradle b/api/build.gradle
index fb5a4717..27f84cb0 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -11,7 +11,6 @@ java {
 
 javadoc {
     enabled = true
-    options.addBooleanOption('html5', true)
 }
 
 def getOptionalProperty(String name) {
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/AbstractPlugin.java b/api/src/main/java/org/itsallcode/whiterabbit/api/AbstractPlugin.java
index a36dfa5c..312b0d1a 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/AbstractPlugin.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/AbstractPlugin.java
@@ -4,12 +4,31 @@
 
 import org.itsallcode.whiterabbit.api.features.PluginFeature;
 
+/**
+ * Base class for plugins that support a defined {@link PluginFeature}.
+ * 
+ * @param <S>
+ *            the supported {@link PluginFeature}.
+ */
 public abstract class AbstractPlugin<S extends PluginFeature> implements Plugin
 {
     private final String id;
     private final Class<S> featureType;
+
+    /**
+     * The plugin configuration. Will be {@code null} until
+     * {@link #init(PluginConfiguration)} was called.
+     */
     protected PluginConfiguration config;
 
+    /**
+     * Constructor.
+     * 
+     * @param id
+     *            the id of the new plugin.
+     * @param featureType
+     *            the {@link PluginFeature} that the new plugin supports.
+     */
     protected AbstractPlugin(String id, Class<S> featureType)
     {
         this.featureType = featureType;
@@ -23,7 +42,7 @@ public void init(PluginConfiguration config)
     }
 
     @Override
-    public String getId()
+    public final String getId()
     {
         return id;
     }
@@ -35,15 +54,21 @@ public void close()
     }
 
     @Override
-    public boolean supports(Class<? extends PluginFeature> featureType)
+    public final boolean supports(Class<? extends PluginFeature> featureType)
     {
         return this.featureType.isAssignableFrom(featureType);
     }
 
+    /**
+     * Plugins must implement this and return a new instance of the
+     * {@link PluginFeature} type.
+     * 
+     * @return a new {@link PluginFeature} instance.
+     */
     protected abstract S createInstance();
 
     @Override
-    public <T extends PluginFeature> Optional<T> getFeature(Class<T> featureType)
+    public final <T extends PluginFeature> Optional<T> getFeature(Class<T> featureType)
     {
         if (this.supports(featureType))
         {
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/PluginConfiguration.java b/api/src/main/java/org/itsallcode/whiterabbit/api/PluginConfiguration.java
index 3f1598f1..3e32f673 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/PluginConfiguration.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/PluginConfiguration.java
@@ -32,5 +32,10 @@ public interface PluginConfiguration
      */
     Optional<String> getOptionalValue(String propertyName);
 
+    /**
+     * Get the {@link Path} to the data directory.
+     * 
+     * @return the {@link Path} to the data directory.
+     */
     Path getDataDir();
 }
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/features/Holidays.java b/api/src/main/java/org/itsallcode/whiterabbit/api/features/Holidays.java
index d876824f..166b335e 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/features/Holidays.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/features/Holidays.java
@@ -3,16 +3,42 @@
 import java.time.LocalDate;
 import java.util.List;
 
+import org.itsallcode.whiterabbit.api.model.DayType;
+
+/**
+ * {@link PluginFeature} that generates a {@link List} of
+ * {@link HolidayInstance} for each day. WhiteRabbit will will marked these days
+ * as {@link DayType#HOLIDAY} when switching to a new month.
+ */
 public interface Holidays extends PluginFeature
 {
+    /**
+     * Get all holidays for a given date.
+     * 
+     * @param date
+     *            the date for which to get holidays.
+     * @return a {@link List} of holidays on the given date.
+     */
+    List<HolidayInstance> getHolidays(LocalDate date);
+
+    /**
+     * Represents a holiday instance.
+     */
     interface HolidayInstance
     {
+        /**
+         * @return the holiday category, e.g. "public".
+         */
         String getCategory();
 
+        /**
+         * @return the local name of the holiday.
+         */
         String getName();
 
+        /**
+         * @return the date of the holiday.
+         */
         LocalDate getDate();
     }
-
-    List<HolidayInstance> getHolidays(LocalDate date);
 }
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ActivityData.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ActivityData.java
index 1d477e17..dfa3ae4f 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ActivityData.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ActivityData.java
@@ -8,17 +8,49 @@
  */
 public interface ActivityData
 {
+    /**
+     * @return the project's ID.
+     */
     String getProjectId();
 
+    /**
+     * Set the project's ID.
+     * 
+     * @param id
+     *            the new ID.
+     */
     void setProjectId(String id);
 
+    /**
+     * @return the duration of the activity.
+     */
     Duration getDuration();
 
+    /**
+     * @return {@code true} if this is the remainder activity i.e. the duration
+     *         is {@code null}.
+     */
     boolean isRemainder();
 
+    /**
+     * Set the duration of the activity.
+     * 
+     * @param duration
+     *            the new duration. Set to {@code null} for the remainder
+     *            activity.
+     */
     void setDuration(Duration duration);
 
+    /**
+     * @return the activity's comment.
+     */
     String getComment();
 
+    /**
+     * Set the activity's comment.
+     * 
+     * @param comment
+     *            the new comment.
+     */
     void setComment(String comment);
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayData.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayData.java
index 1fbe72a3..4037fc2c 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayData.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayData.java
@@ -11,35 +11,107 @@
  */
 public interface DayData
 {
+    /**
+     * @return the date of this day.
+     */
     LocalDate getDate();
 
+    /**
+     * @return the {@link DayType} of this day.
+     */
     DayType getType();
 
+    /**
+     * @return the begin working time of this day.
+     */
     LocalTime getBegin();
 
+    /**
+     * @return the end working time of this day.
+     */
     LocalTime getEnd();
 
+    /**
+     * @return the duration of the interruption of this day.
+     */
     Duration getInterruption();
 
+    /**
+     * @return the working hours of this day.
+     */
     Duration getWorkingHours();
 
+    /**
+     * @return the comment of this day.
+     */
     String getComment();
 
+    /**
+     * Set the date for this day.
+     * 
+     * @param date
+     *            the new date.
+     */
     void setDate(LocalDate date);
 
+    /**
+     * Set the {@link DayType} for this day.
+     * 
+     * @param type
+     *            the new {@link DayType}.
+     */
     void setType(DayType type);
 
+    /**
+     * Set the begin time for this day.
+     * 
+     * @param begin
+     *            the new begin time.
+     */
     void setBegin(LocalTime begin);
 
+    /**
+     * Set the end time for this day.
+     * 
+     * @param end
+     *            the new end time.
+     */
     void setEnd(LocalTime end);
 
+    /**
+     * Set the working hours for this day.
+     * 
+     * @param workingHours
+     *            the new working hours.
+     */
     void setWorkingHours(Duration workingHours);
 
+    /**
+     * Set the comment for this day.
+     * 
+     * @param comment
+     *            the new comment.
+     */
     void setComment(String comment);
 
+    /**
+     * Set the duration of the interruption for this day.
+     * 
+     * @param interruption
+     *            the new duration of the interruption.
+     */
     void setInterruption(Duration interruption);
 
+    /**
+     * @return the {@link ActivityData}s for this day.
+     */
     List<ActivityData> getActivities();
 
+    /**
+     * Set the {@link ActivityData}s for this day.
+     * 
+     * @param activities
+     *            new new activities.
+     */
     void setActivities(List<ActivityData> activities);
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayType.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayType.java
index 24f9e152..b278d7a5 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayType.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/DayType.java
@@ -5,11 +5,22 @@
  */
 public enum DayType
 {
-    HOLIDAY(false), VACATION(false), FLEX_TIME(true), SICK(false), WORK(true), WEEKEND(false);
+    /** Public holiday (not working) */
+    HOLIDAY(false),
+    /** Vacation, paid time off (not working) */
+    VACATION(false),
+    /** Flex time, reduce overtime (not working) */
+    FLEX_TIME(true),
+    /** Sick, paid sick leave (not working) */
+    SICK(false),
+    /** Normal working day */
+    WORK(true),
+    /** Weekend (Saturday, Sunday, not working) */
+    WEEKEND(false);
 
     private final boolean workDay;
 
-    DayType(boolean workDay)
+    private DayType(boolean workDay)
     {
         this.workDay = workDay;
     }
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/MonthData.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/MonthData.java
index af40d9e6..f5d40d3e 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/MonthData.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/MonthData.java
@@ -9,19 +9,55 @@
  */
 public interface MonthData
 {
+    /**
+     * @return the year of this month.
+     */
     int getYear();
 
+    /**
+     * Set the year of this month.
+     * 
+     * @param year
+     *            the new year.
+     */
     void setYear(int year);
 
+    /**
+     * @return the {@link Month}.
+     */
     Month getMonth();
 
+    /**
+     * Set a new {@link Month}.
+     * 
+     * @param month
+     *            the new {@link Month}.
+     */
     void setMonth(Month month);
 
+    /**
+     * @return the duration of the previous month's overtime.
+     */
     Duration getOvertimePreviousMonth();
 
+    /**
+     * Set the duration of the previous month's overtime.
+     * 
+     * @param overtimePreviousMonth
+     *            the new duration of the previous month's overtime.
+     */
     void setOvertimePreviousMonth(Duration overtimePreviousMonth);
 
+    /**
+     * @return the {@link DayData}s in this month.
+     */
     List<DayData> getDays();
 
+    /**
+     * Set the {@link DayData}s in this month.
+     * 
+     * @param days
+     *            the new {@link DayData}s.
+     */
     void setDays(List<DayData> days);
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/Project.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/Project.java
index ae7d836e..993dc111 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/Project.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/Project.java
@@ -6,9 +6,18 @@
  */
 public interface Project
 {
+    /**
+     * @return the ID of this project.
+     */
     String getProjectId();
 
+    /**
+     * @return the label of this project.
+     */
     String getLabel();
 
+    /**
+     * @return the cost carrier of this project.
+     */
     String getCostCarrier();
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReport.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReport.java
index 13eee922..86895894 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReport.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReport.java
@@ -8,9 +8,18 @@
  */
 public interface ProjectReport
 {
+    /**
+     * @return the year and month of this project report.
+     */
     YearMonth getMonth();
 
+    /**
+     * @return the days in this project report.
+     */
     List<ProjectReportDay> getDays();
 
+    /**
+     * @return the activities in this project report.
+     */
     List<ProjectReportActivity> getProjects();
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportActivity.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportActivity.java
index 6c8aa12b..d37e3d87 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportActivity.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportActivity.java
@@ -9,9 +9,18 @@
  */
 public interface ProjectReportActivity
 {
+    /**
+     * @return the {@link Project} of this activity.
+     */
     Project getProject();
 
+    /**
+     * @return the total duration of this activity.
+     */
     Duration getWorkingTime();
 
+    /**
+     * @return the comments for this activity.
+     */
     List<String> getComments();
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportDay.java b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportDay.java
index 50dc8a60..1f3088b6 100644
--- a/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportDay.java
+++ b/api/src/main/java/org/itsallcode/whiterabbit/api/model/ProjectReportDay.java
@@ -9,11 +9,23 @@
  */
 public interface ProjectReportDay
 {
+    /**
+     * @return the date of this day.
+     */
     LocalDate getDate();
 
+    /**
+     * @return the {@link DayType} of this day.
+     */
     DayType getType();
 
+    /**
+     * @return the comment of this day.
+     */
     String getComment();
 
+    /**
+     * @return the project activities of this day.
+     */
     List<ProjectReportActivity> getProjects();
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3e6cdea5..8d1dd69a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,19 +3,20 @@ plugins {
     id "org.sonarqube" version "3.3"
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.1"
     id "io.codearte.nexus-staging" version "0.30.0"
-    id 'com.github.johnrengelman.shadow' version '7.1.1' apply false
+    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
     id "com.moowork.node" version "1.3.1" apply false
-    id "com.github.ben-manes.versions" version "0.39.0"
+    id "com.github.ben-manes.versions" version "0.41.0"
     id "org.panteleyev.jpackageplugin" version "1.3.1" apply false
+    id "org.gradle.crypto.checksum" version "1.2.0" apply false
 }
 
 ext {
     junitVersion = '5.8.2'
-    log4jVersion = '2.17.0'
+    log4jVersion = '2.17.1'
     mockitoVersion = '4.2.0'
     yassonVersion = '2.0.3'
     jsonBindApiVersion = '2.0.0'
-    javaFxVersion = '18-ea+8'
+    javaFxVersion = '18-ea+9'
     monocleVersion = '12.0.1+2'
 }
 
@@ -23,7 +24,7 @@ def getProjectVersion() {
     if(project.hasProperty("releaseVersion")) {
         return project.property("releaseVersion")
     }
-    return "1.8.0-SNAPSHOT"
+    return "1.8.0"
 }
 
 version = getProjectVersion()
@@ -53,13 +54,13 @@ subprojects {
     }
 
     dependencies {
-        testImplementation "org.assertj:assertj-core:3.21.0"
+        testImplementation "org.assertj:assertj-core:3.22.0"
         testImplementation "org.mockito:mockito-core:$mockitoVersion"
         testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
         testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
         testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
         testImplementation "org.junit-pioneer:junit-pioneer:1.5.0"
-        testImplementation "nl.jqno.equalsverifier:equalsverifier:3.8.1"
+        testImplementation "nl.jqno.equalsverifier:equalsverifier:3.8.2"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
         testRuntimeOnly "org.apache.logging.log4j:log4j-core:$log4jVersion"
     }
@@ -74,6 +75,9 @@ subprojects {
 
     javadoc {
         enabled = false
+        failOnError = true
+        options.addBooleanOption('html5', true)
+        options.addStringOption('Xwerror', '-quiet')
     }
 
     jacocoTestReport {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2880ba8..2e6e5897 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jfxui/.settings/org.eclipse.jdt.ui.prefs b/jfxui/.settings/org.eclipse.jdt.ui.prefs
index d58373de..6c414901 100644
--- a/jfxui/.settings/org.eclipse.jdt.ui.prefs
+++ b/jfxui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_all=false
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -19,31 +20,73 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
+sp_cleanup.arrays_fill=false
+sp_cleanup.bitwise_conditional_expression=false
+sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
+sp_cleanup.break_loop=false
+sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
+sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
+sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
+sp_cleanup.double_negation=false
+sp_cleanup.else_if=false
+sp_cleanup.embedded_if=false
+sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.hash=false
+sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
+sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.no_string_creation=false
+sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
+sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
+sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
+sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
+sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
+sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
 sp_cleanup.remove_redundant_semicolons=false
@@ -60,9 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
+sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
+sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
+sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
+sp_cleanup.ternary_operator=false
+sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -70,9 +134,13 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
+sp_cleanup.useless_continue=false
+sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/jfxui/build.gradle b/jfxui/build.gradle
index a250a465..568e2a41 100644
--- a/jfxui/build.gradle
+++ b/jfxui/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.github.johnrengelman.shadow'
     id 'org.panteleyev.jpackageplugin'
+    id 'org.gradle.crypto.checksum'
 }
 
 dependencies {
@@ -179,3 +180,11 @@ tasks.jpackage {
         icon = "${projectDir}/src/main/resources/icon.icns"
     }
 }
+
+task createChecksums(type: org.gradle.crypto.checksum.Checksum, dependsOn: [tasks.jpackage, tasks.shadowJar]) {
+    files = files(tasks.shadowJar.outputs.files, fileTree(tasks.jpackage.destination) {
+        include '*'
+    })
+    outputDir = new File(project.buildDir, "generatedChecksums")
+    algorithm = org.gradle.crypto.checksum.Checksum.Algorithm.SHA512
+}
diff --git a/logic/.settings/org.eclipse.jdt.ui.prefs b/logic/.settings/org.eclipse.jdt.ui.prefs
index d58373de..6c414901 100644
--- a/logic/.settings/org.eclipse.jdt.ui.prefs
+++ b/logic/.settings/org.eclipse.jdt.ui.prefs
@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_all=false
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
@@ -19,31 +20,73 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
+sp_cleanup.arrays_fill=false
+sp_cleanup.bitwise_conditional_expression=false
+sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
+sp_cleanup.break_loop=false
+sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
+sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
+sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
+sp_cleanup.double_negation=false
+sp_cleanup.else_if=false
+sp_cleanup.embedded_if=false
+sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.hash=false
+sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
+sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.no_string_creation=false
+sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
+sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
+sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
+sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
+sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
+sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
 sp_cleanup.remove_redundant_semicolons=false
@@ -60,9 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
+sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
+sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
+sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
+sp_cleanup.ternary_operator=false
+sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -70,9 +134,13 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
+sp_cleanup.useless_continue=false
+sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/plugins/csv/.settings/org.eclipse.jdt.ui.prefs b/plugins/csv/.settings/org.eclipse.jdt.ui.prefs
index 35b5cc08..fac0f19e 100644
--- a/plugins/csv/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/csv/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_profile=_Unmanaged profile 'itsallcode style2'
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -20,27 +20,35 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
 sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
 sp_cleanup.double_negation=false
 sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
 sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
@@ -50,6 +58,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.no_string_creation=false
@@ -57,10 +66,17 @@ sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -68,6 +84,8 @@ sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -85,14 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
 sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
 sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -100,6 +134,7 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
@@ -108,3 +143,4 @@ sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/plugins/demo/.settings/org.eclipse.jdt.ui.prefs b/plugins/demo/.settings/org.eclipse.jdt.ui.prefs
index 35b5cc08..6c414901 100644
--- a/plugins/demo/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/demo/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -20,27 +20,35 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
 sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
 sp_cleanup.double_negation=false
 sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
 sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
@@ -50,6 +58,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.no_string_creation=false
@@ -57,10 +66,17 @@ sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -68,6 +84,8 @@ sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -85,14 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
 sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
 sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -100,6 +134,7 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
@@ -108,3 +143,4 @@ sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/plugins/holiday-calculator/.settings/org.eclipse.jdt.ui.prefs b/plugins/holiday-calculator/.settings/org.eclipse.jdt.ui.prefs
index 35b5cc08..6c414901 100644
--- a/plugins/holiday-calculator/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/holiday-calculator/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -20,27 +20,35 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
 sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
 sp_cleanup.double_negation=false
 sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
 sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
@@ -50,6 +58,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.no_string_creation=false
@@ -57,10 +66,17 @@ sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -68,6 +84,8 @@ sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -85,14 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
 sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
 sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -100,6 +134,7 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
@@ -108,3 +143,4 @@ sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false
diff --git a/plugins/pmsmart/.settings/org.eclipse.jdt.ui.prefs b/plugins/pmsmart/.settings/org.eclipse.jdt.ui.prefs
index 35b5cc08..6c414901 100644
--- a/plugins/pmsmart/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/pmsmart/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=20
+formatter_settings_version=21
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -20,27 +20,35 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=true
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.array_with_curly=false
 sp_cleanup.arrays_fill=false
 sp_cleanup.bitwise_conditional_expression=false
 sp_cleanup.boolean_literal=false
+sp_cleanup.boolean_value_rather_than_comparison=false
 sp_cleanup.break_loop=false
 sp_cleanup.collection_cloning=false
+sp_cleanup.comparing_on_criteria=false
 sp_cleanup.comparison_statement=false
+sp_cleanup.controlflow_merge=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
 sp_cleanup.convert_to_switch_expressions=false
 sp_cleanup.correct_indentation=false
+sp_cleanup.do_while_rather_than_while=false
 sp_cleanup.double_negation=false
 sp_cleanup.else_if=false
 sp_cleanup.embedded_if=false
 sp_cleanup.evaluate_nullable=false
+sp_cleanup.extract_increment=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.hash=false
 sp_cleanup.if_condition=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.instanceof=false
+sp_cleanup.instanceof_keyword=false
+sp_cleanup.invert_equals=false
 sp_cleanup.join=false
 sp_cleanup.lazy_logical_operator=false
 sp_cleanup.make_local_variable_final=true
@@ -50,6 +58,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.map_cloning=false
 sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.multi_catch=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.no_string_creation=false
@@ -57,10 +66,17 @@ sp_cleanup.no_super=false
 sp_cleanup.number_suffix=false
 sp_cleanup.objects_equals=false
 sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+sp_cleanup.operand_factorization=false
 sp_cleanup.organize_imports=true
 sp_cleanup.overridden_assignment=false
+sp_cleanup.plain_replacement=false
 sp_cleanup.precompile_regex=false
+sp_cleanup.primitive_comparison=false
+sp_cleanup.primitive_parsing=false
+sp_cleanup.primitive_rather_than_wrapper=false
 sp_cleanup.primitive_serialization=false
+sp_cleanup.pull_out_if_from_if_else=false
 sp_cleanup.pull_up_assignment=false
 sp_cleanup.push_down_negation=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
@@ -68,6 +84,8 @@ sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.reduce_indentation=false
+sp_cleanup.redundant_comparator=false
 sp_cleanup.redundant_falling_through_block_end=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_modifiers=false
@@ -85,14 +103,30 @@ sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
+sp_cleanup.return_expression=false
 sp_cleanup.simplify_lambda_expression_and_method_ref=false
+sp_cleanup.single_used_field=false
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.standard_comparison=false
+sp_cleanup.static_inner_class=false
 sp_cleanup.strictly_equal_or_different=false
+sp_cleanup.stringbuffer_to_stringbuilder=false
 sp_cleanup.stringbuilder=false
+sp_cleanup.stringbuilder_for_local_vars=false
+sp_cleanup.stringconcat_to_textblock=false
+sp_cleanup.substring=false
 sp_cleanup.switch=false
+sp_cleanup.system_property=false
+sp_cleanup.system_property_boolean=false
+sp_cleanup.system_property_file_encoding=false
+sp_cleanup.system_property_file_separator=false
+sp_cleanup.system_property_line_separator=false
+sp_cleanup.system_property_path_separator=false
 sp_cleanup.ternary_operator=false
 sp_cleanup.try_with_resource=false
+sp_cleanup.unlooped_while=false
+sp_cleanup.unreachable_block=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_autoboxing=false
 sp_cleanup.use_blocks=true
@@ -100,6 +134,7 @@ sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_directly_map_method=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_string_is_blank=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=false
@@ -108,3 +143,4 @@ sp_cleanup.use_unboxing=false
 sp_cleanup.use_var=false
 sp_cleanup.useless_continue=false
 sp_cleanup.useless_return=false
+sp_cleanup.valueof_rather_than_instantiation=false