diff --git a/app_flowy/lib/home/presentation/home_layout.dart b/app_flowy/lib/home/presentation/home_layout.dart
index a5f5197175..567d212dcc 100644
--- a/app_flowy/lib/home/presentation/home_layout.dart
+++ b/app_flowy/lib/home/presentation/home_layout.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/home/application/home_bloc.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/time/duration.dart';
 import 'package:flutter/material.dart';
-import 'package:flowy_style/time/duration.dart';
-import 'package:flowy_style/size.dart';
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:sized_context/sized_context.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/app_flowy/lib/home/presentation/home_screen.dart b/app_flowy/lib/home/presentation/home_screen.dart
index b591852e91..3d56b540e3 100644
--- a/app_flowy/lib/home/presentation/home_screen.dart
+++ b/app_flowy/lib/home/presentation/home_screen.dart
@@ -7,9 +7,9 @@ import 'package:app_flowy/home/presentation/widgets/edit_pannel/pannel_animation
 import 'package:app_flowy/home/presentation/widgets/home_top_bar.dart';
 import 'package:app_flowy/home/presentation/widgets/menu/home_menu.dart';
 import 'package:app_flowy/startup/startup.dart';
+import 'package:flowy_infra_ui/styles/styled_container.dart';
 import 'package:flowy_logger/flowy_logger.dart';
 import 'package:flowy_sdk/protobuf/user_detail.pb.dart';
-import 'package:flowy_style/styled_container.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/app_flowy/lib/home/presentation/widgets/edit_pannel/edit_pannel.dart b/app_flowy/lib/home/presentation/widgets/edit_pannel/edit_pannel.dart
index 0b5f739edd..80d23afec4 100644
--- a/app_flowy/lib/home/presentation/widgets/edit_pannel/edit_pannel.dart
+++ b/app_flowy/lib/home/presentation/widgets/edit_pannel/edit_pannel.dart
@@ -2,8 +2,8 @@ import 'package:app_flowy/home/application/edit_pannel/edit_pannel_bloc.dart';
 import 'package:app_flowy/home/domain/edit_context.dart';
 import 'package:app_flowy/startup/startup.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_style/styled_bar_title.dart';
-import 'package:flowy_style/styled_close_button.dart';
+import 'package:flowy_infra_ui/styles/styled_bar_title.dart';
+import 'package:flowy_infra_ui/styles/styled_close_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../home_sizes.dart';
diff --git a/app_flowy/lib/home/presentation/widgets/menu/home_menu.dart b/app_flowy/lib/home/presentation/widgets/menu/home_menu.dart
index a21903a33e..b233128131 100644
--- a/app_flowy/lib/home/presentation/widgets/menu/home_menu.dart
+++ b/app_flowy/lib/home/presentation/widgets/menu/home_menu.dart
@@ -2,7 +2,7 @@ import 'package:app_flowy/home/application/menu/menu_bloc.dart';
 import 'package:app_flowy/home/domain/page_context.dart';
 import 'package:app_flowy/startup/startup.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_style/size.dart';
+import 'package:flowy_infra/size.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../home_sizes.dart';
diff --git a/app_flowy/lib/startup/tasks/app_widget_task.dart b/app_flowy/lib/startup/tasks/app_widget_task.dart
index 7108d1265b..e18ef9a0a8 100644
--- a/app_flowy/lib/startup/tasks/app_widget_task.dart
+++ b/app_flowy/lib/startup/tasks/app_widget_task.dart
@@ -1,5 +1,5 @@
 import 'package:app_flowy/startup/startup.dart';
-import 'package:flowy_style/theme.dart';
+import 'package:flowy_infra/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:window_size/window_size.dart';
diff --git a/app_flowy/lib/welcome/presentation/welcome_screen.dart b/app_flowy/lib/welcome/presentation/welcome_screen.dart
index 08cc45d0ad..3755d44db8 100644
--- a/app_flowy/lib/welcome/presentation/welcome_screen.dart
+++ b/app_flowy/lib/welcome/presentation/welcome_screen.dart
@@ -2,11 +2,11 @@ import 'package:app_flowy/welcome/domain/interface.dart';
 import 'package:app_flowy/welcome/domain/auth_state.dart';
 import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/welcome/application/welcome_bloc.dart';
+import 'package:flowy_infra_ui/widget/route/animation.dart';
 import 'package:flowy_logger/flowy_logger.dart';
-import 'package:flowy_style/route/animation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flowy_style/time/prelude.dart';
+import 'package:flowy_infra/time/prelude.dart';
 
 class WelcomeScreen extends StatelessWidget {
   const WelcomeScreen({Key? key}) : super(key: key);
diff --git a/app_flowy/packages/flowy_style/.gitignore b/app_flowy/packages/flowy_infra/.gitignore
similarity index 100%
rename from app_flowy/packages/flowy_style/.gitignore
rename to app_flowy/packages/flowy_infra/.gitignore
diff --git a/app_flowy/packages/flowy_style/.metadata b/app_flowy/packages/flowy_infra/.metadata
similarity index 82%
rename from app_flowy/packages/flowy_style/.metadata
rename to app_flowy/packages/flowy_infra/.metadata
index f46c92994f..f323c72cb1 100644
--- a/app_flowy/packages/flowy_style/.metadata
+++ b/app_flowy/packages/flowy_infra/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: fa5883b78e566877613ad1ccb48dd92075cb5c23
+  revision: 96bbcd006fafade4ad7a4abde77cec32df6846ea
   channel: dev
 
 project_type: package
diff --git a/app_flowy/packages/flowy_style/CHANGELOG.md b/app_flowy/packages/flowy_infra/CHANGELOG.md
similarity index 100%
rename from app_flowy/packages/flowy_style/CHANGELOG.md
rename to app_flowy/packages/flowy_infra/CHANGELOG.md
diff --git a/app_flowy/packages/flowy_style/LICENSE b/app_flowy/packages/flowy_infra/LICENSE
similarity index 100%
rename from app_flowy/packages/flowy_style/LICENSE
rename to app_flowy/packages/flowy_infra/LICENSE
diff --git a/app_flowy/packages/flowy_infra/README.md b/app_flowy/packages/flowy_infra/README.md
new file mode 100644
index 0000000000..8b55e735b5
--- /dev/null
+++ b/app_flowy/packages/flowy_infra/README.md
@@ -0,0 +1,39 @@
+<!-- 
+This README describes the package. If you publish this package to pub.dev,
+this README's contents appear on the landing page for your package.
+
+For information about how to write a good package README, see the guide for
+[writing package pages](https://dart.dev/guides/libraries/writing-package-pages). 
+
+For general information about developing packages, see the Dart guide for
+[creating packages](https://dart.dev/guides/libraries/create-library-packages)
+and the Flutter guide for
+[developing packages and plugins](https://flutter.dev/developing-packages). 
+-->
+
+TODO: Put a short description of the package here that helps potential users
+know whether this package might be useful for them.
+
+## Features
+
+TODO: List what your package can do. Maybe include images, gifs, or videos.
+
+## Getting started
+
+TODO: List prerequisites and provide or point to information on how to
+start using the package.
+
+## Usage
+
+TODO: Include short and useful examples for package users. Add longer examples
+to `/example` folder. 
+
+```dart
+const like = 'sample';
+```
+
+## Additional information
+
+TODO: Tell users more about the package: where to find more information, how to 
+contribute to the package, how to file issues, what response they can expect 
+from the package authors, and more.
diff --git a/app_flowy/packages/infra/analysis_options.yaml b/app_flowy/packages/flowy_infra/analysis_options.yaml
similarity index 100%
rename from app_flowy/packages/infra/analysis_options.yaml
rename to app_flowy/packages/flowy_infra/analysis_options.yaml
diff --git a/app_flowy/packages/infra/lib/color.dart b/app_flowy/packages/flowy_infra/lib/color.dart
similarity index 100%
rename from app_flowy/packages/infra/lib/color.dart
rename to app_flowy/packages/flowy_infra/lib/color.dart
diff --git a/app_flowy/packages/flowy_style/lib/size.dart b/app_flowy/packages/flowy_infra/lib/size.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/size.dart
rename to app_flowy/packages/flowy_infra/lib/size.dart
diff --git a/app_flowy/packages/flowy_style/lib/strings.dart b/app_flowy/packages/flowy_infra/lib/strings.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/strings.dart
rename to app_flowy/packages/flowy_infra/lib/strings.dart
diff --git a/app_flowy/packages/flowy_style/lib/text_style.dart b/app_flowy/packages/flowy_infra/lib/text_style.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/text_style.dart
rename to app_flowy/packages/flowy_infra/lib/text_style.dart
diff --git a/app_flowy/packages/flowy_style/lib/theme.dart b/app_flowy/packages/flowy_infra/lib/theme.dart
similarity index 98%
rename from app_flowy/packages/flowy_style/lib/theme.dart
rename to app_flowy/packages/flowy_infra/lib/theme.dart
index 0346578fee..a9994e335a 100644
--- a/app_flowy/packages/flowy_style/lib/theme.dart
+++ b/app_flowy/packages/flowy_infra/lib/theme.dart
@@ -1,6 +1,6 @@
+import 'package:flowy_infra/color.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:infra/color.dart';
 
 enum ThemeType {
   light,
diff --git a/app_flowy/packages/flowy_style/lib/time/duration.dart b/app_flowy/packages/flowy_infra/lib/time/duration.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/time/duration.dart
rename to app_flowy/packages/flowy_infra/lib/time/duration.dart
diff --git a/app_flowy/packages/flowy_style/lib/time/prelude.dart b/app_flowy/packages/flowy_infra/lib/time/prelude.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/time/prelude.dart
rename to app_flowy/packages/flowy_infra/lib/time/prelude.dart
diff --git a/app_flowy/packages/infra/lib/uuid.dart b/app_flowy/packages/flowy_infra/lib/uuid.dart
similarity index 100%
rename from app_flowy/packages/infra/lib/uuid.dart
rename to app_flowy/packages/flowy_infra/lib/uuid.dart
diff --git a/app_flowy/packages/infra/pubspec.lock b/app_flowy/packages/flowy_infra/pubspec.lock
similarity index 91%
rename from app_flowy/packages/infra/pubspec.lock
rename to app_flowy/packages/flowy_infra/pubspec.lock
index 31e0c4fa0b..1378f082da 100644
--- a/app_flowy/packages/infra/pubspec.lock
+++ b/app_flowy/packages/flowy_infra/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -68,7 +68,7 @@ packages:
       name: flutter_lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -94,7 +94,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   path:
     dependency: transitive
     description:
@@ -148,9 +148,16 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.1"
+  textstyle_extensions:
+    dependency: "direct dev"
+    description:
+      name: textstyle_extensions
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0-nullsafety"
   time:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: time
       url: "https://pub.dartlang.org"
@@ -164,7 +171,7 @@ packages:
     source: hosted
     version: "1.3.0"
   uuid:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: uuid
       url: "https://pub.dartlang.org"
diff --git a/app_flowy/packages/infra/pubspec.yaml b/app_flowy/packages/flowy_infra/pubspec.yaml
similarity index 96%
rename from app_flowy/packages/infra/pubspec.yaml
rename to app_flowy/packages/flowy_infra/pubspec.yaml
index 3a079eb02b..94184e67c5 100644
--- a/app_flowy/packages/infra/pubspec.yaml
+++ b/app_flowy/packages/flowy_infra/pubspec.yaml
@@ -1,8 +1,7 @@
-name: infra
+name: flowy_infra
 description: A new Flutter package project.
 version: 0.0.1
 homepage:
-publish_to: 'none'
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -11,13 +10,14 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  time: '>=2.0.0'
-  uuid: ">=2.2.2"
-  
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^1.0.0
+  time: '>=2.0.0'
+  uuid: ">=2.2.2"
+  textstyle_extensions: '2.0.0-nullsafety'
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/app_flowy/packages/flowy_style/test/flowy_style_test.dart b/app_flowy/packages/flowy_infra/test/flowy_infra_test.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/test/flowy_style_test.dart
rename to app_flowy/packages/flowy_infra/test/flowy_infra_test.dart
diff --git a/app_flowy/packages/infra/.gitignore b/app_flowy/packages/flowy_infra_ui/.gitignore
similarity index 100%
rename from app_flowy/packages/infra/.gitignore
rename to app_flowy/packages/flowy_infra_ui/.gitignore
diff --git a/app_flowy/packages/infra/.metadata b/app_flowy/packages/flowy_infra_ui/.metadata
similarity index 82%
rename from app_flowy/packages/infra/.metadata
rename to app_flowy/packages/flowy_infra_ui/.metadata
index f46c92994f..f323c72cb1 100644
--- a/app_flowy/packages/infra/.metadata
+++ b/app_flowy/packages/flowy_infra_ui/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: fa5883b78e566877613ad1ccb48dd92075cb5c23
+  revision: 96bbcd006fafade4ad7a4abde77cec32df6846ea
   channel: dev
 
 project_type: package
diff --git a/app_flowy/packages/infra/CHANGELOG.md b/app_flowy/packages/flowy_infra_ui/CHANGELOG.md
similarity index 100%
rename from app_flowy/packages/infra/CHANGELOG.md
rename to app_flowy/packages/flowy_infra_ui/CHANGELOG.md
diff --git a/app_flowy/packages/infra/LICENSE b/app_flowy/packages/flowy_infra_ui/LICENSE
similarity index 100%
rename from app_flowy/packages/infra/LICENSE
rename to app_flowy/packages/flowy_infra_ui/LICENSE
diff --git a/app_flowy/packages/flowy_infra_ui/README.md b/app_flowy/packages/flowy_infra_ui/README.md
new file mode 100644
index 0000000000..8b55e735b5
--- /dev/null
+++ b/app_flowy/packages/flowy_infra_ui/README.md
@@ -0,0 +1,39 @@
+<!-- 
+This README describes the package. If you publish this package to pub.dev,
+this README's contents appear on the landing page for your package.
+
+For information about how to write a good package README, see the guide for
+[writing package pages](https://dart.dev/guides/libraries/writing-package-pages). 
+
+For general information about developing packages, see the Dart guide for
+[creating packages](https://dart.dev/guides/libraries/create-library-packages)
+and the Flutter guide for
+[developing packages and plugins](https://flutter.dev/developing-packages). 
+-->
+
+TODO: Put a short description of the package here that helps potential users
+know whether this package might be useful for them.
+
+## Features
+
+TODO: List what your package can do. Maybe include images, gifs, or videos.
+
+## Getting started
+
+TODO: List prerequisites and provide or point to information on how to
+start using the package.
+
+## Usage
+
+TODO: Include short and useful examples for package users. Add longer examples
+to `/example` folder. 
+
+```dart
+const like = 'sample';
+```
+
+## Additional information
+
+TODO: Tell users more about the package: where to find more information, how to 
+contribute to the package, how to file issues, what response they can expect 
+from the package authors, and more.
diff --git a/app_flowy/packages/flowy_style/analysis_options.yaml b/app_flowy/packages/flowy_infra_ui/analysis_options.yaml
similarity index 68%
rename from app_flowy/packages/flowy_style/analysis_options.yaml
rename to app_flowy/packages/flowy_infra_ui/analysis_options.yaml
index ccef0be1f7..a5744c1cfb 100644
--- a/app_flowy/packages/flowy_style/analysis_options.yaml
+++ b/app_flowy/packages/flowy_infra_ui/analysis_options.yaml
@@ -1,9 +1,4 @@
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  exclude:
-    - "**/*.g.dart"
-    - "**/*.freezed.dart"
-    
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/app_flowy/packages/flowy_style/lib/scrolling/styled_list.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_list.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/scrolling/styled_list.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_list.dart
diff --git a/app_flowy/packages/flowy_style/lib/scrolling/styled_scroll_bar.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_scroll_bar.dart
similarity index 98%
rename from app_flowy/packages/flowy_style/lib/scrolling/styled_scroll_bar.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_scroll_bar.dart
index 2610381a45..b2f8af63cb 100644
--- a/app_flowy/packages/flowy_style/lib/scrolling/styled_scroll_bar.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_scroll_bar.dart
@@ -1,8 +1,7 @@
 import 'dart:math';
-
-import 'package:flowy_style/mouse_hover_builder.dart';
-import 'package:flowy_style/size.dart';
-import 'package:flowy_style/theme.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/theme.dart';
+import 'package:flowy_infra_ui/widget/mouse_hover_builder.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/app_flowy/packages/flowy_style/lib/scrolling/styled_scrollview.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_scrollview.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/scrolling/styled_scrollview.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/scrolling/styled_scrollview.dart
diff --git a/app_flowy/packages/flowy_style/lib/styled_bar_title.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_bar_title.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/styled_bar_title.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/styled_bar_title.dart
diff --git a/app_flowy/packages/flowy_style/lib/styled_close_button.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_close_button.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/styled_close_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/styled_close_button.dart
diff --git a/app_flowy/packages/flowy_style/lib/styled_container.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_container.dart
similarity index 95%
rename from app_flowy/packages/flowy_style/lib/styled_container.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/styled_container.dart
index 7399d80ca1..6fff8451f8 100644
--- a/app_flowy/packages/flowy_style/lib/styled_container.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_container.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_style/time/duration.dart';
+import 'package:flowy_infra/time/duration.dart';
 import 'package:flutter/material.dart';
 
 class StyledContainer extends StatelessWidget {
diff --git a/app_flowy/packages/flowy_style/lib/styled_image_icon.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_image_icon.dart
similarity index 91%
rename from app_flowy/packages/flowy_style/lib/styled_image_icon.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/styled_image_icon.dart
index ec835f2274..ad9f6d303d 100644
--- a/app_flowy/packages/flowy_style/lib/styled_image_icon.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_image_icon.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_style/size.dart';
+import 'package:flowy_infra/size.dart';
 import 'package:flutter/material.dart';
 
 class StyledImageIcon extends StatelessWidget {
diff --git a/app_flowy/packages/flowy_style/lib/styled_text_input.dart b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_text_input.dart
similarity index 98%
rename from app_flowy/packages/flowy_style/lib/styled_text_input.dart
rename to app_flowy/packages/flowy_infra_ui/lib/styles/styled_text_input.dart
index 1b26b31adf..c337cd9293 100644
--- a/app_flowy/packages/flowy_style/lib/styled_text_input.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/styles/styled_text_input.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:math' as math;
-import 'package:flowy_style/size.dart';
-import 'package:flowy_style/text_style.dart';
-import 'package:flowy_style/theme.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/text_style.dart';
+import 'package:flowy_infra/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
diff --git a/app_flowy/packages/flowy_style/lib/buttons/base_styled_button.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dart
similarity index 97%
rename from app_flowy/packages/flowy_style/lib/buttons/base_styled_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dart
index 72441d65b2..3cbf52f06b 100644
--- a/app_flowy/packages/flowy_style/lib/buttons/base_styled_button.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dart
@@ -1,6 +1,6 @@
-import 'package:flowy_style/size.dart';
-import 'package:flowy_style/text_style.dart';
-import 'package:flowy_style/theme.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/text_style.dart';
+import 'package:flowy_infra/theme.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
diff --git a/app_flowy/packages/flowy_style/lib/buttons/ok_cancel_button.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/ok_cancel_button.dart
similarity index 87%
rename from app_flowy/packages/flowy_style/lib/buttons/ok_cancel_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/buttons/ok_cancel_button.dart
index 385ab7d8da..38bbcbda97 100644
--- a/app_flowy/packages/flowy_style/lib/buttons/ok_cancel_button.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/ok_cancel_button.dart
@@ -1,8 +1,7 @@
-import 'package:flowy_style/size.dart';
-import 'package:flowy_style/spacing.dart';
-import 'package:flowy_style/strings.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/strings.dart';
+import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter/material.dart';
-
 import 'primary_button.dart';
 import 'secondary_button.dart';
 
diff --git a/app_flowy/packages/flowy_style/lib/buttons/primary_button.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dart
similarity index 92%
rename from app_flowy/packages/flowy_style/lib/buttons/primary_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dart
index eb2c5e28fc..a840ef84f5 100644
--- a/app_flowy/packages/flowy_style/lib/buttons/primary_button.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../size.dart';
-import '../text_style.dart';
-import '../theme.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/text_style.dart';
+import 'package:flowy_infra/theme.dart';
 import 'base_styled_button.dart';
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:textstyle_extensions/textstyle_extensions.dart';
diff --git a/app_flowy/packages/flowy_style/lib/buttons/secondary_button.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dart
similarity index 93%
rename from app_flowy/packages/flowy_style/lib/buttons/secondary_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dart
index bbc3430ee0..1ff76d7aa1 100644
--- a/app_flowy/packages/flowy_style/lib/buttons/secondary_button.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dart
@@ -1,12 +1,11 @@
+import 'package:flowy_infra_ui/styles/styled_image_icon.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:textstyle_extensions/textstyle_extensions.dart';
-
-import '../size.dart';
-import '../styled_image_icon.dart';
-import '../text_style.dart';
-import '../theme.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/text_style.dart';
+import 'package:flowy_infra/theme.dart';
 import 'base_styled_button.dart';
 
 class SecondaryTextButton extends StatelessWidget {
diff --git a/app_flowy/packages/flowy_style/lib/clickable_extension.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/clickable_extension.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/clickable_extension.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/clickable_extension.dart
diff --git a/app_flowy/packages/flowy_style/lib/constraint_flex_view.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/constraint_flex_view.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dart
diff --git a/app_flowy/packages/flowy_style/lib/dialog/dialog_context.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_context.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/dialog/dialog_context.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_context.dart
diff --git a/app_flowy/packages/flowy_style/lib/dialog/dialog_size.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/dialog/dialog_size.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dart
diff --git a/app_flowy/packages/flowy_style/lib/dialog/styled_dialogs.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dart
similarity index 94%
rename from app_flowy/packages/flowy_style/lib/dialog/styled_dialogs.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dart
index f95c1f1c21..5a69f80b26 100644
--- a/app_flowy/packages/flowy_style/lib/dialog/styled_dialogs.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dart
@@ -1,10 +1,10 @@
-import 'package:flowy_style/buttons/ok_cancel_button.dart';
-import 'package:flowy_style/dialog/dialog_size.dart';
-import 'package:flowy_style/scrolling/styled_list.dart';
-import 'package:flowy_style/size.dart';
-import 'package:flowy_style/spacing.dart';
-import 'package:flowy_style/text_style.dart';
-import 'package:flowy_style/theme.dart';
+import 'package:flowy_infra_ui/styles/scrolling/styled_list.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra/text_style.dart';
+import 'package:flowy_infra/theme.dart';
+import 'package:flowy_infra_ui/widget/buttons/ok_cancel_button.dart';
+import 'package:flowy_infra_ui/widget/dialog/dialog_size.dart';
+import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 // ignore: import_of_legacy_library_into_null_safe
diff --git a/app_flowy/packages/flowy_style/lib/mouse_hover_builder.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/mouse_hover_builder.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dart
diff --git a/app_flowy/packages/flowy_style/lib/rounded_button.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_button.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/rounded_button.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/rounded_button.dart
diff --git a/app_flowy/packages/flowy_style/lib/rounded_input_field.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_input_field.dart
similarity index 92%
rename from app_flowy/packages/flowy_style/lib/rounded_input_field.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/rounded_input_field.dart
index 6846ab09d9..e570e4e2b6 100644
--- a/app_flowy/packages/flowy_style/lib/rounded_input_field.dart
+++ b/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_input_field.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_style/text_field_container.dart';
+import 'package:flowy_infra_ui/widget/text_field_container.dart';
 import 'package:flutter/material.dart';
 
 class RoundedInputField extends StatelessWidget {
diff --git a/app_flowy/packages/flowy_style/lib/route/animation.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/route/animation.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/route/animation.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/route/animation.dart
diff --git a/app_flowy/packages/flowy_style/lib/seperated_column.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/seperated_column.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/seperated_column.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/seperated_column.dart
diff --git a/app_flowy/packages/flowy_style/lib/spacing.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/spacing.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/spacing.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/spacing.dart
diff --git a/app_flowy/packages/flowy_style/lib/text_field_container.dart b/app_flowy/packages/flowy_infra_ui/lib/widget/text_field_container.dart
similarity index 100%
rename from app_flowy/packages/flowy_style/lib/text_field_container.dart
rename to app_flowy/packages/flowy_infra_ui/lib/widget/text_field_container.dart
diff --git a/app_flowy/packages/flowy_style/pubspec.lock b/app_flowy/packages/flowy_infra_ui/pubspec.lock
similarity index 90%
rename from app_flowy/packages/flowy_style/pubspec.lock
rename to app_flowy/packages/flowy_infra_ui/pubspec.lock
index 8d26dddb0b..b1a1a10020 100644
--- a/app_flowy/packages/flowy_style/pubspec.lock
+++ b/app_flowy/packages/flowy_infra_ui/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   async:
     dependency: transitive
     description:
@@ -50,13 +50,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
   dartz:
     dependency: "direct main"
     description:
@@ -78,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  flowy_infra:
+    dependency: "direct main"
+    description:
+      path: "../flowy_infra"
+      relative: true
+    source: path
+    version: "0.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -89,19 +89,12 @@ packages:
       name: flutter_lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
-  infra:
-    dependency: "direct main"
-    description:
-      path: "../infra"
-      relative: true
-    source: path
-    version: "0.0.1"
   lint:
     dependency: transitive
     description:
@@ -212,13 +205,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0-nullsafety"
-  time:
-    dependency: "direct main"
-    description:
-      name: time
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
   typed_data:
     dependency: transitive
     description:
@@ -226,13 +212,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
diff --git a/app_flowy/packages/flowy_style/pubspec.yaml b/app_flowy/packages/flowy_infra_ui/pubspec.yaml
similarity index 96%
rename from app_flowy/packages/flowy_style/pubspec.yaml
rename to app_flowy/packages/flowy_infra_ui/pubspec.yaml
index c375650e26..bc7007349b 100644
--- a/app_flowy/packages/flowy_style/pubspec.yaml
+++ b/app_flowy/packages/flowy_infra_ui/pubspec.yaml
@@ -1,4 +1,4 @@
-name: flowy_style
+name: flowy_infra_ui
 description: A new Flutter package project.
 version: 0.0.1
 homepage:
@@ -11,20 +11,20 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  infra:
-    path: ../infra
-  time: '>=2.0.0'
   textstyle_extensions: '2.0.0-nullsafety'
-  animations: ^2.0.0
   dartz: '0.10.0-nullsafety.2'
   provider: ^5.0.0
   styled_widget: '>=0.3.1'
   equatable: '>=2.0.2'
+  animations: ^2.0.0
+  flowy_infra:
+    path: ../flowy_infra
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^1.0.0
+  
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/app_flowy/packages/infra/test/infra_test.dart b/app_flowy/packages/flowy_infra_ui/test/flowy_ui_test.dart
similarity index 100%
rename from app_flowy/packages/infra/test/infra_test.dart
rename to app_flowy/packages/flowy_infra_ui/test/flowy_ui_test.dart
diff --git a/app_flowy/packages/flowy_sdk/example/pubspec.lock b/app_flowy/packages/flowy_sdk/example/pubspec.lock
index 06fe505de6..da5884ef8e 100644
--- a/app_flowy/packages/flowy_sdk/example/pubspec.lock
+++ b/app_flowy/packages/flowy_sdk/example/pubspec.lock
@@ -147,13 +147,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  infra:
-    dependency: transitive
-    description:
-      path: "../../infra"
-      relative: true
-    source: path
-    version: "0.0.1"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -283,13 +276,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.1"
-  time:
-    dependency: transitive
-    description:
-      name: time
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
   typed_data:
     dependency: transitive
     description:
@@ -297,13 +283,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
diff --git a/app_flowy/packages/flowy_sdk/pubspec.lock b/app_flowy/packages/flowy_sdk/pubspec.lock
index 93d7597e3d..d4599cd5ba 100644
--- a/app_flowy/packages/flowy_sdk/pubspec.lock
+++ b/app_flowy/packages/flowy_sdk/pubspec.lock
@@ -256,13 +256,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
-  infra:
-    dependency: "direct main"
-    description:
-      path: "../infra"
-      relative: true
-    source: path
-    version: "0.0.1"
   io:
     dependency: transitive
     description:
@@ -450,13 +443,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.1"
-  time:
-    dependency: transitive
-    description:
-      name: time
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
   timing:
     dependency: transitive
     description:
@@ -471,13 +457,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
diff --git a/app_flowy/packages/flowy_sdk/pubspec.yaml b/app_flowy/packages/flowy_sdk/pubspec.yaml
index 9057cd5391..ef7bcbc6c7 100644
--- a/app_flowy/packages/flowy_sdk/pubspec.yaml
+++ b/app_flowy/packages/flowy_sdk/pubspec.yaml
@@ -16,8 +16,6 @@ dependencies:
   protobuf: "2.0.0"
   flowy_logger:
     path: ../flowy_logger
-  infra:
-    path: ../infra
   dartz: '0.10.0-nullsafety.2'
   freezed_annotation: ^0.14.1
     
diff --git a/app_flowy/packages/flowy_style/README.md b/app_flowy/packages/flowy_style/README.md
deleted file mode 100644
index c5c5afe55d..0000000000
--- a/app_flowy/packages/flowy_style/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# flowy_style
-
-A new Flutter package project.
-
-## Getting Started
-
-This project is a starting point for a Dart
-[package](https://flutter.dev/developing-packages/),
-a library module containing code that can be shared easily across
-multiple Flutter or Dart projects.
-
-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.
diff --git a/app_flowy/packages/infra/README.md b/app_flowy/packages/infra/README.md
deleted file mode 100644
index a458e2da17..0000000000
--- a/app_flowy/packages/infra/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# infra
-
-A new Flutter package project.
-
-## Getting Started
-
-This project is a starting point for a Dart
-[package](https://flutter.dev/developing-packages/),
-a library module containing code that can be shared easily across
-multiple Flutter or Dart projects.
-
-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.
diff --git a/app_flowy/pubspec.lock b/app_flowy/pubspec.lock
index 2c098ff55d..71895ce829 100644
--- a/app_flowy/pubspec.lock
+++ b/app_flowy/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   args:
     dependency: transitive
     description:
@@ -239,6 +239,20 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  flowy_infra:
+    dependency: "direct main"
+    description:
+      path: "packages/flowy_infra"
+      relative: true
+    source: path
+    version: "0.0.1"
+  flowy_infra_ui:
+    dependency: "direct main"
+    description:
+      path: "packages/flowy_infra_ui"
+      relative: true
+    source: path
+    version: "0.0.1"
   flowy_logger:
     dependency: "direct main"
     description:
@@ -253,13 +267,6 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  flowy_style:
-    dependency: "direct main"
-    description:
-      path: "packages/flowy_style"
-      relative: true
-    source: path
-    version: "0.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -373,13 +380,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
-  infra:
-    dependency: transitive
-    description:
-      path: "packages/infra"
-      relative: true
-    source: path
-    version: "0.0.1"
   io:
     dependency: transitive
     description:
@@ -779,13 +779,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
diff --git a/app_flowy/pubspec.yaml b/app_flowy/pubspec.yaml
index cc4c4f45c6..34fceac4ae 100644
--- a/app_flowy/pubspec.yaml
+++ b/app_flowy/pubspec.yaml
@@ -31,12 +31,14 @@ dependencies:
     sdk: flutter
   flowy_sdk:
     path: packages/flowy_sdk
-  flowy_style:
-    path: packages/flowy_style
   flowy_editor:
     path: packages/flowy_editor
   flowy_logger:
     path: packages/flowy_logger
+  flowy_infra_ui:
+    path: packages/flowy_infra_ui
+  flowy_infra:
+    path: packages/flowy_infra
   
   #  third party packages
   time: '>=2.0.0'