diff --git a/README.md b/README.md
index 9796dc1..9bf34ee 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,12 @@
 # weekly_goals
 
-A new Flutter project.
+Really need to write something here eventually.
 
-## Getting Started
+## How to generate the proto files
 
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
-
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+1. Check out event-server (let's say side by side with this).
+2. Install protoc. Note where you put the include files, let's call that $PROTO_INC. On Windows it
+   needs to be unpacked manually somewhere.
+3. Install protoc_plugin for dart: `pub global activate protoc_plugin`. Pay attention to the
+   output; you may need to add something to your PATH.
+4. Run protoc: `protoc --dart_out=grpc:lib/generated -I../event-server/proto -I$PROTOC_INC ../event-server/proto/service.proto`
diff --git a/lib/config.dart b/lib/config.dart
index 04d668e..3407d90 100644
--- a/lib/config.dart
+++ b/lib/config.dart
@@ -37,7 +37,7 @@ class Config with ChangeNotifier {
     notifyListeners();
   }
 
-  String _serverAccount;
+  String _serverAccount = '';
   String get serverAccount => _serverAccount;
   set serverAccount(String serverAccount) {
     _serverAccount = serverAccount;
@@ -45,7 +45,7 @@ class Config with ChangeNotifier {
     notifyListeners();
   }
 
-  String _serverToken;
+  String _serverToken = '';
   String get serverToken => _serverToken;
   set serverToken(String serverToken) {
     _serverToken = serverToken;
diff --git a/lib/db.dart b/lib/db.dart
index 6430af6..bb935ea 100644
--- a/lib/db.dart
+++ b/lib/db.dart
@@ -85,7 +85,7 @@ class WeeklyGoalsDatabase extends _$WeeklyGoalsDatabase {
       (select(events)..orderBy([(u) => OrderingTerm(expression: u.timestamp, mode: OrderingMode.desc)])).watch();
 
   Future<List<Event>> get unsyncedEvents => (select(events)
-        ..where((t) => isNull(t.synced))
+        ..where((t) => t.synced.isNull())
         ..orderBy([(u) => OrderingTerm(expression: u.timestamp, mode: OrderingMode.asc)]))
       .get();
 
diff --git a/lib/generated/service.pb.dart b/lib/generated/service.pb.dart
index fa7f88e..7c3365b 100644
--- a/lib/generated/service.pb.dart
+++ b/lib/generated/service.pb.dart
@@ -2,27 +2,43 @@
 //  Generated code. Do not modify.
 //  source: service.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'types.pb.dart' as $2;
+import 'types.pb.dart' as $1;
 
 class PushEventsRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('PushEventsRequest', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.Event>(1, 'event', subBuilder: $2.Event.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'PushEventsRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.Event>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'event', subBuilder: $1.Event.create)
     ..hasRequiredFields = false
   ;
 
   PushEventsRequest._() : super();
-  factory PushEventsRequest() => create();
+  factory PushEventsRequest({
+    $1.Event? event,
+  }) {
+    final _result = create();
+    if (event != null) {
+      _result.event = event;
+    }
+    return _result;
+  }
   factory PushEventsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory PushEventsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   PushEventsRequest clone() => PushEventsRequest()..mergeFromMessage(this);
-  PushEventsRequest copyWith(void Function(PushEventsRequest) updates) => super.copyWith((message) => updates(message as PushEventsRequest));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  PushEventsRequest copyWith(void Function(PushEventsRequest) updates) => super.copyWith((message) => updates(message as PushEventsRequest)) as PushEventsRequest; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static PushEventsRequest create() => PushEventsRequest._();
@@ -30,32 +46,48 @@ class PushEventsRequest extends $pb.GeneratedMessage {
   static $pb.PbList<PushEventsRequest> createRepeated() => $pb.PbList<PushEventsRequest>();
   @$core.pragma('dart2js:noInline')
   static PushEventsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushEventsRequest>(create);
-  static PushEventsRequest _defaultInstance;
+  static PushEventsRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.Event get event => $_getN(0);
+  $1.Event get event => $_getN(0);
   @$pb.TagNumber(1)
-  set event($2.Event v) { setField(1, v); }
+  set event($1.Event v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasEvent() => $_has(0);
   @$pb.TagNumber(1)
   void clearEvent() => clearField(1);
   @$pb.TagNumber(1)
-  $2.Event ensureEvent() => $_ensure(0);
+  $1.Event ensureEvent() => $_ensure(0);
 }
 
 class PushEventsResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('PushEventsResponse', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.EventOperationResult>(1, 'result', subBuilder: $2.EventOperationResult.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'PushEventsResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventOperationResult>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'result', subBuilder: $1.EventOperationResult.create)
     ..hasRequiredFields = false
   ;
 
   PushEventsResponse._() : super();
-  factory PushEventsResponse() => create();
+  factory PushEventsResponse({
+    $1.EventOperationResult? result,
+  }) {
+    final _result = create();
+    if (result != null) {
+      _result.result = result;
+    }
+    return _result;
+  }
   factory PushEventsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory PushEventsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   PushEventsResponse clone() => PushEventsResponse()..mergeFromMessage(this);
-  PushEventsResponse copyWith(void Function(PushEventsResponse) updates) => super.copyWith((message) => updates(message as PushEventsResponse));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  PushEventsResponse copyWith(void Function(PushEventsResponse) updates) => super.copyWith((message) => updates(message as PushEventsResponse)) as PushEventsResponse; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static PushEventsResponse create() => PushEventsResponse._();
@@ -63,32 +95,48 @@ class PushEventsResponse extends $pb.GeneratedMessage {
   static $pb.PbList<PushEventsResponse> createRepeated() => $pb.PbList<PushEventsResponse>();
   @$core.pragma('dart2js:noInline')
   static PushEventsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushEventsResponse>(create);
-  static PushEventsResponse _defaultInstance;
+  static PushEventsResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.EventOperationResult get result => $_getN(0);
+  $1.EventOperationResult get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result($2.EventOperationResult v) { setField(1, v); }
+  set result($1.EventOperationResult v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
   void clearResult() => clearField(1);
   @$pb.TagNumber(1)
-  $2.EventOperationResult ensureResult() => $_ensure(0);
+  $1.EventOperationResult ensureResult() => $_ensure(0);
 }
 
 class GetEventsRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('GetEventsRequest', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.EventsFilter>(1, 'filter', subBuilder: $2.EventsFilter.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetEventsRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventsFilter>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'filter', subBuilder: $1.EventsFilter.create)
     ..hasRequiredFields = false
   ;
 
   GetEventsRequest._() : super();
-  factory GetEventsRequest() => create();
+  factory GetEventsRequest({
+    $1.EventsFilter? filter,
+  }) {
+    final _result = create();
+    if (filter != null) {
+      _result.filter = filter;
+    }
+    return _result;
+  }
   factory GetEventsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory GetEventsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   GetEventsRequest clone() => GetEventsRequest()..mergeFromMessage(this);
-  GetEventsRequest copyWith(void Function(GetEventsRequest) updates) => super.copyWith((message) => updates(message as GetEventsRequest));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  GetEventsRequest copyWith(void Function(GetEventsRequest) updates) => super.copyWith((message) => updates(message as GetEventsRequest)) as GetEventsRequest; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static GetEventsRequest create() => GetEventsRequest._();
@@ -96,32 +144,48 @@ class GetEventsRequest extends $pb.GeneratedMessage {
   static $pb.PbList<GetEventsRequest> createRepeated() => $pb.PbList<GetEventsRequest>();
   @$core.pragma('dart2js:noInline')
   static GetEventsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetEventsRequest>(create);
-  static GetEventsRequest _defaultInstance;
+  static GetEventsRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.EventsFilter get filter => $_getN(0);
+  $1.EventsFilter get filter => $_getN(0);
   @$pb.TagNumber(1)
-  set filter($2.EventsFilter v) { setField(1, v); }
+  set filter($1.EventsFilter v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasFilter() => $_has(0);
   @$pb.TagNumber(1)
   void clearFilter() => clearField(1);
   @$pb.TagNumber(1)
-  $2.EventsFilter ensureFilter() => $_ensure(0);
+  $1.EventsFilter ensureFilter() => $_ensure(0);
 }
 
 class GetEventsResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('GetEventsResponse', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.EventOperationResult>(1, 'result', subBuilder: $2.EventOperationResult.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'GetEventsResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventOperationResult>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'result', subBuilder: $1.EventOperationResult.create)
     ..hasRequiredFields = false
   ;
 
   GetEventsResponse._() : super();
-  factory GetEventsResponse() => create();
+  factory GetEventsResponse({
+    $1.EventOperationResult? result,
+  }) {
+    final _result = create();
+    if (result != null) {
+      _result.result = result;
+    }
+    return _result;
+  }
   factory GetEventsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory GetEventsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   GetEventsResponse clone() => GetEventsResponse()..mergeFromMessage(this);
-  GetEventsResponse copyWith(void Function(GetEventsResponse) updates) => super.copyWith((message) => updates(message as GetEventsResponse));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  GetEventsResponse copyWith(void Function(GetEventsResponse) updates) => super.copyWith((message) => updates(message as GetEventsResponse)) as GetEventsResponse; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static GetEventsResponse create() => GetEventsResponse._();
@@ -129,32 +193,48 @@ class GetEventsResponse extends $pb.GeneratedMessage {
   static $pb.PbList<GetEventsResponse> createRepeated() => $pb.PbList<GetEventsResponse>();
   @$core.pragma('dart2js:noInline')
   static GetEventsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetEventsResponse>(create);
-  static GetEventsResponse _defaultInstance;
+  static GetEventsResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.EventOperationResult get result => $_getN(0);
+  $1.EventOperationResult get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result($2.EventOperationResult v) { setField(1, v); }
+  set result($1.EventOperationResult v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
   void clearResult() => clearField(1);
   @$pb.TagNumber(1)
-  $2.EventOperationResult ensureResult() => $_ensure(0);
+  $1.EventOperationResult ensureResult() => $_ensure(0);
 }
 
 class WatchEventsRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('WatchEventsRequest', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.EventsFilter>(1, 'filter', subBuilder: $2.EventsFilter.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'WatchEventsRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventsFilter>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'filter', subBuilder: $1.EventsFilter.create)
     ..hasRequiredFields = false
   ;
 
   WatchEventsRequest._() : super();
-  factory WatchEventsRequest() => create();
+  factory WatchEventsRequest({
+    $1.EventsFilter? filter,
+  }) {
+    final _result = create();
+    if (filter != null) {
+      _result.filter = filter;
+    }
+    return _result;
+  }
   factory WatchEventsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory WatchEventsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   WatchEventsRequest clone() => WatchEventsRequest()..mergeFromMessage(this);
-  WatchEventsRequest copyWith(void Function(WatchEventsRequest) updates) => super.copyWith((message) => updates(message as WatchEventsRequest));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  WatchEventsRequest copyWith(void Function(WatchEventsRequest) updates) => super.copyWith((message) => updates(message as WatchEventsRequest)) as WatchEventsRequest; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static WatchEventsRequest create() => WatchEventsRequest._();
@@ -162,32 +242,48 @@ class WatchEventsRequest extends $pb.GeneratedMessage {
   static $pb.PbList<WatchEventsRequest> createRepeated() => $pb.PbList<WatchEventsRequest>();
   @$core.pragma('dart2js:noInline')
   static WatchEventsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<WatchEventsRequest>(create);
-  static WatchEventsRequest _defaultInstance;
+  static WatchEventsRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.EventsFilter get filter => $_getN(0);
+  $1.EventsFilter get filter => $_getN(0);
   @$pb.TagNumber(1)
-  set filter($2.EventsFilter v) { setField(1, v); }
+  set filter($1.EventsFilter v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasFilter() => $_has(0);
   @$pb.TagNumber(1)
   void clearFilter() => clearField(1);
   @$pb.TagNumber(1)
-  $2.EventsFilter ensureFilter() => $_ensure(0);
+  $1.EventsFilter ensureFilter() => $_ensure(0);
 }
 
 class WatchEventsResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('WatchEventsResponse', package: const $pb.PackageName('eventserver'), createEmptyInstance: create)
-    ..aOM<$2.EventStreamItem>(1, 'item', subBuilder: $2.EventStreamItem.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'WatchEventsResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventStreamItem>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'item', subBuilder: $1.EventStreamItem.create)
     ..hasRequiredFields = false
   ;
 
   WatchEventsResponse._() : super();
-  factory WatchEventsResponse() => create();
+  factory WatchEventsResponse({
+    $1.EventStreamItem? item,
+  }) {
+    final _result = create();
+    if (item != null) {
+      _result.item = item;
+    }
+    return _result;
+  }
   factory WatchEventsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
   factory WatchEventsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
   WatchEventsResponse clone() => WatchEventsResponse()..mergeFromMessage(this);
-  WatchEventsResponse copyWith(void Function(WatchEventsResponse) updates) => super.copyWith((message) => updates(message as WatchEventsResponse));
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  WatchEventsResponse copyWith(void Function(WatchEventsResponse) updates) => super.copyWith((message) => updates(message as WatchEventsResponse)) as WatchEventsResponse; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static WatchEventsResponse create() => WatchEventsResponse._();
@@ -195,17 +291,146 @@ class WatchEventsResponse extends $pb.GeneratedMessage {
   static $pb.PbList<WatchEventsResponse> createRepeated() => $pb.PbList<WatchEventsResponse>();
   @$core.pragma('dart2js:noInline')
   static WatchEventsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<WatchEventsResponse>(create);
-  static WatchEventsResponse _defaultInstance;
+  static WatchEventsResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $2.EventStreamItem get item => $_getN(0);
+  $1.EventStreamItem get item => $_getN(0);
   @$pb.TagNumber(1)
-  set item($2.EventStreamItem v) { setField(1, v); }
+  set item($1.EventStreamItem v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasItem() => $_has(0);
   @$pb.TagNumber(1)
   void clearItem() => clearField(1);
   @$pb.TagNumber(1)
-  $2.EventStreamItem ensureItem() => $_ensure(0);
+  $1.EventStreamItem ensureItem() => $_ensure(0);
+}
+
+enum SyncEventsRequest_Pushpull {
+  event, 
+  filter, 
+  notSet
+}
+
+class SyncEventsRequest extends $pb.GeneratedMessage {
+  static const $core.Map<$core.int, SyncEventsRequest_Pushpull> _SyncEventsRequest_PushpullByTag = {
+    1 : SyncEventsRequest_Pushpull.event,
+    2 : SyncEventsRequest_Pushpull.filter,
+    0 : SyncEventsRequest_Pushpull.notSet
+  };
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'SyncEventsRequest', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..oo(0, [1, 2])
+    ..aOM<$1.Event>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'event', subBuilder: $1.Event.create)
+    ..aOM<$1.EventsFilter>(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'filter', subBuilder: $1.EventsFilter.create)
+    ..hasRequiredFields = false
+  ;
+
+  SyncEventsRequest._() : super();
+  factory SyncEventsRequest({
+    $1.Event? event,
+    $1.EventsFilter? filter,
+  }) {
+    final _result = create();
+    if (event != null) {
+      _result.event = event;
+    }
+    if (filter != null) {
+      _result.filter = filter;
+    }
+    return _result;
+  }
+  factory SyncEventsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory SyncEventsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  SyncEventsRequest clone() => SyncEventsRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  SyncEventsRequest copyWith(void Function(SyncEventsRequest) updates) => super.copyWith((message) => updates(message as SyncEventsRequest)) as SyncEventsRequest; // ignore: deprecated_member_use
+  $pb.BuilderInfo get info_ => _i;
+  @$core.pragma('dart2js:noInline')
+  static SyncEventsRequest create() => SyncEventsRequest._();
+  SyncEventsRequest createEmptyInstance() => create();
+  static $pb.PbList<SyncEventsRequest> createRepeated() => $pb.PbList<SyncEventsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static SyncEventsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SyncEventsRequest>(create);
+  static SyncEventsRequest? _defaultInstance;
+
+  SyncEventsRequest_Pushpull whichPushpull() => _SyncEventsRequest_PushpullByTag[$_whichOneof(0)]!;
+  void clearPushpull() => clearField($_whichOneof(0));
+
+  @$pb.TagNumber(1)
+  $1.Event get event => $_getN(0);
+  @$pb.TagNumber(1)
+  set event($1.Event v) { setField(1, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasEvent() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearEvent() => clearField(1);
+  @$pb.TagNumber(1)
+  $1.Event ensureEvent() => $_ensure(0);
+
+  @$pb.TagNumber(2)
+  $1.EventsFilter get filter => $_getN(1);
+  @$pb.TagNumber(2)
+  set filter($1.EventsFilter v) { setField(2, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasFilter() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearFilter() => clearField(2);
+  @$pb.TagNumber(2)
+  $1.EventsFilter ensureFilter() => $_ensure(1);
+}
+
+class SyncEventsResponse extends $pb.GeneratedMessage {
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'SyncEventsResponse', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'eventserver'), createEmptyInstance: create)
+    ..aOM<$1.EventOperationResult>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'result', subBuilder: $1.EventOperationResult.create)
+    ..hasRequiredFields = false
+  ;
+
+  SyncEventsResponse._() : super();
+  factory SyncEventsResponse({
+    $1.EventOperationResult? result,
+  }) {
+    final _result = create();
+    if (result != null) {
+      _result.result = result;
+    }
+    return _result;
+  }
+  factory SyncEventsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory SyncEventsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  SyncEventsResponse clone() => SyncEventsResponse()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  SyncEventsResponse copyWith(void Function(SyncEventsResponse) updates) => super.copyWith((message) => updates(message as SyncEventsResponse)) as SyncEventsResponse; // ignore: deprecated_member_use
+  $pb.BuilderInfo get info_ => _i;
+  @$core.pragma('dart2js:noInline')
+  static SyncEventsResponse create() => SyncEventsResponse._();
+  SyncEventsResponse createEmptyInstance() => create();
+  static $pb.PbList<SyncEventsResponse> createRepeated() => $pb.PbList<SyncEventsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static SyncEventsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SyncEventsResponse>(create);
+  static SyncEventsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $1.EventOperationResult get result => $_getN(0);
+  @$pb.TagNumber(1)
+  set result($1.EventOperationResult v) { setField(1, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasResult() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearResult() => clearField(1);
+  @$pb.TagNumber(1)
+  $1.EventOperationResult ensureResult() => $_ensure(0);
 }
 
diff --git a/lib/generated/service.pbenum.dart b/lib/generated/service.pbenum.dart
index db68a1d..77001a4 100644
--- a/lib/generated/service.pbenum.dart
+++ b/lib/generated/service.pbenum.dart
@@ -2,6 +2,6 @@
 //  Generated code. Do not modify.
 //  source: service.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
diff --git a/lib/generated/service.pbgrpc.dart b/lib/generated/service.pbgrpc.dart
index 1273405..91c9cfe 100644
--- a/lib/generated/service.pbgrpc.dart
+++ b/lib/generated/service.pbgrpc.dart
@@ -2,8 +2,8 @@
 //  Generated code. Do not modify.
 //  source: service.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
 import 'dart:async' as $async;
 
@@ -32,32 +32,44 @@ class EventServerClient extends $grpc.Client {
           ($0.WatchEventsRequest value) => value.writeToBuffer(),
           ($core.List<$core.int> value) =>
               $0.WatchEventsResponse.fromBuffer(value));
+  static final _$syncEvents =
+      $grpc.ClientMethod<$0.SyncEventsRequest, $0.SyncEventsResponse>(
+          '/eventserver.EventServer/SyncEvents',
+          ($0.SyncEventsRequest value) => value.writeToBuffer(),
+          ($core.List<$core.int> value) =>
+              $0.SyncEventsResponse.fromBuffer(value));
 
-  EventServerClient($grpc.ClientChannel channel, {$grpc.CallOptions options})
-      : super(channel, options: options);
+  EventServerClient($grpc.ClientChannel channel,
+      {$grpc.CallOptions? options,
+      $core.Iterable<$grpc.ClientInterceptor>? interceptors})
+      : super(channel, options: options, interceptors: interceptors);
 
   $grpc.ResponseStream<$0.PushEventsResponse> pushEvents(
       $async.Stream<$0.PushEventsRequest> request,
-      {$grpc.CallOptions options}) {
-    final call = $createCall(_$pushEvents, request, options: options);
-    return $grpc.ResponseStream(call);
+      {$grpc.CallOptions? options}) {
+    return $createStreamingCall(_$pushEvents, request, options: options);
   }
 
   $grpc.ResponseStream<$0.GetEventsResponse> getEvents(
       $0.GetEventsRequest request,
-      {$grpc.CallOptions options}) {
-    final call = $createCall(_$getEvents, $async.Stream.fromIterable([request]),
+      {$grpc.CallOptions? options}) {
+    return $createStreamingCall(
+        _$getEvents, $async.Stream.fromIterable([request]),
         options: options);
-    return $grpc.ResponseStream(call);
   }
 
   $grpc.ResponseStream<$0.WatchEventsResponse> watchEvents(
       $0.WatchEventsRequest request,
-      {$grpc.CallOptions options}) {
-    final call = $createCall(
+      {$grpc.CallOptions? options}) {
+    return $createStreamingCall(
         _$watchEvents, $async.Stream.fromIterable([request]),
         options: options);
-    return $grpc.ResponseStream(call);
+  }
+
+  $grpc.ResponseStream<$0.SyncEventsResponse> syncEvents(
+      $async.Stream<$0.SyncEventsRequest> request,
+      {$grpc.CallOptions? options}) {
+    return $createStreamingCall(_$syncEvents, request, options: options);
   }
 }
 
@@ -88,6 +100,13 @@ abstract class EventServerServiceBase extends $grpc.Service {
             ($core.List<$core.int> value) =>
                 $0.WatchEventsRequest.fromBuffer(value),
             ($0.WatchEventsResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$0.SyncEventsRequest, $0.SyncEventsResponse>(
+        'SyncEvents',
+        syncEvents,
+        true,
+        true,
+        ($core.List<$core.int> value) => $0.SyncEventsRequest.fromBuffer(value),
+        ($0.SyncEventsResponse value) => value.writeToBuffer()));
   }
 
   $async.Stream<$0.GetEventsResponse> getEvents_Pre($grpc.ServiceCall call,
@@ -106,4 +125,6 @@ abstract class EventServerServiceBase extends $grpc.Service {
       $grpc.ServiceCall call, $0.GetEventsRequest request);
   $async.Stream<$0.WatchEventsResponse> watchEvents(
       $grpc.ServiceCall call, $0.WatchEventsRequest request);
+  $async.Stream<$0.SyncEventsResponse> syncEvents(
+      $grpc.ServiceCall call, $async.Stream<$0.SyncEventsRequest> request);
 }
diff --git a/lib/generated/service.pbjson.dart b/lib/generated/service.pbjson.dart
index f5e517a..5aec024 100644
--- a/lib/generated/service.pbjson.dart
+++ b/lib/generated/service.pbjson.dart
@@ -2,9 +2,13 @@
 //  Generated code. Do not modify.
 //  source: service.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
 
+import 'dart:core' as $core;
+import 'dart:convert' as $convert;
+import 'dart:typed_data' as $typed_data;
+@$core.Deprecated('Use pushEventsRequestDescriptor instead')
 const PushEventsRequest$json = const {
   '1': 'PushEventsRequest',
   '2': const [
@@ -12,6 +16,9 @@ const PushEventsRequest$json = const {
   ],
 };
 
+/// Descriptor for `PushEventsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List pushEventsRequestDescriptor = $convert.base64Decode('ChFQdXNoRXZlbnRzUmVxdWVzdBIoCgVldmVudBgBIAEoCzISLmV2ZW50c2VydmVyLkV2ZW50UgVldmVudA==');
+@$core.Deprecated('Use pushEventsResponseDescriptor instead')
 const PushEventsResponse$json = const {
   '1': 'PushEventsResponse',
   '2': const [
@@ -19,6 +26,9 @@ const PushEventsResponse$json = const {
   ],
 };
 
+/// Descriptor for `PushEventsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List pushEventsResponseDescriptor = $convert.base64Decode('ChJQdXNoRXZlbnRzUmVzcG9uc2USOQoGcmVzdWx0GAEgASgLMiEuZXZlbnRzZXJ2ZXIuRXZlbnRPcGVyYXRpb25SZXN1bHRSBnJlc3VsdA==');
+@$core.Deprecated('Use getEventsRequestDescriptor instead')
 const GetEventsRequest$json = const {
   '1': 'GetEventsRequest',
   '2': const [
@@ -26,6 +36,9 @@ const GetEventsRequest$json = const {
   ],
 };
 
+/// Descriptor for `GetEventsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getEventsRequestDescriptor = $convert.base64Decode('ChBHZXRFdmVudHNSZXF1ZXN0EjEKBmZpbHRlchgBIAEoCzIZLmV2ZW50c2VydmVyLkV2ZW50c0ZpbHRlclIGZmlsdGVy');
+@$core.Deprecated('Use getEventsResponseDescriptor instead')
 const GetEventsResponse$json = const {
   '1': 'GetEventsResponse',
   '2': const [
@@ -33,6 +46,9 @@ const GetEventsResponse$json = const {
   ],
 };
 
+/// Descriptor for `GetEventsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getEventsResponseDescriptor = $convert.base64Decode('ChFHZXRFdmVudHNSZXNwb25zZRI5CgZyZXN1bHQYASABKAsyIS5ldmVudHNlcnZlci5FdmVudE9wZXJhdGlvblJlc3VsdFIGcmVzdWx0');
+@$core.Deprecated('Use watchEventsRequestDescriptor instead')
 const WatchEventsRequest$json = const {
   '1': 'WatchEventsRequest',
   '2': const [
@@ -40,6 +56,9 @@ const WatchEventsRequest$json = const {
   ],
 };
 
+/// Descriptor for `WatchEventsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List watchEventsRequestDescriptor = $convert.base64Decode('ChJXYXRjaEV2ZW50c1JlcXVlc3QSMQoGZmlsdGVyGAEgASgLMhkuZXZlbnRzZXJ2ZXIuRXZlbnRzRmlsdGVyUgZmaWx0ZXI=');
+@$core.Deprecated('Use watchEventsResponseDescriptor instead')
 const WatchEventsResponse$json = const {
   '1': 'WatchEventsResponse',
   '2': const [
@@ -47,3 +66,29 @@ const WatchEventsResponse$json = const {
   ],
 };
 
+/// Descriptor for `WatchEventsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List watchEventsResponseDescriptor = $convert.base64Decode('ChNXYXRjaEV2ZW50c1Jlc3BvbnNlEjAKBGl0ZW0YASABKAsyHC5ldmVudHNlcnZlci5FdmVudFN0cmVhbUl0ZW1SBGl0ZW0=');
+@$core.Deprecated('Use syncEventsRequestDescriptor instead')
+const SyncEventsRequest$json = const {
+  '1': 'SyncEventsRequest',
+  '2': const [
+    const {'1': 'event', '3': 1, '4': 1, '5': 11, '6': '.eventserver.Event', '9': 0, '10': 'event'},
+    const {'1': 'filter', '3': 2, '4': 1, '5': 11, '6': '.eventserver.EventsFilter', '9': 0, '10': 'filter'},
+  ],
+  '8': const [
+    const {'1': 'pushpull'},
+  ],
+};
+
+/// Descriptor for `SyncEventsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List syncEventsRequestDescriptor = $convert.base64Decode('ChFTeW5jRXZlbnRzUmVxdWVzdBIqCgVldmVudBgBIAEoCzISLmV2ZW50c2VydmVyLkV2ZW50SABSBWV2ZW50EjMKBmZpbHRlchgCIAEoCzIZLmV2ZW50c2VydmVyLkV2ZW50c0ZpbHRlckgAUgZmaWx0ZXJCCgoIcHVzaHB1bGw=');
+@$core.Deprecated('Use syncEventsResponseDescriptor instead')
+const SyncEventsResponse$json = const {
+  '1': 'SyncEventsResponse',
+  '2': const [
+    const {'1': 'result', '3': 1, '4': 1, '5': 11, '6': '.eventserver.EventOperationResult', '10': 'result'},
+  ],
+};
+
+/// Descriptor for `SyncEventsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List syncEventsResponseDescriptor = $convert.base64Decode('ChJTeW5jRXZlbnRzUmVzcG9uc2USOQoGcmVzdWx0GAEgASgLMiEuZXZlbnRzZXJ2ZXIuRXZlbnRPcGVyYXRpb25SZXN1bHRSBnJlc3VsdA==');
diff --git a/lib/server_client.dart b/lib/server_client.dart
index 5931213..fd773f9 100644
--- a/lib/server_client.dart
+++ b/lib/server_client.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:grpc/grpc.dart';
 import 'package:moor/moor.dart';
 import 'package:timezone/timezone.dart' as tz;
+import 'package:uuid/uuid.dart';
 
 import 'config.dart';
 import 'db.dart';
@@ -52,7 +53,7 @@ class ServerClient {
         } else {
           final data = res.result.event;
           final event = EventsCompanion.insert(
-            uuid: uuid.unparse(data.uuid),
+            uuid: Uuid.unparse(data.uuid),
             type: data.type,
             name: data.name,
             description: Value(data.description),
@@ -79,7 +80,7 @@ class ServerClient {
       map[e.uuid] = e;
       return PushEventsRequest()
         ..event = (pbTypes.Event()
-          ..uuid = uuid.parse(e.uuid)
+          ..uuid = Uuid.parse(e.uuid)
           ..account = _dummyAccount
           ..application = _applicationId
           ..type = e.type
@@ -104,7 +105,7 @@ class ServerClient {
           print(
               'Got error ${res.error.code} ${res.error.message} syncing ${toSync[i].uuid}');
         else {
-          final evUuid = uuid.unparse(res.event.uuid);
+          final evUuid = Uuid.unparse(res.event.uuid);
           final event =
               map[evUuid].copyWith(synced: res.event.synced.toDateTime());
           // print(
diff --git a/pubspec.lock b/pubspec.lock
index 82ee0d8..01e513a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,21 +7,28 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "14.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.4"
-  analyzer_plugin_fork:
+    version: "0.41.2"
+  analyzer_plugin:
     dependency: transitive
     description:
-      name: analyzer_plugin_fork
+      name: analyzer_plugin
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2"
+    version: "0.4.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.2"
   args:
     dependency: transitive
     description:
@@ -49,56 +56,56 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.2"
+    version: "1.6.2"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.5"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.9"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.3"
+    version: "1.5.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.11.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.5.2"
+    version: "6.1.7"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "5.0.0"
   built_value:
     dependency: transitive
     description:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.0.9"
+    version: "8.0.2"
   card_settings:
     dependency: "direct main"
     description:
@@ -126,14 +133,14 @@ packages:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3+2"
+    version: "0.2.0"
   clock:
     dependency: transitive
     description:
@@ -147,7 +154,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.7.0"
   collection:
     dependency: transitive
     description:
@@ -161,21 +168,14 @@ packages:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.16.1"
+    version: "3.0.0"
   cupertino_icons:
     dependency: transitive
     description:
@@ -189,7 +189,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.12"
   expire_cache:
     dependency: "direct main"
     description:
@@ -210,7 +210,7 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.3.1-nullsafety.0"
   file:
     dependency: transitive
     description:
@@ -231,7 +231,7 @@ packages:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.11"
+    version: "1.0.0"
   flushbar:
     dependency: "direct main"
     description:
@@ -285,7 +285,7 @@ packages:
       name: flutter_native_timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.10"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: googleapis_auth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11+1"
+    version: "1.1.0"
   graphs:
     dependency: transitive
     description:
@@ -330,28 +330,21 @@ packages:
       name: grpc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.14.0+3"
+    version: "3.0.0"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+4"
+    version: "0.13.0"
   http2:
     dependency: transitive
     description:
       name: http2
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "2.0.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -365,7 +358,7 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
+    version: "4.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -435,14 +428,14 @@ packages:
       name: moor
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.4.0"
+    version: "4.1.0"
   moor_generator:
     dependency: "direct dev"
     description:
       name: moor_generator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0-dev"
   nested:
     dependency: transitive
     description:
@@ -470,7 +463,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.9.3"
   package_info:
     dependency: "direct main"
     description:
@@ -478,13 +471,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
-  package_resolver:
-    dependency: transitive
-    description:
-      name: package_resolver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.10"
   path:
     dependency: "direct main"
     description:
@@ -533,7 +519,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "1.11.0"
   platform:
     dependency: transitive
     description:
@@ -568,7 +554,7 @@ packages:
       name: protobuf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.0"
   provider:
     dependency: "direct main"
     description:
@@ -589,7 +575,7 @@ packages:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.8"
   quiver:
     dependency: transitive
     description:
@@ -645,14 +631,14 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5"
+    version: "1.0.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.3"
+    version: "0.2.4+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -664,7 +650,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.5"
+    version: "0.9.10+3"
   source_span:
     dependency: transitive
     description:
@@ -678,7 +664,7 @@ packages:
       name: sqlite3
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.8"
+    version: "0.1.10-nullsafety.0"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
@@ -692,7 +678,7 @@ packages:
       name: sqlparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.1"
+    version: "0.12.0-nullsafety.0"
   stack_trace:
     dependency: transitive
     description:
@@ -728,13 +714,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -755,7 +734,7 @@ packages:
       name: timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.7"
+    version: "0.7.0-nullsafety.0"
   timing:
     dependency: transitive
     description:
@@ -783,7 +762,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "3.0.1"
   vector_math:
     dependency: transitive
     description:
@@ -804,7 +783,7 @@ packages:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -818,7 +797,7 @@ packages:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "3.1.0"
   yamlicious:
     dependency: "direct main"
     description:
@@ -827,5 +806,5 @@ packages:
     source: hosted
     version: "0.1.0"
 sdks:
-  dart: ">=2.12.0-259.9.beta <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.22.4"
diff --git a/pubspec.yaml b/pubspec.yaml
index 18a4a22..141d5f1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,21 +23,21 @@ dependencies:
   card_settings: ^1.16.3
   expire_cache: ^1.0.7
   flushbar: ^1.10.4
-  flutter_native_timezone: ^1.0.4
+  flutter_native_timezone: ^1.0.10
   sqlite3_flutter_libs:
-  grpc: ^2.1.3
+  grpc: ^3.0.0
   intl: ^0.16.1
-  moor: ^3.4.0
+  moor: ^4.1.0
   package_info: ^2.0.0
   path_provider:
   path:
-  protobuf: ^1.0.1
+  protobuf: ^2.0.0
   provider: ^5.0.0
   shared_preferences:
   strings:
-  timezone: ^0.5.7
-  uuid: ^2.0.4
-  yaml: ^2.2.0
+  timezone: ^0.7.0-nullsafety.0
+  uuid: ^3.0.1
+  yaml: ^3.1.0
   yamlicious: ^0.1.0
   
 dev_dependencies: