diff --git a/flokk_src/lib/_internal/components/pinned_stack.dart b/flokk_src/lib/_internal/components/pinned_stack.dart
index 63ab34e..24736b7 100644
--- a/flokk_src/lib/_internal/components/pinned_stack.dart
+++ b/flokk_src/lib/_internal/components/pinned_stack.dart
@@ -17,7 +17,7 @@ class PinnedStack extends StatelessWidget {
   final StackFit fit;
   final AlignmentGeometry alignment;
   final TextDirection textDirection;
-  final Overflow overflow;
+  final Clip clip;
 
   const PinnedStack(
       {Key key,
@@ -25,7 +25,7 @@ class PinnedStack extends StatelessWidget {
       this.fit = StackFit.expand,
       this.alignment = Alignment.topLeft,
       this.textDirection = TextDirection.ltr,
-      this.overflow = Overflow.visible})
+      this.clip = Clip.none})
       : super(key: key);
 
   @override
@@ -36,7 +36,7 @@ class PinnedStack extends StatelessWidget {
         child: Stack(
           fit: fit,
           alignment: alignment,
-          overflow: overflow,
+          clipBehavior: clip,
           textDirection: textDirection,
           children: children,
         ),
diff --git a/flokk_src/lib/commands/bootstrap_command.dart b/flokk_src/lib/commands/bootstrap_command.dart
index 3bbbd7e..7d95d36 100644
--- a/flokk_src/lib/commands/bootstrap_command.dart
+++ b/flokk_src/lib/commands/bootstrap_command.dart
@@ -65,7 +65,7 @@ class BootstrapCommand extends AbstractCommand {
     });
 
     /// Reset models if there are any errors, or if the app version has been updated
-    if (errorLoadingData || appModel.version != AppModel.kCurrentVersion) {
+    if (errorLoadingData) {
       authModel.reset();
       twitterModel.reset();
       githubModel.reset();
diff --git a/flokk_src/lib/styled_components/clickable_icon_row.dart b/flokk_src/lib/styled_components/clickable_icon_row.dart
index b242f7f..a19d5b0 100644
--- a/flokk_src/lib/styled_components/clickable_icon_row.dart
+++ b/flokk_src/lib/styled_components/clickable_icon_row.dart
@@ -62,7 +62,7 @@ class _ClickableIconRowState extends State<ClickableIconRow> {
         ),
         padding: EdgeInsets.symmetric(horizontal: Insets.l, vertical: Insets.m),
         child: Stack(
-          overflow: Overflow.visible,
+          clipBehavior: Clip.none,
           children: [
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/flokk_src/lib/styled_components/flokk_logo.dart b/flokk_src/lib/styled_components/flokk_logo.dart
index d077af9..48c813f 100644
--- a/flokk_src/lib/styled_components/flokk_logo.dart
+++ b/flokk_src/lib/styled_components/flokk_logo.dart
@@ -23,7 +23,7 @@ class FlokkSidebarLogo extends StatelessWidget {
     return Container(
       width: skinny ? 140 : 240,
       child: Stack(
-        overflow: Overflow.visible,
+        clipBehavior: Clip.none,
         children: [
           Image.asset("assets/images/sidebar-logo.png", width: skinny ? 140 : 160, filterQuality: FilterQuality.high),
           if (!skinny) ...{
diff --git a/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart b/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart
index 6de1882..f3ad505 100644
--- a/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart
+++ b/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart
@@ -122,7 +122,7 @@ class _ContactsListWithHeadersState extends State<ContactsListWithHeaders> {
               onCheckChanged: () => setState(() {}),
             )
                 .opacity(checked.isEmpty ? 0 : 1, animate: true)
-                .scale(checked.isEmpty ? .98 : 1, animate: true)
+                .scale(all: checked.isEmpty ? .98 : 1, animate: true)
                 .translate(offset: Offset(0, checked.isEmpty ? -4 : 0), animate: true)
                 .animate(.1.seconds, Curves.easeOut)
           ],
diff --git a/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart b/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart
index ae27b19..546e98d 100644
--- a/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart
+++ b/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart
@@ -36,7 +36,7 @@ class _SocialActivitySectionState extends State<SocialActivitySection> {
     GithubModel gitModel = context.watch();
     TwitterModel twitterModel = context.watch();
     return LayoutBuilder(
-      builder: (_, constraints) {
+      builder: (layoutContext, constraints) {
         /// Responsively size tab bars
         double tabWidth = constraints.maxWidth < PageBreaks.LargePhone ? 240 : 280;
         TextStyle headerStyle = TextStyles.T1;
@@ -44,7 +44,7 @@ class _SocialActivitySectionState extends State<SocialActivitySection> {
         bool useTabView = constraints.maxWidth < PageBreaks.TabletPortrait - 100;
 
         /// Determine which tab should be selected
-        var sectionType = context.select<AppModel, DashboardSocialSectionType>((model) => model.dashSocialSection);
+        var sectionType = layoutContext.select<AppModel, DashboardSocialSectionType>((model) => model.dashSocialSection);
         int tabIndex = 0;
         if (sectionType == DashboardSocialSectionType.Twitter) tabIndex = 1;
         if (sectionType == DashboardSocialSectionType.Git) tabIndex = 2;
diff --git a/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart b/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart
index 0f437e2..25c8d4f 100644
--- a/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart
+++ b/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart
@@ -85,7 +85,7 @@ class PlaceholderImageAndBgStack extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Stack(
-      overflow: Overflow.visible,
+      clipBehavior: Clip.none,
       children: [
         bgWidget ?? _BgCircle(),
         Image.asset("assets/images/empty-$path@2x.png", height: height).positioned(top: top, left: left),
diff --git a/flokk_src/pubspec.lock b/flokk_src/pubspec.lock
index 640a3c7..026ffab 100644
--- a/flokk_src/pubspec.lock
+++ b/flokk_src/pubspec.lock
@@ -14,21 +14,21 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "7.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.10"
+    version: "0.39.17"
   animations:
     dependency: "direct main"
     description:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0+5"
+    version: "1.1.2"
   archive:
     dependency: transitive
     description:
@@ -49,14 +49,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   build:
     dependency: transitive
     description:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   build_config:
     dependency: transitive
     description:
@@ -70,7 +70,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0-nullsafety.2"
   charcode:
     dependency: transitive
     description:
@@ -85,13 +85,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.15.0-nullsafety.2"
   convert:
     dependency: transitive
     description:
@@ -105,14 +112,14 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   csslib:
     dependency: transitive
     description:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.16.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -126,21 +133,14 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.3"
-  dartx:
-    dependency: "direct main"
-    description:
-      name: dartx
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.2"
+    version: "1.3.6"
   dotted_border:
     dependency: "direct main"
     description:
       name: dotted_border
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   draggable_scrollbar:
     dependency: "direct main"
     description:
@@ -161,13 +161,13 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "5.2.1"
   file_chooser:
     dependency: "direct main"
     description:
       path: "plugins/file_chooser"
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
-      resolved-ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
+      resolved-ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
       url: "git://github.com/google/flutter-desktop-embedding.git"
     source: git
     version: "0.2.0"
@@ -182,7 +182,7 @@ packages:
       name: flutter_hooks
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.0"
+    version: "0.8.0+1"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -194,7 +194,7 @@ packages:
       name: github
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.3"
+    version: "6.2.3"
   glob:
     dependency: transitive
     description:
@@ -208,21 +208,21 @@ packages:
       name: google_sign_in
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.4"
+    version: "4.5.3"
   google_sign_in_platform_interface:
     dependency: transitive
     description:
       name: google_sign_in_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.2"
   google_sign_in_web:
     dependency: transitive
     description:
       name: google_sign_in_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.4"
+    version: "0.9.2"
   googleapis:
     dependency: "direct main"
     description:
@@ -243,21 +243,21 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+4"
+    version: "0.12.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   image:
     dependency: "direct main"
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.1.15"
   intl:
     dependency: "direct main"
     description:
@@ -271,7 +271,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.1+1"
+    version: "0.6.2"
   json_annotation:
     dependency: "direct main"
     description:
@@ -285,7 +285,7 @@ packages:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.5"
+    version: "3.4.1"
   logging:
     dependency: transitive
     description:
@@ -299,14 +299,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.9"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.2"
   nested:
     dependency: transitive
     description:
@@ -320,14 +320,14 @@ packages:
       name: node_interop
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.1"
   node_io:
     dependency: transitive
     description:
       name: node_io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1+2"
+    version: "1.1.1"
   package_config:
     dependency: transitive
     description:
@@ -341,21 +341,21 @@ packages:
       name: package_info
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0+16"
+    version: "0.4.3"
   path:
     dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.1+1"
   path_parsing:
     dependency: transitive
     description:
@@ -374,32 +374,46 @@ packages:
     dependency: "direct main"
     description:
       path: "plugins/flutter_plugins/path_provider_fde"
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
-      resolved-ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
+      resolved-ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
       url: "git://github.com/google/flutter-desktop-embedding.git"
     source: git
     version: "0.0.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+2"
   path_provider_macos:
     dependency: "direct main"
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.4+4"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.2"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   platform:
     dependency: transitive
     description:
@@ -407,6 +421,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.1"
+  platform_detect:
+    dependency: transitive
+    description:
+      name: platform_detect
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -420,21 +441,21 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.12"
+    version: "3.0.13"
   provider:
     dependency: "direct main"
     description:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0-dev+2"
+    version: "4.3.2+2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.3"
+    version: "1.4.4"
   pubspec_parse:
     dependency: transitive
     description:
@@ -462,28 +483,35 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.6+2"
+    version: "0.5.10"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2+2"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+6"
+    version: "0.0.1+10"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+4"
+    version: "0.1.2+7"
   sized_context:
     dependency: "direct main"
     description:
@@ -502,7 +530,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.5"
+    version: "0.9.6"
   source_span:
     dependency: transitive
     description:
@@ -516,14 +544,14 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   statsfl:
     dependency: "direct main"
     description:
       name: statsfl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.3"
+    version: "0.0.4"
   string_scanner:
     dependency: transitive
     description:
@@ -534,10 +562,12 @@ packages:
   styled_widget:
     dependency: "direct main"
     description:
-      name: styled_widget
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.1+2"
+      path: "."
+      ref: HEAD
+      resolved-ref: "7e2f59cc787292c94788a9030551d5db0f32966a"
+      url: "git://github.com/gskinnerTeam/styled_widget.git"
+    source: git
+    version: "0.2.1"
   term_glyph:
     dependency: transitive
     description:
@@ -551,21 +581,21 @@ packages:
       name: textstyle_extensions
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.0+2"
   time:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: time
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   timeago:
     dependency: "direct main"
     description:
       name: timeago
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.26"
+    version: "2.0.27"
   tuple:
     dependency: "direct main"
     description:
@@ -579,62 +609,76 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0-nullsafety.2"
   universal_platform:
     dependency: "direct main"
     description:
       name: universal_platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+1"
+    version: "0.1.3"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.4.5"
+    version: "5.6.0"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+4"
+    version: "0.0.1+8"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1+1"
+    version: "0.1.3+2"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.2"
   watcher:
     dependency: transitive
     description:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+13"
+    version: "0.9.7+15"
   window_size:
     dependency: "direct main"
     description:
       path: "plugins/window_size"
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
-      resolved-ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
+      resolved-ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
       url: "git://github.com/google/flutter-desktop-embedding.git"
     source: git
     version: "0.1.0"
@@ -644,21 +688,21 @@ packages:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.2"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.7.0"
+    version: "4.5.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: ">=1.15.17-pre.5 <2.0.0"
+  dart: ">=2.10.0-0.0.dev <2.10.0"
+  flutter: ">=1.16.0 <2.0.0"
diff --git a/flokk_src/pubspec.yaml b/flokk_src/pubspec.yaml
index 7c725f3..50a7da5 100644
--- a/flokk_src/pubspec.yaml
+++ b/flokk_src/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
     sdk: flutter
   animations: ^1.0.0+5
   cupertino_icons: ^0.1.3
-  dartx: ^0.4.0
+  time: ^1.3.0
   dotted_border: ^1.0.5
   draggable_scrollbar: ^0.0.4
   faker: ^1.2.1
@@ -31,7 +31,9 @@ dependencies:
   shared_preferences:
   sized_context: ^0.2.1
   statsfl: ^0.0.3
-  styled_widget: ^0.2.1
+  styled_widget:
+    git:
+      url: git://github.com/gskinnerTeam/styled_widget.git
   textstyle_extensions: ^1.0.0
   timeago: ^2.0.26
   tuple: ^1.0.3
@@ -43,17 +45,17 @@ dependencies:
     git:
       url: git://github.com/google/flutter-desktop-embedding.git
       path: plugins/file_chooser
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
   path_provider_fde:
     git:
       url: git://github.com/google/flutter-desktop-embedding.git
       path: plugins/flutter_plugins/path_provider_fde
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
   window_size:
     git:
       url: git://github.com/google/flutter-desktop-embedding.git
       path: plugins/window_size
-      ref: b0794faf2c000576515aee56ca6bb5bee64cece4
+      ref: dc5bad31ae93dd5d82e235e38d5c21b6a47445ab
 
 dev_dependencies:
   json_serializable: ^3.2.0 # Generate JSON parsers: flutter pub run build_runner build --delete-conflicting-outputs